diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 01:11:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 01:11:49 +0000 |
| commit | 1b88cd5ee8510e90e69f885bfd730ce57621781c (patch) | |
| tree | b6b33bd695258f68c68824029c279d660ee4b85e | |
| parent | Adding upstream version 3:4.8.30. (diff) | |
| download | mc-upstream.tar.xz mc-upstream.zip | |
Adding upstream version 3:4.8.31.upstream/3%4.8.31upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
536 files changed, 8229 insertions, 7470 deletions
@@ -15,7 +15,7 @@ Build requirements for GNU Midnight Commander - autoconf >= 2.64 - automake >= 1.12 - libtool -- glib2 >= 2.30 +- glib2 >= 2.32 - slang2 or ncurses - gettext >= 0.18.2 - libssh2 >= 1.2.8 is required only for sftp vfs @@ -171,9 +171,9 @@ VFS options: (on by default) Support for FTP vfs -`--enable-vfs-fish' +`--enable-vfs-shell' (on by default) - Support for FISH vfs + Support for SHELL vfs `--enable-vfs-sftp' (auto) @@ -367,8 +367,8 @@ get glib from ftp://ftp.gnome.org/pub/gnome/sources/glib/ -Minimal version of glib: 2.30.0 -Recommended version: 2.30.x and higher. +Minimal version of glib: 2.32.0 +Recommended version: 2.32.x and higher. Newer versions may work, but haven't been tested. diff --git a/Makefile.in b/Makefile.in index a218e3d..b023bdd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -136,7 +136,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ @@ -1,3 +1,36 @@ +Version 4.8.31 + +- Core + + * Minimal version of GLib is 2.32.0. + +- VFS + + * fish: drop support of native FISH server and protocol. Rename VFS to shell (#4232) + * extfs; + * uc1541 extfs: update up to 3.6 version (#4511) + * s3+: port to Python3 (#4324) + * Support for LZO/LZOP compression format (#4509) + +- Misc + + * Skins: add color for non-printable characters in editor (#4433) + +- Fixes + + * FTBFS on FreeBSD with ext2fs attribute support (#4493) + * Broken stickchars (-a) mode (#4498) + * Wrong timestamp after resuming of file copy operation (#4499) + * Editor: wrong deletion of marked column (#3761) + * Diff viewer: segfault when display of line numbers is enabled (#4500) + * Tar VFS: broken handling of hard links (#4494) + * Sftp VFS: failure establishing SSH session due hashed host names in ~/.ssh/known_hosts (#4506) + * Shell VFS: incorrect file names with cyrillic or diacritic symbols (#4507) + * mc.ext.ini: incorrect description of of how multiple sections and keys with same names are processed (#4497) + * mc.ext.ini: unescaped backslash \ is treated as invalid escape sequence in glib-2.77.3 and glib-2.79 (#4502) + * mc.ext.ini: file "Makefile.zip" is handled as Makefile not as zip-arhive (#4419) + + Version 4.8.30 - Core @@ -128,7 +128,7 @@ These are hints for the text mode edition: * The Virtual File System is a cute addition to the project, you may browse in tar and compressed tar files as well as browsing remote - machines with the fish file system. + machines with the shell file system. * Please read the manual page. @@ -20,8 +20,8 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 11 (pkg-config-0.29.1) +# pkg.m4 - Macros to locate and use pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> @@ -63,7 +63,7 @@ dnl dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -108,7 +108,7 @@ dnl Check to see whether a particular set of modules exists. Similar to dnl PKG_CHECK_MODULES(), but does not set variables or print errors. dnl dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -dnl only at the first occurence in configure.ac, so if the first place +dnl only at the first occurrence in configure.ac, so if the first place dnl it's called might be skipped (such as if it is within an "if", you dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], @@ -164,7 +164,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -174,17 +174,17 @@ and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - m4_default([$4], [AC_MSG_ERROR( + m4_default([$4], [AC_MSG_ERROR( [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -195,8 +195,8 @@ installed software in a non-standard prefix. _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -206,10 +206,10 @@ _PKG_TEXT To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl ]) else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - $3 + $3 fi[]dnl ])dnl PKG_CHECK_MODULES diff --git a/config.h.in b/config.h.in index 0601eb0..8ca1775 100644 --- a/config.h.in +++ b/config.h.in @@ -25,9 +25,6 @@ /* Support for extfs */ #undef ENABLE_VFS_EXTFS -/* Support for FISH vfs */ -#undef ENABLE_VFS_FISH - /* Support for FTP (classic) */ #undef ENABLE_VFS_FTP @@ -40,6 +37,9 @@ /* Support for SFTP filesystem */ #undef ENABLE_VFS_SFTP +/* Support for SHELL vfs */ +#undef ENABLE_VFS_SHELL + /* Support for tar filesystem */ #undef ENABLE_VFS_TAR diff --git a/config/config.guess b/config/config.guess index c7f17e8..e7a6fe3 100755 --- a/config/config.guess +++ b/config/config.guess @@ -1,10 +1,10 @@ #!/usr/bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2022 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2022-05-25' +timestamp='2023-06-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -47,7 +47,7 @@ me=`echo "$0" | sed -e 's,.*/,,'` usage="\ Usage: $0 [OPTION] -Output the configuration name of the system \`$me' is run on. +Output the configuration name of the system '$me' is run on. Options: -h, --help print this help, then exit @@ -60,13 +60,13 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2022 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" -Try \`$me --help' for more information." +Try '$me --help' for more information." # Parse command line while test $# -gt 0 ; do @@ -102,8 +102,8 @@ GUESS= # temporary files to be created and, as you can see below, it is a # headache to deal with in a portable fashion. -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. +# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still +# use 'HOST_CC' if defined, but it is deprecated. # Portable tmp directory creation inspired by the Autoconf team. @@ -459,7 +459,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in UNAME_RELEASE=`uname -v` ;; esac - # Japanese Language versions have a version number like `4.1.3-JL'. + # Japanese Language versions have a version number like '4.1.3-JL'. SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` GUESS=sparc-sun-sunos$SUN_REL ;; @@ -966,6 +966,12 @@ EOF GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC ;; + x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-pc-managarm-mlibc" + ;; + *:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" + ;; *:Minix:*:*) GUESS=$UNAME_MACHINE-unknown-minix ;; @@ -1036,7 +1042,7 @@ EOF k1om:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; - loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + loongarch32:Linux:*:* | loongarch64:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; m32r*:Linux:*:*) @@ -1191,7 +1197,7 @@ EOF GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION ;; i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility + # If we were able to find 'uname', then EMX Unix compatibility # is probably installed. GUESS=$UNAME_MACHINE-pc-os2-emx ;; @@ -1332,7 +1338,7 @@ EOF GUESS=ns32k-sni-sysv fi ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + PENTIUM:*:4.0*:*) # Unisys 'ClearPath HMP IX 4000' SVR4/MP effort # says <Richard.M.Bartel@ccMail.Census.GOV> GUESS=i586-unisys-sysv4 ;; diff --git a/config/config.sub b/config/config.sub index b41da55..a6d99a0 100755 --- a/config/config.sub +++ b/config/config.sub @@ -1,10 +1,10 @@ #!/usr/bin/sh # Configuration validation subroutine script. -# Copyright 1992-2022 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2022-01-03' +timestamp='2023-06-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -76,13 +76,13 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright 1992-2022 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" -Try \`$me --help' for more information." +Try '$me --help' for more information." # Parse command line while test $# -gt 0 ; do @@ -130,7 +130,7 @@ IFS=$saved_IFS # Separate into logical components for further validation case $1 in *-*-*-*-*) - echo Invalid configuration \`"$1"\': more than four components >&2 + echo "Invalid configuration '$1': more than four components" >&2 exit 1 ;; *-*-*-*) @@ -145,7 +145,7 @@ case $1 in nto-qnx* | linux-* | uclinux-uclibc* \ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ - | storm-chaos* | os2-emx* | rtmk-nova*) + | storm-chaos* | os2-emx* | rtmk-nova* | managarm-*) basic_machine=$field1 basic_os=$maybe_os ;; @@ -943,7 +943,7 @@ $basic_machine EOF IFS=$saved_IFS ;; - # We use `pc' rather than `unknown' + # We use 'pc' rather than 'unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. i*86 | x86_64) @@ -1075,7 +1075,7 @@ case $cpu-$vendor in pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) cpu=i586 ;; - pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*) + pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*) cpu=i686 ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) @@ -1207,7 +1207,7 @@ case $cpu-$vendor in | k1om \ | le32 | le64 \ | lm32 \ - | loongarch32 | loongarch64 | loongarchx32 \ + | loongarch32 | loongarch64 \ | m32c | m32r | m32rle \ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ @@ -1285,7 +1285,7 @@ case $cpu-$vendor in ;; *) - echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 + echo "Invalid configuration '$1': machine '$cpu-$vendor' not recognized" 1>&2 exit 1 ;; esac @@ -1341,6 +1341,10 @@ EOF kernel=linux os=`echo "$basic_os" | sed -e 's|linux|gnu|'` ;; + managarm*) + kernel=managarm + os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'` + ;; *) kernel= os=$basic_os @@ -1754,7 +1758,7 @@ case $os in | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ - | fiwix* ) + | fiwix* | mlibc* ) ;; # This one is extra strict with allowed versions sco3.2v2 | sco3.2v[4-9]* | sco5v6*) @@ -1762,8 +1766,11 @@ case $os in ;; none) ;; + kernel* ) + # Restricted further below + ;; *) - echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 + echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2 exit 1 ;; esac @@ -1772,14 +1779,24 @@ esac # (given a valid OS), if there is a kernel. case $kernel-$os in linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ - | linux-musl* | linux-relibc* | linux-uclibc* ) + | linux-musl* | linux-relibc* | linux-uclibc* | linux-mlibc* ) ;; uclinux-uclibc* ) ;; - -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) + managarm-mlibc* | managarm-kernel* ) + ;; + -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* ) # These are just libc implementations, not actual OSes, and thus # require a kernel. - echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 + echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2 + exit 1 + ;; + -kernel* ) + echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2 + exit 1 + ;; + *-kernel* ) + echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2 exit 1 ;; kfreebsd*-gnu* | kopensolaris*-gnu*) @@ -1796,7 +1813,7 @@ case $kernel-$os in # Blank kernel with real OS is always fine. ;; *-*) - echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 + echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2 exit 1 ;; esac @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for GNU Midnight Commander 4.8.30-git. +# Generated by GNU Autoconf 2.71 for GNU Midnight Commander 4.8.31-pre1-git. # # Report bugs to <https://www.midnight-commander.org/wiki/NewTicket>. # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GNU Midnight Commander' PACKAGE_TARNAME='mc' -PACKAGE_VERSION='4.8.30-git' -PACKAGE_STRING='GNU Midnight Commander 4.8.30-git' +PACKAGE_VERSION='4.8.31-pre1-git' +PACKAGE_STRING='GNU Midnight Commander 4.8.31-pre1-git' PACKAGE_BUGREPORT='https://www.midnight-commander.org/wiki/NewTicket' PACKAGE_URL='https://www.midnight-commander.org/' @@ -750,8 +750,8 @@ ENABLE_VFS_SFS_FALSE ENABLE_VFS_SFS_TRUE ENABLE_VFS_FTP_FALSE ENABLE_VFS_FTP_TRUE -ENABLE_VFS_FISH_FALSE -ENABLE_VFS_FISH_TRUE +ENABLE_VFS_SHELL_FALSE +ENABLE_VFS_SHELL_TRUE ENABLE_VFS_EXTFS_FALSE ENABLE_VFS_EXTFS_TRUE HAVE_ZIPINFO @@ -988,7 +988,7 @@ enable_background enable_vfs enable_vfs_cpio enable_vfs_extfs -enable_vfs_fish +enable_vfs_shell enable_vfs_ftp enable_vfs_sfs enable_vfs_sftp @@ -1585,7 +1585,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNU Midnight Commander 4.8.30-git to adapt to many kinds of systems. +\`configure' configures GNU Midnight Commander 4.8.31-pre1-git to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1660,7 +1660,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU Midnight Commander 4.8.30-git:";; + short | recursive ) echo "Configuration of GNU Midnight Commander 4.8.31-pre1-git:";; esac cat <<\_ACEOF @@ -1697,7 +1697,7 @@ Optional Features: --disable-vfs Disable VFS --enable-vfs-cpio Support for cpio filesystem [yes] --enable-vfs-extfs Support for extfs filesystem [yes] - --enable-vfs-fish Support for FISH filesystem [yes] + --enable-vfs-shell Support for SHELL filesystem [yes] --enable-vfs-ftp Support for FTP filesystem [yes] --enable-vfs-sfs Support for sfs filesystem [yes] --enable-vfs-sftp Support for SFTP filesystem [auto] @@ -1872,7 +1872,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU Midnight Commander configure 4.8.30-git +GNU Midnight Commander configure 4.8.31-pre1-git generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2477,7 +2477,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU Midnight Commander $as_me 4.8.30-git, which was +It was created by GNU Midnight Commander $as_me 4.8.31-pre1-git, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3764,7 +3764,7 @@ fi # Define the identity of the package. PACKAGE='mc' - VERSION='4.8.30-git' + VERSION='4.8.31-pre1-git' # Some tools Automake needs. @@ -19153,8 +19153,8 @@ fi else pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5 -printf %s "checking for CHECK... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for check >= 0.9.10" >&5 +printf %s "checking for check >= 0.9.10... " >&6; } if test -n "$CHECK_CFLAGS"; then pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS" @@ -19194,7 +19194,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -19203,12 +19203,12 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "check >= 0.9.10" 2>&1` + CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "check >= 0.9.10" 2>&1` else - CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "check >= 0.9.10" 2>&1` + CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "check >= 0.9.10" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$CHECK_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$CHECK_PKG_ERRORS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'Check' testing framework not found. Check your environment" >&5 @@ -19220,7 +19220,7 @@ printf "%s\n" "$as_me: WARNING: 'Check' testing framework not found. Check your fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'Check' testing framework not found. Check your environment" >&5 @@ -19232,8 +19232,8 @@ printf "%s\n" "$as_me: WARNING: 'Check' testing framework not found. Check your fi else - CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS - CHECK_LIBS=$pkg_cv_CHECK_LIBS + CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS + CHECK_LIBS=$pkg_cv_CHECK_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -19294,19 +19294,19 @@ fi glib_found=no pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 -printf %s "checking for GLIB... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.32" >&5 +printf %s "checking for glib-2.0 >= 2.32... " >&6; } if test -n "$GLIB_CFLAGS"; then pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.30\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.30") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.32\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.32") 2>&5 ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.30" 2>/dev/null` + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.32" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -19318,12 +19318,12 @@ if test -n "$GLIB_LIBS"; then pkg_cv_GLIB_LIBS="$GLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.30\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.30") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.32\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.32") 2>&5 ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.30" 2>/dev/null` + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.32" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -19335,7 +19335,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -19344,27 +19344,27 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.30" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.32" 2>&1` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.30" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.32" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$GLIB_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$GLIB_PKG_ERRORS" >&5 - : + : elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - : + : else - GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS - GLIB_LIBS=$pkg_cv_GLIB_LIBS + GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS + GLIB_LIBS=$pkg_cv_GLIB_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - glib_found=yes + glib_found=yes fi if test x"$glib_found" = xno; then - as_fn_error $? "glib-2.0 not found or version too old (must be >= 2.30)" "$LINENO" 5 + as_fn_error $? "glib-2.0 not found or version too old (must be >= 2.32)" "$LINENO" 5 fi @@ -19375,19 +19375,19 @@ fi found_gmodule=no pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5 -printf %s "checking for GMODULE... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gmodule-no-export-2.0 >= 2.32" >&5 +printf %s "checking for gmodule-no-export-2.0 >= 2.32... " >&6; } if test -n "$GMODULE_CFLAGS"; then pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-no-export-2.0 >= 2.30\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gmodule-no-export-2.0 >= 2.30") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-no-export-2.0 >= 2.32\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gmodule-no-export-2.0 >= 2.32") 2>&5 ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-no-export-2.0 >= 2.30" 2>/dev/null` + pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-no-export-2.0 >= 2.32" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -19399,12 +19399,12 @@ if test -n "$GMODULE_LIBS"; then pkg_cv_GMODULE_LIBS="$GMODULE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-no-export-2.0 >= 2.30\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gmodule-no-export-2.0 >= 2.30") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-no-export-2.0 >= 2.32\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gmodule-no-export-2.0 >= 2.32") 2>&5 ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-no-export-2.0 >= 2.30" 2>/dev/null` + pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-no-export-2.0 >= 2.32" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -19416,7 +19416,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -19425,43 +19425,43 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-no-export-2.0 >= 2.30" 2>&1` + GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-no-export-2.0 >= 2.32" 2>&1` else - GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-no-export-2.0 >= 2.30" 2>&1` + GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-no-export-2.0 >= 2.32" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$GMODULE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$GMODULE_PKG_ERRORS" >&5 - : + : elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - : + : else - GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS - GMODULE_LIBS=$pkg_cv_GMODULE_LIBS + GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS + GMODULE_LIBS=$pkg_cv_GMODULE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - found_gmodule=yes + found_gmodule=yes fi if test x"$found_gmodule" = xyes; then g_module_supported="gmodule-no-export-2.0" else pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5 -printf %s "checking for GMODULE... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gmodule-2.0 >= 2.32" >&5 +printf %s "checking for gmodule-2.0 >= 2.32... " >&6; } if test -n "$GMODULE_CFLAGS"; then pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.30\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.30") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.32\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.32") 2>&5 ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0 >= 2.30" 2>/dev/null` + pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0 >= 2.32" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -19473,12 +19473,12 @@ if test -n "$GMODULE_LIBS"; then pkg_cv_GMODULE_LIBS="$GMODULE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.30\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.30") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.32\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.32") 2>&5 ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0 >= 2.30" 2>/dev/null` + pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0 >= 2.32" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -19490,7 +19490,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -19499,24 +19499,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-2.0 >= 2.30" 2>&1` + GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-2.0 >= 2.32" 2>&1` else - GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-2.0 >= 2.30" 2>&1` + GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-2.0 >= 2.32" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$GMODULE_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$GMODULE_PKG_ERRORS" >&5 - : + : elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - : + : else - GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS - GMODULE_LIBS=$pkg_cv_GMODULE_LIBS + GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS + GMODULE_LIBS=$pkg_cv_GMODULE_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - found_gmodule=yes + found_gmodule=yes fi if test x"$found_gmodule" = xyes; then g_module_supported="gmodule-2.0" @@ -19719,8 +19719,8 @@ fi found_slang=no pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SLANG" >&5 -printf %s "checking for SLANG... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for slang >= 2.0" >&5 +printf %s "checking for slang >= 2.0... " >&6; } if test -n "$SLANG_CFLAGS"; then pkg_cv_SLANG_CFLAGS="$SLANG_CFLAGS" @@ -19760,7 +19760,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -19769,24 +19769,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SLANG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "slang >= 2.0" 2>&1` + SLANG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "slang >= 2.0" 2>&1` else - SLANG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "slang >= 2.0" 2>&1` + SLANG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "slang >= 2.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$SLANG_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$SLANG_PKG_ERRORS" >&5 - : + : elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - : + : else - SLANG_CFLAGS=$pkg_cv_SLANG_CFLAGS - SLANG_LIBS=$pkg_cv_SLANG_LIBS + SLANG_CFLAGS=$pkg_cv_SLANG_CFLAGS + SLANG_LIBS=$pkg_cv_SLANG_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - found_slang=yes + found_slang=yes fi if test x"$found_slang" = xno; then as_fn_error $? "S-Lang >= 2.0.0 library not found" "$LINENO" 5 @@ -27337,8 +27337,8 @@ fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EXT2FS" >&5 -printf %s "checking for EXT2FS... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ext2fs >= 1.42.4" >&5 +printf %s "checking for ext2fs >= 1.42.4... " >&6; } if test -n "$EXT2FS_CFLAGS"; then pkg_cv_EXT2FS_CFLAGS="$EXT2FS_CFLAGS" @@ -27378,7 +27378,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -27387,31 +27387,31 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EXT2FS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ext2fs >= 1.42.4" 2>&1` + EXT2FS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ext2fs >= 1.42.4" 2>&1` else - EXT2FS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ext2fs >= 1.42.4" 2>&1` + EXT2FS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ext2fs >= 1.42.4" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$EXT2FS_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$EXT2FS_PKG_ERRORS" >&5 - : + : elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - : + : else - EXT2FS_CFLAGS=$pkg_cv_EXT2FS_CFLAGS - EXT2FS_LIBS=$pkg_cv_EXT2FS_LIBS + EXT2FS_CFLAGS=$pkg_cv_EXT2FS_CFLAGS + EXT2FS_LIBS=$pkg_cv_EXT2FS_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - found_ext2fs=yes + found_ext2fs=yes fi if test x"$found_ext2fs" = "xyes"; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for E2P" >&5 -printf %s "checking for E2P... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for e2p >= 1.42.4" >&5 +printf %s "checking for e2p >= 1.42.4... " >&6; } if test -n "$E2P_CFLAGS"; then pkg_cv_E2P_CFLAGS="$E2P_CFLAGS" @@ -27451,7 +27451,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -27460,33 +27460,32 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - E2P_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "e2p >= 1.42.4" 2>&1` + E2P_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "e2p >= 1.42.4" 2>&1` else - E2P_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "e2p >= 1.42.4" 2>&1` + E2P_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "e2p >= 1.42.4" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$E2P_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$E2P_PKG_ERRORS" >&5 - : + : elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - : + : else - E2P_CFLAGS=$pkg_cv_E2P_CFLAGS - E2P_LIBS=$pkg_cv_E2P_LIBS + E2P_CFLAGS=$pkg_cv_E2P_CFLAGS + E2P_LIBS=$pkg_cv_E2P_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - found_e2p=yes + found_e2p=yes fi if test x"$found_e2p" = "xyes"; then printf "%s\n" "#define ENABLE_EXT2FS_ATTR 1" >>confdefs.h - - MCLIBS="$MCLIBS $E2P_LIBS" + CPPFLAGS="$CPPFLAGS $EXT2FS_CFLAGS $E2P_CFLAGS" ext2fs_attr_msg="yes" else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: e2p library not found or version too old (must be >= 1.42.4)" >&5 @@ -27707,31 +27706,31 @@ fi - # Check whether --enable-vfs-fish was given. -if test ${enable_vfs_fish+y} + # Check whether --enable-vfs-shell was given. +if test ${enable_vfs_shell+y} then : - enableval=$enable_vfs_fish; + enableval=$enable_vfs_shell; fi - if test "$enable_vfs" = "yes" -a "x$enable_vfs_fish" != xno; then - enable_vfs_fish="yes" + if test "$enable_vfs" = "yes" -a "x$enable_vfs_shell" != xno; then + enable_vfs_shell="yes" if test x"$vfs_flags" = "x" ; then - vfs_flags="fish" + vfs_flags="shell" else - vfs_flags="$vfs_flags, fish" + vfs_flags="$vfs_flags, shell" fi -printf "%s\n" "#define ENABLE_VFS_FISH 1" >>confdefs.h +printf "%s\n" "#define ENABLE_VFS_SHELL 1" >>confdefs.h fi - if test "$enable_vfs" = "yes" -a x"$enable_vfs_fish" = x"yes"; then - ENABLE_VFS_FISH_TRUE= - ENABLE_VFS_FISH_FALSE='#' + if test "$enable_vfs" = "yes" -a x"$enable_vfs_shell" = x"yes"; then + ENABLE_VFS_SHELL_TRUE= + ENABLE_VFS_SHELL_FALSE='#' else - ENABLE_VFS_FISH_TRUE='#' - ENABLE_VFS_FISH_FALSE= + ENABLE_VFS_SHELL_TRUE='#' + ENABLE_VFS_SHELL_FALSE= fi @@ -27803,8 +27802,8 @@ fi if test "$enable_vfs" != "no" -a x"$enable_vfs_sftp" != x"no"; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBSSH" >&5 -printf %s "checking for LIBSSH... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libssh2 >= 1.2.8" >&5 +printf %s "checking for libssh2 >= 1.2.8... " >&6; } if test -n "$LIBSSH_CFLAGS"; then pkg_cv_LIBSSH_CFLAGS="$LIBSSH_CFLAGS" @@ -27844,7 +27843,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -27853,24 +27852,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBSSH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libssh2 >= 1.2.8" 2>&1` + LIBSSH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libssh2 >= 1.2.8" 2>&1` else - LIBSSH_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libssh2 >= 1.2.8" 2>&1` + LIBSSH_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libssh2 >= 1.2.8" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$LIBSSH_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$LIBSSH_PKG_ERRORS" >&5 - : + : elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - : + : else - LIBSSH_CFLAGS=$pkg_cv_LIBSSH_CFLAGS - LIBSSH_LIBS=$pkg_cv_LIBSSH_LIBS + LIBSSH_CFLAGS=$pkg_cv_LIBSSH_CFLAGS + LIBSSH_LIBS=$pkg_cv_LIBSSH_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - found_libssh=yes + found_libssh=yes fi if test x"$found_libssh" = "xyes"; then @@ -27956,8 +27955,8 @@ fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for COM_ERR" >&5 -printf %s "checking for COM_ERR... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for com_err >= 1.42.4" >&5 +printf %s "checking for com_err >= 1.42.4... " >&6; } if test -n "$COM_ERR_CFLAGS"; then pkg_cv_COM_ERR_CFLAGS="$COM_ERR_CFLAGS" @@ -27997,7 +27996,7 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -28006,24 +28005,24 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - COM_ERR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "com_err >= 1.42.4" 2>&1` + COM_ERR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "com_err >= 1.42.4" 2>&1` else - COM_ERR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "com_err >= 1.42.4" 2>&1` + COM_ERR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "com_err >= 1.42.4" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$COM_ERR_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$COM_ERR_PKG_ERRORS" >&5 - : + : elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - : + : else - COM_ERR_CFLAGS=$pkg_cv_COM_ERR_CFLAGS - COM_ERR_LIBS=$pkg_cv_COM_ERR_LIBS + COM_ERR_CFLAGS=$pkg_cv_COM_ERR_CFLAGS + COM_ERR_LIBS=$pkg_cv_COM_ERR_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - com_err=yes + com_err=yes fi if test x"$com_err" = "xyes"; then @@ -28072,7 +28071,7 @@ else fi - if test x"$enable_vfs_ftp" = x"yes" -o x"$enable_vfs_fish" = x"yes" -o x"$enable_vfs_sftp" = x"yes"; then + if test x"$enable_vfs_ftp" = x"yes" -o x"$enable_vfs_shell" = x"yes" -o x"$enable_vfs_sftp" = x"yes"; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5 @@ -30538,7 +30537,7 @@ fi ac_config_files="$ac_config_files src/man2hlp/man2hlp" -ac_config_files="$ac_config_files Makefile contrib/Makefile 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.ini 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/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 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 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.ini 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/shell/Makefile src/vfs/shell/helpers/Makefile src/vfs/ftpfs/Makefile src/vfs/sftpfs/Makefile src/vfs/local/Makefile src/vfs/sfs/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 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 misc/syntax/Syntax" @@ -30720,8 +30719,8 @@ if test -z "${ENABLE_VFS_EXTFS_TRUE}" && test -z "${ENABLE_VFS_EXTFS_FALSE}"; th as_fn_error $? "conditional \"ENABLE_VFS_EXTFS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${ENABLE_VFS_FISH_TRUE}" && test -z "${ENABLE_VFS_FISH_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_VFS_FISH\" was never defined. +if test -z "${ENABLE_VFS_SHELL_TRUE}" && test -z "${ENABLE_VFS_SHELL_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_VFS_SHELL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_VFS_FTP_TRUE}" && test -z "${ENABLE_VFS_FTP_FALSE}"; then @@ -31266,7 +31265,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNU Midnight Commander $as_me 4.8.30-git, which was +This file was extended by GNU Midnight Commander $as_me 4.8.31-pre1-git, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31336,7 +31335,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -GNU Midnight Commander config.status 4.8.30-git +GNU Midnight Commander config.status 4.8.31-pre1-git configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" @@ -31818,8 +31817,8 @@ do "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" ;; - "src/vfs/fish/helpers/Makefile") CONFIG_FILES="$CONFIG_FILES src/vfs/fish/helpers/Makefile" ;; + "src/vfs/shell/Makefile") CONFIG_FILES="$CONFIG_FILES src/vfs/shell/Makefile" ;; + "src/vfs/shell/helpers/Makefile") CONFIG_FILES="$CONFIG_FILES src/vfs/shell/helpers/Makefile" ;; "src/vfs/ftpfs/Makefile") CONFIG_FILES="$CONFIG_FILES src/vfs/ftpfs/Makefile" ;; "src/vfs/sftpfs/Makefile") CONFIG_FILES="$CONFIG_FILES src/vfs/sftpfs/Makefile" ;; "src/vfs/local/Makefile") CONFIG_FILES="$CONFIG_FILES src/vfs/local/Makefile" ;; diff --git a/configure.ac b/configure.ac index c1a1460..5cf1f2f 100644 --- a/configure.ac +++ b/configure.ac @@ -654,8 +654,8 @@ 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/shell/Makefile +src/vfs/shell/helpers/Makefile src/vfs/ftpfs/Makefile diff --git a/contrib/Makefile.in b/contrib/Makefile.in index 395805c..fc91d58 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ @@ -152,7 +152,7 @@ Frequently Asked Questions 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.30 installed. + To compile any edition you need to have glib >= 2.32 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 diff --git a/doc/HACKING b/doc/HACKING index 15cc1de..5957f17 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -19,7 +19,7 @@ required: Autoconf 2.64 and above (latest is recommended) Automake 1.12 and above (latest is recommended) Gettext 0.18.2 and above -Glib 2.30 and above +Glib 2.32 and above Full list of requirements you can see at: https://www.midnight-commander.org/wiki/doc/buildAndInstall/req diff --git a/doc/INSTALL b/doc/INSTALL index 3881c52..1e5d1a2 100644 --- a/doc/INSTALL +++ b/doc/INSTALL @@ -15,7 +15,7 @@ Build requirements for GNU Midnight Commander - autoconf >= 2.64 - automake >= 1.12 - libtool -- glib2 >= 2.30 +- glib2 >= 2.32 - slang2 or ncurses - gettext >= 0.18.2 - libssh2 >= 1.2.8 is required only for sftp vfs @@ -171,9 +171,9 @@ VFS options: (on by default) Support for FTP vfs -`--enable-vfs-fish' +`--enable-vfs-shell' (on by default) - Support for FISH vfs + Support for SHELL vfs `--enable-vfs-sftp' (auto) @@ -367,8 +367,8 @@ get glib from ftp://ftp.gnome.org/pub/gnome/sources/glib/ -Minimal version of glib: 2.30.0 -Recommended version: 2.30.x and higher. +Minimal version of glib: 2.32.0 +Recommended version: 2.32.x and higher. Newer versions may work, but haven't been tested. diff --git a/doc/Makefile.in b/doc/Makefile.in index 771f873..2d7cdeb 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -180,7 +180,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ @@ -1,3 +1,36 @@ +Version 4.8.31 + +- Core + + * Minimal version of GLib is 2.32.0. + +- VFS + + * fish: drop support of native FISH server and protocol. Rename VFS to shell (#4232) + * extfs; + * uc1541 extfs: update up to 3.6 version (#4511) + * s3+: port to Python3 (#4324) + * Support for LZO/LZOP compression format (#4509) + +- Misc + + * Skins: add color for non-printable characters in editor (#4433) + +- Fixes + + * FTBFS on FreeBSD with ext2fs attribute support (#4493) + * Broken stickchars (-a) mode (#4498) + * Wrong timestamp after resuming of file copy operation (#4499) + * Editor: wrong deletion of marked column (#3761) + * Diff viewer: segfault when display of line numbers is enabled (#4500) + * Tar VFS: broken handling of hard links (#4494) + * Sftp VFS: failure establishing SSH session due hashed host names in ~/.ssh/known_hosts (#4506) + * Shell VFS: incorrect file names with cyrillic or diacritic symbols (#4507) + * mc.ext.ini: incorrect description of of how multiple sections and keys with same names are processed (#4497) + * mc.ext.ini: unescaped backslash \ is treated as invalid escape sequence in glib-2.77.3 and glib-2.79 (#4502) + * mc.ext.ini: file "Makefile.zip" is handled as Makefile not as zip-arhive (#4419) + + Version 4.8.30 - Core @@ -128,7 +128,7 @@ These are hints for the text mode edition: * The Virtual File System is a cute addition to the project, you may browse in tar and compressed tar files as well as browsing remote - machines with the fish file system. + machines with the shell file system. * Please read the manual page. @@ -73,7 +73,7 @@ window title. Better date parser - don't allow seconds and year in ftp listings on the same line. -Report errors in fish operations and recover from them. +Report errors in shell operations and recover from them. Allow colors to be defined in the mc.lib file. Make it possible to avoid using a super-long line to redefine all colors. @@ -82,7 +82,7 @@ Filters in the editor should operate on the open file - don't close and reopen the file. They don't work on VFS now. For example, a gzipped files on FTP cannot be edited. -ftp and fish with home != '/' - readjust directory to the home. +ftp and shell with home != '/' - readjust directory to the home. Make "Find File" dialog more responsive. Keep state in a structure and preserve it when the search is suspended. diff --git a/doc/hints/Makefile.in b/doc/hints/Makefile.in index 9499176..de0b610 100644 --- a/doc/hints/Makefile.in +++ b/doc/hints/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/doc/hints/l10n/Makefile.in b/doc/hints/l10n/Makefile.in index 5309b2b..e3c292b 100644 --- a/doc/hints/l10n/Makefile.in +++ b/doc/hints/l10n/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/doc/hints/l10n/mc.hint.be b/doc/hints/l10n/mc.hint.be index d77b227..ee8dbc2 100644 --- a/doc/hints/l10n/mc.hint.be +++ b/doc/hints/l10n/mc.hint.be @@ -1,10 +1,10 @@ -Падказка. «C-x t» перапіÑвае Ñž загадны радок назвы пазначаных файлаў. +Падказка. «C-x t» перапіÑвае Ñž камандны радок назвы пазначаных файлаў. -Падказка. «C-x p» перапіÑвае у загадны радок дзейны шлÑÑ…. +Падказка. «C-x p» перапіÑвае у камандны радок дзейны шлÑÑ…. Падказка. «M-Tab» ці «Esc+Tab» дапаўнÑе набранае. Каб убачыць ÑьпіÑ, націÑьніце двойчы. -Падказка. «M-p» Ñ– «M-n» дае доÑтуп да гіÑторыі загадаў. +Падказка. «M-p» Ñ– «M-n» дае доÑтуп да гіÑторыі каманд. Падказка. ТрÑба ÑžÑтавіць знак літаральна? ЦіÑьніце «Control-q» Ñ– знак. @@ -36,7 +36,7 @@ Падказка. Хочаце звычайную абалонку? ЦіÑьніце «C-o», а каб вÑрнуцца — «C-o» ÑÑˆÑ‡Ñ Ñ€Ð°Ð·. -Падказка. Каб хутчÑй набіраць загады «cd …», вызначце зьменную «CDPATH». +Падказка. Каб хутчÑй набіраць каманды «cd …», вызначце зьменную «CDPATH». Падказка. Калі хочаце бачыць ÑÑ…Ð°Ð²Ð°Ð½Ñ‹Ñ Ñ„Ð°Ð¹Ð»Ñ‹ «.*», вызначце гÑта Ñž «ÐаÑтаўленьнÑх». @@ -48,17 +48,17 @@ Ðамінка. Шукаць файл: кнопка «Ðа панÑль» дазвалÑе працаваць Ñа знойдзеным. -Падказка. Калі патрÑбны Ñкладаны пошук, ужывайце загад «Ðа вонкавую панÑль». +Падказка. Калі патрÑбны Ñкладаны пошук, ужывайце каманду «Ðа вонкавую панÑль». -Падказка. Каб хутка зьмÑніць каталёґ, калі набіраеце загад, ціÑьніце «M-c». +Падказка. Каб хутка зьмÑніць каталёґ, калі набіраеце каманду, ціÑьніце «M-c». -Падказка: загады абалонкі могуць не працаваць на немÑÑцовых файлавых ÑÑ‹ÑÑ‚Ñмах. +Падказка: каманды абалонкі могуць не працаваць на немÑÑцовых файлавых ÑÑ‹ÑÑ‚Ñмах. Падказка. «C-y» вÑртае Ñтрачаны Ñ‚ÑкÑÑ‚. Падказка. ПÑÑžÐ½Ñ‹Ñ ÐºÐ»Ñвішы не працуюць? Зірніце «Ðалады» → «Вывучыць клÑвішы». -Падказка. Каб пабачыць вывад загаду Ñž праглÑдніку, ціÑьніце «M-!» +Падказка. Каб пабачыць вывад каманды Ñž праглÑдніку, ціÑьніце «M-!» Падказка. «F13» (або «Shift-F3») праглÑдае файл наўпроÑÑ‚. diff --git a/doc/hints/l10n/mc.hint.ko b/doc/hints/l10n/mc.hint.ko index d4c4c94..a61af68 100644 --- a/doc/hints/l10n/mc.hint.ko +++ b/doc/hints/l10n/mc.hint.ko @@ -12,7 +12,7 @@ 힌트: ë””ë ‰í„°ë¦¬ ì„ íƒ: ì¼ì¹˜í•˜ëŠ” íŒ¨í„´ì˜ ëì— ìŠ¬ëž˜ì‹œë¥¼ 추가합니다. -힌트: 터미ë„ì— ê¸°ëŠ¥ 키가 없는 경우 ESC+ìˆ«ìž ì‹œí€€ìŠ¤ë¥¼ 사용합니다. +힌트: 터미ë„ì— ê¸°ëŠ¥ 키가 없으면 ESC+ìˆ«ìž ì‹œí€€ìŠ¤ë¥¼ 사용합니다. 힌트: GNU 미드나잇 ì»¤ë§¨ë” í™ˆíŽ˜ì´ì§€: https://www.midnight-commander.org @@ -22,7 +22,7 @@ 힌트: VFS cool: tar 파ì¼ì„ ìž…ë ¥í•˜ì—¬ ë‚´ìš©ì„ ê²€í† í•©ë‹ˆë‹¤. -힌트 : 우리는 ë˜í•œ 멋진 매뉴얼 페ì´ì§€ë¥¼ ê°€ì§€ê³ ìžˆìŠµë‹ˆë‹¤. +힌트 : 멋진 매뉴얼 페ì´ì§€ë„ 있습니다. 힌트 : Lynx ìŠ¤íƒ€ì¼ íƒìƒ‰ì„ ì›í•˜ì‹ë‹ˆê¹Œ? 구성 대화 ìƒìžì—ì„œ ì„¤ì •í•˜ì‹ì‹œì˜¤. @@ -44,7 +44,7 @@ 힌트: ì™„ì„±ì€ ëª¨ë“ ëŒ€í™” ìƒìžì˜ ëª¨ë“ ìž…ë ¥ ë¼ì¸ì—ì„œ ìž‘ë™í•©ë‹ˆë‹¤. M-Tabì„ ëˆ„ë¥´ë©´ ë©ë‹ˆë‹¤. -힌트: ëŠë¦° 터미ë„ì—ì„œ -s 플래그가 ë„ì›€ì´ ë 수 있습니다. +힌트: ëŠë¦° 터미ë„ì—는 -s 플래그가 ë„ì›€ì´ ë 수 있습니다. 힌트 : íŒŒì¼ ì°¾ê¸° : íŒ¨ë„ í¬ê¸°ì¡°ì • ë²„íŠ¼ì„ ì‚¬ìš©í•˜ì—¬ ì°¾ì€ íŒŒì¼ì„ ìž‘ì—…í• ìˆ˜ 있습니다. diff --git a/doc/hlp/Makefile.in b/doc/hlp/Makefile.in index a9762d8..5a36855 100644 --- a/doc/hlp/Makefile.in +++ b/doc/hlp/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/doc/hlp/es/Makefile.in b/doc/hlp/es/Makefile.in index 0b329d3..aa1960f 100644 --- a/doc/hlp/es/Makefile.in +++ b/doc/hlp/es/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/doc/hlp/hu/Makefile.in b/doc/hlp/hu/Makefile.in index bce7a8a..466075d 100644 --- a/doc/hlp/hu/Makefile.in +++ b/doc/hlp/hu/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/doc/hlp/it/Makefile.in b/doc/hlp/it/Makefile.in index 7c9c441..4afe80d 100644 --- a/doc/hlp/it/Makefile.in +++ b/doc/hlp/it/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/doc/hlp/pl/Makefile.in b/doc/hlp/pl/Makefile.in index 5f88cc7..c7124ac 100644 --- a/doc/hlp/pl/Makefile.in +++ b/doc/hlp/pl/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/doc/hlp/ru/Makefile.in b/doc/hlp/ru/Makefile.in index ab357fb..716c28a 100644 --- a/doc/hlp/ru/Makefile.in +++ b/doc/hlp/ru/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/doc/hlp/sr/Makefile.in b/doc/hlp/sr/Makefile.in index ec1160f..4bfc145 100644 --- a/doc/hlp/sr/Makefile.in +++ b/doc/hlp/sr/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in index 2c7bf84..f1e5c02 100644 --- a/doc/man/Makefile.in +++ b/doc/man/Makefile.in @@ -133,7 +133,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/doc/man/es/Makefile.in b/doc/man/es/Makefile.in index 7e9890e..98bc73c 100644 --- a/doc/man/es/Makefile.in +++ b/doc/man/es/Makefile.in @@ -133,7 +133,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/doc/man/es/mc.1.in b/doc/man/es/mc.1.in index b2c3db7..602251e 100644 --- a/doc/man/es/mc.1.in +++ b/doc/man/es/mc.1.in @@ -3405,8 +3405,8 @@ de error: errdfocus, errdhotnormal, errdhotfocus, errdtitle; los colores de la ayuda: helpnormal, helpitalic, helpbold, helplink, helpslink, helptitle; los colores del visor: viewnormal, viewbold, viewunderline, viewselected; loc colores del editor: editnormal, editbold, editmarked, -editwhitespace, editlinestate; los colores de los menús desplegables: -pmenunormal, pmenusel, pmenutitle. +editwhitespace, editnonprintable, editlinestate; los colores de los menús +desplegables: pmenunormal, pmenusel, pmenutitle. .PP .I header determina el color del encabezado de los paneles, la lÃnea con los diff --git a/doc/man/hu/Makefile.in b/doc/man/hu/Makefile.in index 83cb00f..f451c3e 100644 --- a/doc/man/hu/Makefile.in +++ b/doc/man/hu/Makefile.in @@ -133,7 +133,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/doc/man/hu/mc.1.in b/doc/man/hu/mc.1.in index 5f26f62..f668a7c 100644 --- a/doc/man/hu/mc.1.in +++ b/doc/man/hu/mc.1.in @@ -2869,7 +2869,7 @@ dhotnormal, dhotfocus; Súgó szÃnek: helpnormal, helpitalic, helpbold, helplink, helpslink; FájlnézÅ‘ szÃnek: viewunderline; Speciális kijelölés szÃnei: executable, directory, link, stalelink, device, special, core; Viewer colors are: viewnormal, viewbold, viewunderline, viewselected. -SzerkesztÅ‘ szÃnei: editnormal, editbold, editmarked. +SzerkesztÅ‘ szÃnei: editnormal, editbold, editmarked, editnonprintable. .PP .I input maghatározza a beviteli sorok szÃnét a dialogus ablakora vonatkozóan. diff --git a/doc/man/it/Makefile.in b/doc/man/it/Makefile.in index d7fbfc1..57f94f8 100644 --- a/doc/man/it/Makefile.in +++ b/doc/man/it/Makefile.in @@ -133,7 +133,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/doc/man/it/mc.1.in b/doc/man/it/mc.1.in index 3a45893..4cbf4a4 100644 --- a/doc/man/it/mc.1.in +++ b/doc/man/it/mc.1.in @@ -2881,7 +2881,7 @@ Il colore del visualizzatore è: viewunderline. Colori speciali di evidenziazione: executable, directory, link, device, special, core. I colori dell'viewer sono: viewnormal, viewbold, viewunderline, viewselected. -I colori dell'editor sono: editnormal, editbold, editmarked. +I colori dell'editor sono: editnormal, editbold, editmarked, editnonprintable. .PP .I input determina il colore delle righe di input usate delle finestre di dialogo. diff --git a/doc/man/mc.1.in b/doc/man/mc.1.in index e6aad0e..aad40fe 100644 --- a/doc/man/mc.1.in +++ b/doc/man/mc.1.in @@ -3138,7 +3138,7 @@ used to manipulate tar and compressed tar files; the .IR undelfs , used to recover deleted files on ext2 file systems (the default file system for Linux systems), -.I fish +.I shell (for manipulating files over shell connections such as rsh and ssh). If the code was compiled with .I sftpfs @@ -3225,10 +3225,9 @@ Examples: The latter specifies the full path of the tar archive. .\"NODE " FIle transfer over SHell filesystem" .SH " FIle transfer over SHell filesystem" -The fish file system is a network based file system that allows you to +The shell file system is a network based file system that allows you to manipulate the files in a remote machine as if they were local. To use -this, the other side has to either run fish server, or has to have -bash\-compatible shell. +this, the other side has to have bash\-compatible shell. .PP To connect to a remote machine, you just need to chdir into a special directory which name is in the following @@ -3514,8 +3513,8 @@ dhotnormal, dhotfocus, dtitle. Error dialog colors are: errdfocus, errdhotnormal errdhotfocus, errdtitle. Help colors are: helpnormal, helpitalic, helpbold, helplink, helpslink, helptitle. Viewer colors are: viewnormal, viewbold, viewunderline, viewselected. Editor colors are: editnormal, editbold, editmarked, -editwhitespace, editlinestate. Popup menu colors are: pmenunormal, pmenusel, -pmenutitle. +editwhitespace, editnonprintable, editlinestate. Popup menu colors are: pmenunormal, +pmenusel, pmenutitle. .PP .I header determines the color of panel header, the line that contains column titles @@ -4095,7 +4094,7 @@ If this variable is on (default is off) when you browse the file system on a Tree panel, it will automatically reload the other panel with the contents of the selected directory. .TP -.I fish_directory_timeout +.I shell_directory_timeout This variable holds the lifetime of a directory cache entry in seconds. The default value is 900 seconds. .TP diff --git a/doc/man/pl/Makefile.in b/doc/man/pl/Makefile.in index d6c2b04..22e5fe1 100644 --- a/doc/man/pl/Makefile.in +++ b/doc/man/pl/Makefile.in @@ -133,7 +133,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/doc/man/pl/mc.1.in b/doc/man/pl/mc.1.in index 344c4b2..e7341f5 100644 --- a/doc/man/pl/mc.1.in +++ b/doc/man/pl/mc.1.in @@ -2542,8 +2542,8 @@ dhotfocus; Kolory pomocy: helpnormal, helpitalic, helpbold, helplink, helpslink; Kolory podglÄ…du: viewunderline; Specjalne tryby podÅ›wietlenia: executable, directory, link, device, special. Viewer colors are: viewnormal, viewbold, viewunderline, viewselected. Editor colors are: editnormal, editbold, -editmarked, editwhitespace, editlinestate. Popup menu colors are: pmenunormal, -pmenusel, pmenutitle. +editmarked, editwhitespace, editnonprintable, editlinestate. Popup menu colors +are: pmenunormal, pmenusel, pmenutitle. [nie tÅ‚umaczyÅ‚em nazw z racji tego, że trzeba je stosować w ich angielskim brzmieniu \- jeÅ›li jesteÅ› aż tak zaawansowany, użyj sÅ‚ownika]. .PP diff --git a/doc/man/ru/Makefile.in b/doc/man/ru/Makefile.in index be41579..d59f2da 100644 --- a/doc/man/ru/Makefile.in +++ b/doc/man/ru/Makefile.in @@ -133,7 +133,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/doc/man/ru/mc.1.in b/doc/man/ru/mc.1.in index badde23..d958b77 100644 --- a/doc/man/ru/mc.1.in +++ b/doc/man/ru/mc.1.in @@ -42,7 +42,7 @@ UNIX\-подобных операционных ÑиÑтемах. .\"Colors" .TP .I \-\-configure\-options -Выводит опции конфигурированиÑ, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ был Ñобран Midnight Commander. +Выводит опции конфигурированиÑ, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ был Ñобран Midnight Commander. .TP .I \-d, \-\-nomouse Отключает поддержку мыши. @@ -75,7 +75,7 @@ termcap/terminfo. Ðтот ключ иÑпользуетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ на Ñ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ð¹ к дейÑтвиÑм. .TP .I \-l файл, \-\-ftplog=файл -Сохранить диалог Ñ ftp\-Ñервером в файл file. +Сохранить диалог Ñ FTP\-Ñервером в файл file. .TP .I \-\-nokeymap Ðе загружать клавиатурные комбинации из файла, иÑпользовать определённые @@ -83,7 +83,7 @@ termcap/terminfo. Ðтот ключ иÑпользуетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ на Ñ .TP .I \-P файл, \-\-printwd=файл По окончании работы Midnight Commander запишет поÑледний текущий каталог -в указанный файл. Ðту опцию не Ñледует иÑпользовать напрÑмую. Она +в указанный файл. Ðту опцию не Ñледует иÑпользовать напрÑмую. Она иÑпользуетÑÑ Ñпециальной функцией оболочки, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¼ÐµÐ½Ñет текущий каталог оболочки на поÑледний каталог, иÑпользованный Midnight Commander. @@ -576,8 +576,8 @@ Midnight Commander\-а. Ð”Ð»Ñ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‚Ð° к вашему приложен .TP .B Alt\-i Сделать текущий каталог активной панели также текущим каталогом -неактивной панели. ЕÑли необходимо, перевеÑти неактивную панель в режим -Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ ÑпиÑка файлов. ЕÑли Ð°ÐºÑ‚Ð¸Ð²Ð½Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ находитÑÑ Ð² режиме +неактивной панели. ЕÑли необходимо, перевеÑти неактивную панель в режим +Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ ÑпиÑка файлов. ЕÑли Ð°ÐºÑ‚Ð¸Ð²Ð½Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ находитÑÑ Ð² режиме панелизации, Ð½ÐµÐ°ÐºÑ‚Ð¸Ð²Ð½Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ в Ñтот режим не переводитÑÑ. .TP .B C\-PageUp, C\-PageDown @@ -816,7 +816,7 @@ Commander\-ом (например, Ñимвол '+'). программы Midnight Commander. Один из пунктов Ñтого меню Ñлужит Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð½Ð°Ñтроек, заданных пользователем. .\"NODE " Left and Right Menus" -.SH "Меню левой и правой (или верхней и нижней) панелей" +.SH " Меню левой и правой (или верхней и нижней) панелей" Вид панелей, в которых отображаютÑÑ ÑпиÑки файлов и каталогов, может быть изменен через пункты меню .B "ЛеваÑ" (или "ВерхнÑÑ") @@ -986,7 +986,7 @@ half name | size:7 | type mode:3 .B Tab в панель проÑмотра, вы Ñможете иÑпользовать вÑе команды ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ñмотром. .\"NODE " Sort Order..." -.SH "ПорÑдок Ñортировки..." +.SH " ПорÑдок Ñортировки..." Отображение ÑпиÑка файлов в любой из панелей может производитьÑÑ Ð² ÑоответÑтвии Ñ Ð¾Ð´Ð½Ð¸Ð¼ из воÑьми порÑдков Ñортировки: .nf @@ -1069,7 +1069,7 @@ Escape\-поÑледовательноÑти, генерируемые клавРвÑÑ‚Ñ€Ð¾ÐµÐ½Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° проÑмотра\&, .\"Internal File Viewer" но, ÑнÑв отметку Ñ Ð¾Ð¿Ñ†Ð¸Ð¸ -.I "Ð’Ñтроенный проÑмотр" +.I "Ð’Ñтроенный проÑмотр" в пункте "КонфигурациÑ" меню "ÐаÑтройки", можно вызывать внешнюю программу проÑмотра, путь к которой должен быть указан в переменной Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ .BR PAGER . @@ -1125,7 +1125,7 @@ F13, вÑÑ‚Ñ€Ð¾ÐµÐ½Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° проÑмотра не выполРвыÑтавив конфигурационную опцию preallocate_space. О том, как задать шаблон Ð´Ð»Ñ Ð¸Ð¼ÐµÐ½ копируемых файлов (обычно Ñто "*" или "^\\(.*\\)$", в завиÑимоÑти от уÑтановки опции -.IR "Образцы в Ñтиле shell" , +.IR "Образцы в Ñтиле shell" , и о допуÑтимых Ñимволах замены (wildcards) в Ñтроке целевого каталога вы можете узнать, проÑмотрев раздел .\"LINK2" @@ -1364,8 +1364,8 @@ Midnight Commander за Ñчет Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² личное меню Ð Ñтроку оболочки (перемещение подÑветки \- клавишами .BR Up/Down , копирование \- по клавише -.BR Enter ) - ДоÑтуп к иÑтории команд можно получить также по комбинациÑм клавиш +.BR Enter ). +ДоÑтуп к иÑтории команд можно получить также по комбинациÑм клавиш .B Alt\-p или .BR Alt\-n , @@ -1388,7 +1388,7 @@ Midnight Commander за Ñчет Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² личное меню Ротображает ÑпиÑок виртуальных файловых ÑиÑтем, активных на наÑтоÑщий момент. Можно перейти на выбранную виртуальную файловую ÑиÑтему. Ð”Ð»Ñ ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑпиÑка выберите кнопку -.B [ОÑвежить] +.B [ОÑвежить] в диалоговом окне. Кнопка .B [ОÑвободить ВФС ÑейчаÑ] @@ -1853,7 +1853,7 @@ L List the contents of a compressed tar\-archive меню, а другое \- Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ, надо предпоÑлать пункту меню две Ñтроки уÑловий, одну \- начинающуюÑÑ Ñ '+', и другую \- начинающуюÑÑ Ñ '='. .\"NODE " Options Menu" -.SH "Меню 'ÐаÑтройки'" +.SH " Меню 'ÐаÑтройки'" Программа Midnight Commander имеет Ñ€Ñд уÑтановок (опций), ÐºÐ°Ð¶Ð´Ð°Ñ Ð¸Ð· которых может быть включена или выключена, Ð´Ð»Ñ Ñ‡ÐµÐ³Ð¾ Ñлужат неÑколько диалоговых окон, доÑтупных через меню "ÐаÑтройки". ÐžÐ¿Ñ†Ð¸Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð°, еÑли @@ -1977,7 +1977,7 @@ mc на Ñкране. и еÑли за Ñто Ð²Ñ€ÐµÐ¼Ñ Ð½Ð¸ одна клавиша не нажата, то Esc интерпретируетÑÑ ÐºÐ°Ðº команда "Отмена" (Esc Esc). .PP -.IR Интервал . +.IR "Интервал" . Ðта Ð¾Ð¿Ñ†Ð¸Ñ Ð¸ÑпользуетÑÑ Ð´Ð»Ñ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð³Ð¾ интервала (в микроÑекундах) Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾Ð´Ð½Ð¾ÐºÑ€Ð°Ñ‚Ð½Ð¾Ð³Ð¾ Ð½Ð°Ð¶Ð°Ñ‚Ð¸Ñ Ð½Ð° клавишу Esc. По умолчанию Ñтот интервал равен 1 Ñекунде (1000000 микроÑекунд). Кроме того, Ñтот интервал @@ -1985,13 +1985,13 @@ mc на Ñкране. (также в микроÑекундах), ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¸Ð¼ÐµÐµÑ‚ приоритет над над значением Ñтой опции. .PP -.B Пауза поÑле иÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ +.B "Пауза поÑле иÑполнениÑ" .PP ПоÑле Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð²Ð°ÑˆÐµÐ¹ команды Midnight Commander может обеÑпечить паузу, чтобы вы могли проÑмотреть и изучить вывод команды. ЕÑÑ‚ÑŒ три варианта уÑтановки Ñтой опции: .PP -.IR Ðикогда . +.IR "Ðикогда" . Ðто значит, что вы не хотите видеть вывод команды. Ðа конÑоли Linux или FreeBSD или при иÑпользовании xterm вы можете проÑмотреть Ñтот вывод, нажав C\-o. @@ -2001,10 +2001,10 @@ FreeBSD или при иÑпользовании xterm вы можете Ð¿Ñ€Ð¾Ñ Ð¿Ð¾ÐºÐ°Ð· вывода поÑледней из выполнÑвшихÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´ (Ñто любые терминалы, отличные от xterm или конÑоли Linux). .PP -.IR Ð’Ñегда . +.IR "Ð’Ñегда" . Программа обеÑпечит паузу поÑле Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð»ÑŽÐ±Ð¾Ð¹ команды. .PP -.B Прочие наÑтройки +.B "Прочие наÑтройки" .PP .IR "Ð’Ñтроенный редактор" . ЕÑли Ñта Ð¾Ð¿Ñ†Ð¸Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð°, то Ð´Ð»Ñ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² вызываетÑÑ @@ -2400,7 +2400,7 @@ Commander, выделены цветом, определённым ÐºÐ»ÑŽÑ‡ÐµÐ²Ñ Ð¡ целью уÑÐºÐ¾Ñ€ÐµÐ½Ð¸Ñ Ð´Ð¾Ñтупа к файлам Midnight Commander ÑохранÑет в оперативной памÑти информацию, отноÑÑщуюÑÑ Ðº некоторым виртуальным файловым ÑиÑтемам (например, ÑпиÑки файлов в каталогах удалённых -ftp\-Ñерверов). +FTP\-Ñерверов). .PP Кроме того, Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð´Ð¾Ñтупа к Ñодержимому Ñжатых архивов (например, Ñжатых tar\-файлов) Midnight Commander Ñоздаёт временные файлы @@ -2411,7 +2411,7 @@ ftp\-Ñерверов). чтобы уменьшить Ñти раÑходы или повыÑить ÑкороÑÑ‚ÑŒ доÑтупа к чаÑто иÑпользуемым файловым ÑиÑтемам. .PP -Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема архиватора tar очень разумно организует работу Ñ +Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема архиватора TAR очень разумно организует работу Ñ Ð°Ñ€Ñ…Ð¸Ð²Ð½Ñ‹Ð¼Ð¸ файлами: она ÑохранÑет на диÑке Ñтруктуру каталогов архива и, когда возникает необходимоÑÑ‚ÑŒ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ðº информации из tar\-файла, иÑпользует Ñтот ÑпиÑок Ð´Ð»Ñ Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Ð½ÑƒÐ¶Ð½Ð¾Ð³Ð¾ файла. @@ -2419,7 +2419,7 @@ ftp\-Ñерверов). Ð’ общем Ñлучае tar\-файлы обычно хранÑÑ‚ÑÑ Ð² Ñжатом виде (проÑтые tar\-файлы \- вымирающее Ñвление), и в Ñилу природы таких файлов (Ñтруктура подкаталогов Ð´Ð»Ñ tar\-файлов недоÑтупна Ð´Ð»Ñ Ð¼Ð³Ð½Ð¾Ð²ÐµÐ½Ð½Ð¾Ð¹ -загрузки/отображениÑ), Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема tar должна разархивировать файлы +загрузки/отображениÑ), Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема TAR должна разархивировать файлы на диÑк во временный каталог и затем предÑтавить обращение к разархивированным файлам как обращение к tar\-файлу. .PP @@ -2432,16 +2432,16 @@ tar\-архивов, Ñтало Ñамой обычной Ñитуацией кРоÑвобождены. По умолчанию величина Ñтого интервала уÑтанавливаетÑÑ Ñ€Ð°Ð²Ð½Ð¾Ð¹ 1 минуте. Смотрите также .\"LINK2" -Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема tar\&. -.\"Tar File System" +Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема TAR\&. +.\"TAR File System" .PP Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема FTP ÑохранÑет ÑпиÑок каталогов, полученный Ñ FTP\-Ñервера, в памÑти (в кеше). ВремÑ, в течение которого Ñтот ÑпиÑок хранитÑÑ Ð² кеше, задаётÑÑ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ .I Тайм\-аут кеша каталога FTP. Слишком маленькое значение Ñтого параметра будет замедлÑÑ‚ÑŒ вÑе операции -Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑиÑтемой ftp, потому что каждое обращение к ней будет -означать реальное обращение к удалённому ftp\-Ñерверу. +Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑиÑтемой FTP, потому что каждое обращение к ней будет +означать реальное обращение к удалённому FTP\-Ñерверу. .PP Кроме того, в том же диалоговом окне можно задать Ð¸Ð¼Ñ Ð¿Ñ€Ð¾ÐºÑи\-Ñервера (proxy host), который будет иÑпользоватьÑÑ Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐºÐ°Ñ‡ÐºÐ¸ файлов по ftp и @@ -2450,7 +2450,7 @@ FTP\-Ñервера, в памÑти (в кеше). ВремÑ, в течениР.PP .I Пароль анонимного FTP: \- пароль, иÑпользуемый когда вы региÑтрируетеÑÑŒ как анонимный пользователь -"anonymous". Ð”Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… Ñайтов требуетÑÑ Ð¿Ð¾Ð»Ð½Ð¾Ñ†ÐµÐ½Ð½Ñ‹Ð¹ Ñлектронный адреÑ, +"anonymous". Ð”Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… Ñайтов требуетÑÑ Ð¿Ð¾Ð»Ð½Ð¾Ñ†ÐµÐ½Ð½Ñ‹Ð¹ Ñлектронный адреÑ, Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð¹ Ñтороны, вероÑтно, вы не захотите указывать Ñвой наÑтоÑщий Ñлектронный Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ Ñайтов, которым не доверÑете, оÑобенно еÑли не иÑпользуетÑÑ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð½ÐµÐ¶ÐµÐ»Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ корреÑпонденции. @@ -2476,7 +2476,7 @@ FTP\-Ñервера, в памÑти (в кеше). ВремÑ, в течениРÐтот файл раÑполагаетÑÑ Ð² каталоге, путь к которому можно определить, запуÑтив команду .BR "mc \-f" . -(Ñто можно Ñделать даже из командной Ñтроки MC). ЕÑли и Ñтого файла не +(Ñто можно Ñделать даже из командной Ñтроки MC). ЕÑли и Ñтого файла не ÑущеÑтвует, .I MC иÑпользует уÑтановки по умолчанию. @@ -2524,7 +2524,7 @@ FTP\-Ñервера, в памÑти (в кеше). ВремÑ, в течениР.\"LINK2" файле раÑширений\&. .\"Edit Extension File" -ЕÑли в файле раÑширений найдетÑÑ Ð¿Ð¾Ð´Ñ€Ð°Ð·Ð´ÐµÐ», задающий процедуры обработки +ЕÑли в файле раÑширений найдётÑÑ Ð¿Ð¾Ð´Ñ€Ð°Ð·Ð´ÐµÐ», задающий процедуры обработки файлов Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼ раÑширением, то обработка файла производитÑÑ Ð² ÑоответÑтвии Ñ Ð·Ð°Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸ в Ñтом подразделе командами. Перед обработкой выполнÑÑŽÑ‚ÑÑ Ð¿Ñ€Ð¾Ñтые @@ -3152,7 +3152,7 @@ chattr \- команде Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð¾Ð² файлов и Ð .\"NODE "Diff Viewer" .SH "Ð’ÑÑ‚Ñ€Ð¾ÐµÐ½Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° ÑÑ€Ð°Ð²Ð½ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²" mcdiff \- Ñто вÑтроенное ÑредÑтво Ð´Ð»Ñ ÑÑ€Ð°Ð²Ð½ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð², позволÑющее Ñравнить два файла. -Также оно позволÑет редактировать их (поÑле Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð¾Ð¹Ð´ÐµÑ‚ +Также оно позволÑет редактировать их (поÑле Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð¾Ð¹Ð´Ñ‘Ñ‚ обновление различий). Можно проÑматривать файлы, находÑщиеÑÑ Ð¿Ð¾Ð´ контролем различных ÑиÑтем ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð²ÐµÑ€ÑиÑми, такими как GIT, Subversion и другие. .PP @@ -3463,21 +3463,17 @@ ASCII и шеÑтнадцатеричный (hex). Ð”Ð»Ñ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸ в вашем домашнем каталоге. .PP Ð’Ñтроенный редактор обрабатывает Ñимволы из второй половины кодовой -таблицы (160+). Ðо когда редактируете бинарные файлы, лучше уÑтановить +таблицы (160+). Ðо при редактировании бинарных файлов лучше уÑтановить опцию .B "Биты Ñимволов" -из меню "ÐаÑтройки" в положение "7 бит", чтобы Ñохранить формат файла -(to keep the spacing clean). +из меню "ÐаÑтройки" в положение "7 бит", чтобы Ñохранить формат файла. .PP ОпиÑать вÑе функции вÑтроенного редактора в данной подÑказке невозможно. Запомните только, что вÑе оÑновные операции можно выполнить через пункты меню, которое вызываетÑÑ Ð½Ð°Ð¶Ð°Ñ‚Ð¸ÐµÐ¼ клавиши .B F9 -в окне редактированиÑ. Кроме того, можно прочитать man\-Ñтраницу по -команде -.B man mcedit -или -.B info mcedit +в окне редактированиÑ. Кроме того, можно прочитать man\-Ñтраницу по команде +.B man mcedit . .\"NODE "Internal File Editor / options" .SH "Опции в ini\-файле Ð´Ð»Ñ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¾Ñ€Ð°" @@ -3588,7 +3584,7 @@ tar\-файлов; файлов в файловой ÑиÑтеме ext2 (Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÐ¼Ð°Ñ Ð² Linux по умолчанию); .br -\- файловой ÑиÑтемы fish (Ð´Ð»Ñ Ð¼Ð°Ð½Ð¸Ð¿ÑƒÐ»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸ при работе Ñ +\- файловой ÑиÑтемы shell (Ð´Ð»Ñ Ð¼Ð°Ð½Ð¸Ð¿ÑƒÐ»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸ при работе Ñ Ð¾Ð±Ð¾Ð»Ð¾Ñ‡ÐºÐ¾Ð¹ через такие программы как rsh и ssh); .br \- и, наконец, Ñетевой файловой ÑиÑтемы nfs. @@ -3599,15 +3595,15 @@ tar\-файлов; файловых ÑиÑтем опиÑаны в отдельных разделах по каждой ВФС: .IP .\"LINK2" -Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема ftpfs +Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема FTP .\"FTP File System" .br .\"LINK2" -Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема tar -.\"Tar File System" +Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема TAR +.\"TAR File System" .br .\"LINK2" -Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема FISH (FIle transfer over SHell) +Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема SHELL (FIle transfer over SHell) .\"FIle transfer over SHell filesystem" .br .\"LINK2" @@ -3617,9 +3613,9 @@ tar\-файлов; .\"LINK2" Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема UFS (Undelete File System) .\"Undelete File System" -.\"NODE "FTP File System" -.SH "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема ftpfs" -Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема ftpfs позволÑет работать Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸ на удалённых +.\"NODE " FTP File System" +.SH " Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема FTP" +Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема FTP позволÑет работать Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸ на удалённых компьютерах. Ð”Ð»Ñ Ñтого можно иÑпользовать команду "FTP\-Ñоединение" (доÑтупную из меню левой и правой панелей) или же непоÑредÑтвенно Ñменить текущий каталог командой cd, задав путь к каталогу Ñледующим @@ -3663,7 +3659,7 @@ anonymous или Ð¸Ð¼Ñ Ð¸Ð· файла ~/.netrc. ÐеобÑзательный Ñ .PP Чтобы не задавать Ð¸Ð¼Ñ Ð¿Ñ€Ð¾ÐºÑи\-Ñервера каждый раз, можно поÑтавить отметку в квадратных Ñкобках возле опции -.I Ð’Ñегда иÑпользовать FTP прокÑи +.I Ð’Ñегда иÑпользовать FTP\-прокÑи в диалоговом окне .\"LINK2" Виртуальные ФС... @@ -3678,7 +3674,7 @@ anonymous или Ð¸Ð¼Ñ Ð¸Ð· файла ~/.netrc. ÐеобÑзательный Ñ .B mc.no_proxy без точки, то производит прÑмое обращение к данной машине. .PP -При подключении к ftp\-Ñерверу через фильтрующий пакеты маршрутизатор, +При подключении к FTP\-Ñерверу через фильтрующий пакеты маршрутизатор, который не позволÑет иÑпользовать обычный режим Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð², можно заÑтавить программу работать в режиме паÑÑивного Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð°. Ð”Ð»Ñ Ñтого уÑтановите в конфигурационном файле параметр @@ -3699,9 +3695,9 @@ Midnight Commander ÑохранÑет в течение заданного Ð¸Ð½Ñ Ðто не ÑвлÑетÑÑ Ð½ÐµÐ´Ð¾Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¾Ð¹ (еÑли вы думаете, что Ñто ошибка, поразмыÑлите над тем, как проиÑходит работа по FTP Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸, находÑщимиÑÑ Ð½Ð° другой Ñтороне ÐтлантичеÑкого океана). -.\"NODE " Tar File System" -.SH "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема tar" -Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема tar обеÑпечивает доÑтуп по чтению к tar\- и Ñжатым +.\"NODE " TAR File System" +.SH " Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема TAR" +Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема TAR обеÑпечивает доÑтуп по чтению к tar\- и Ñжатым tar\-файлам, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ chdir. Ð”Ð»Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ð° в каталог, предÑтавлÑющий ÑпиÑок файлов tar\-файла, нужно иÑпользовать команду, имеющую Ñледующий формат: @@ -3710,7 +3706,7 @@ tar\-файлам, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ chdir. Ð”Ð»Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð .PP Файл mc.ext.ini по умолчанию Ñодержит команды Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра tar\-файлов, то еÑÑ‚ÑŒ обычно Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ ÑпиÑка файлов tar\-архива -доÑтаточно проÑто перемеÑтить указатель на Ð¸Ð¼Ñ tar\-файла и нажать +доÑтаточно проÑто перемеÑтить указатель на Ð¸Ð¼Ñ tar\-файла и нажать .BR Enter . Чтобы понÑÑ‚ÑŒ, как Ñто доÑтигаетÑÑ, Ñмотрите раздел .\"LINK2" @@ -3726,12 +3722,11 @@ tar\-файлов, то еÑÑ‚ÑŒ обычно Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ ÑÐ¿Ð¸Ñ .PP Ð’ поÑледнем примере указан полный путь к tar\-архиву. .\"NODE " FIle transfer over SHell filesystem" -.SH " Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема FISH (FIle transfer over SHell)" -Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема fish \- Ñто ÑÐµÑ‚ÐµÐ²Ð°Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñет +.SH " Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема SHELL (FIle transfer over SHell)" +Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема shell \- Ñто ÑÐµÑ‚ÐµÐ²Ð°Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñет работать Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸ на удалённом компьютере так, как еÑли бы они были раÑположены на вашем диÑке. Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾ чтобы Ñто было возможно, на -удалённом компьютере должен быть запущен fish\-Ñервер, или -bash\-ÑовмеÑÑ‚Ð¸Ð¼Ð°Ñ Ð¾Ð±Ð¾Ð»Ð¾Ñ‡ÐºÐ° shell. +удалённом компьютере должна быть запущена bash\-ÑовмеÑÑ‚Ð¸Ð¼Ð°Ñ Ð¾Ð±Ð¾Ð»Ð¾Ñ‡ÐºÐ° shell. .PP Ð”Ð»Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ ÑƒÐ´Ð°Ð»Ñ‘Ð½Ð½Ñ‹Ð¼ компьютером нужно выполнить команду перехода в каталог (chdir), Ð¸Ð¼Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ задаётÑÑ Ð² Ñледующем формате: @@ -3775,7 +3770,7 @@ bash\-ÑовмеÑÑ‚Ð¸Ð¼Ð°Ñ Ð¾Ð±Ð¾Ð»Ð¾Ñ‡ÐºÐ° shell. Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема SFTP \- Ñто ÑÐµÑ‚ÐµÐ²Ð°Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñет работать Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸ на удалённом компьютере так, как еÑли бы они были раÑположены на вашем диÑке. Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾ чтобы Ñто было возможно, на -удалённом компьютере должен быть запущен sftp\-Ñервер. +удалённом компьютере должен быть запущен SFTP\-Ñервер. .PP Ð”Ð»Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ ÑƒÐ´Ð°Ð»Ñ‘Ð½Ð½Ñ‹Ð¼ компьютером нужно выполнить команду перехода в каталог (chdir), Ð¸Ð¼Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ задаётÑÑ Ð² Ñледующем формате: @@ -3831,7 +3826,7 @@ ext2fs, позволÑющий воÑÑтановить имена вÑех уд .PP Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾ чтобы воÑпользоватьÑÑ Ñтой возможноÑтью (Ñтой файловой ÑиÑтемой), нужно выполнить команду перехода (chdir) в Ñпециальный -каталог, Ð¸Ð¼Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ образуетÑÑ Ð¸Ð· префикÑа "undel://" и имени +каталог, Ð¸Ð¼Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ образуетÑÑ Ð¸Ð· префикÑа "undel://" и имени Ñпециального файла уÑтройÑтва, на котором находитÑÑ Ñ€ÐµÐ°Ð»ÑŒÐ½Ð°Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема. .PP @@ -3858,7 +3853,7 @@ SCSI\-диÑка, нужно иÑпользовать Ñледующее имÑ: 1. Ðвтономные файловые ÑиÑтемы, которые не аÑÑоциированы ни Ñ Ð¾Ð´Ð½Ð¸Ð¼ из типов файлов.они предÑтавлÑÑŽÑ‚ некоторые ÑиÑтемные данные как дерево каталогов Ð’Ñ‹ можете их вызвать набрав \fIcd fsname://\fR", где fsname \- Ñто короткое -Ð¸Ð¼Ñ extfs (Ñм. ниже). Примеры Ñтих ВФС включают audio (ÑпиÑок вÑех звуковых +Ð¸Ð¼Ñ extfs (Ñм. ниже). Примеры Ñтих ВФС включают audio (ÑпиÑок вÑех звуковых дорожек на CD) или apt (ÑпиÑок вÑех уÑтановленных в ÑиÑтеме пакетов Debian). .PP Ðапример, Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ ÑпиÑка звуковых дорожек на CD наберите: @@ -3868,7 +3863,7 @@ SCSI\-диÑка, нужно иÑпользовать Ñледующее имÑ: .fi .PP 2. "Ðрхивные" файловые ÑиÑтемы (такие как rpm, patchfs и прочие) предÑтавлÑÑŽÑ‚ -Ñодержимое файла как дерево каталогов. Они могут ÑоÑтоÑÑ‚ÑŒ из "реальных" файлов, +Ñодержимое файла как дерево каталогов. Они могут ÑоÑтоÑÑ‚ÑŒ из "реальных" файлов, находÑщихÑÑ Ð² Ñжатом виде в архивах (urar, rpm) или из виртуальных файлов, например, Ñообщений в файле mailbox (mailfs) или чаÑти diff\-файла (patchfs). Ð”Ð»Ñ Ð´Ð¾Ñтупа к Ñтим ВФС ÑÑƒÑ„Ñ„Ð¸ÐºÑ @@ -4020,7 +4015,8 @@ bbarhotkey, bbarbutton. Цвета в диалоге\-Ñообщении об ошибке: errdfocus, errdhotnormal, errdhotfocus, errdtitle. Цвета в окне вÑтроенной помощи: helpnormal, helpitalic, helpbold, helplink, helpslink. Цвета в окне программы проÑмотра: viewnormal, viewbold, viewunderline, viewselected. -Цвета в редакторе: editnormal, editbold, editmarked, editwhitespace, editlinestate. +Цвета в редакторе: editnormal, editbold, editmarked, editwhitespace, editnonprintable, +editlinestate. Цвета окна вÑплывающего меню: pmenunormal, pmenusel, pmenutitle. .PP Цвета задавать не обÑзательно. Цвет какого именно Ð¿Ð¾Ð»Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÑетÑÑ @@ -4471,7 +4467,7 @@ menuhotsel=yellow;black;bold+underline ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ñ Ð³Ñ€ÑƒÐ¿Ð¿ должны Ñовпадать Ñ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñми параметров в Ñекции [filehighlight] в текущем Ñкин\-файле. .PP -Ключи в группах могут принимать Ñледующие значениÑ: +Ключи в группах могут принимать Ñледующие значениÑ: .TP .I type Тип файла. ЕÑли параметр приÑутÑтвует, оÑтальные опции игнорируютÑÑ @@ -4533,7 +4529,7 @@ menuhotsel=yellow;black;bold+underline .IP Ðтот параметр задаёт интервал времени (в Ñекундах), по иÑтечении которого Midnight Commander будет предпринимать повторную попытку -ÑоединитьÑÑ Ñ ftp\-Ñервером поÑле того, как Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ° окончилаÑÑŒ +ÑоединитьÑÑ Ñ FTP\-Ñервером поÑле того, как Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ° окончилаÑÑŒ неудачей. ЕÑли задано нулевое значение, программа не будет повторÑÑ‚ÑŒ попытку ÑоединитьÑÑ. .PP @@ -4543,7 +4539,7 @@ menuhotsel=yellow;black;bold+underline протоколу FTP в тех ÑлучаÑÑ…, когда компьютер Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ñ€Ð°ÑполагаетÑÑ Ð·Ð° маршрутизатором, фильтрующим пакеты (behind a filtering packet router). Ðта Ð¾Ð¿Ñ†Ð¸Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚ только в том Ñлучае, еÑли вы не иÑпользуете -прокÑи (you are not using an ftp proxy). +FTP\-прокÑи. .PP .I max_dirt_limit .IP @@ -4594,7 +4590,7 @@ subshell. ЕÑли она уÑтановлена, то при нажатии УÑтановка Ñтой опции Ñлегка изменÑет реакцию программы на нажатие клавиш .B Home и -.B End +.B End в активной панели. ВмеÑто того, чтобы перемещать подÑветку (курÑор) к первому или поÑледнему из имен файлов, отображенных на панели, нажатие Ñтих клавиш будет вызывать Ñледующую реакцию: @@ -4664,7 +4660,7 @@ autodetect_codeset=russian .\"NODE "Parameters for external editor or viewer" .SH "Параметры Ð´Ð»Ñ Ð²Ð½ÐµÑˆÐ½Ð¸Ñ… редакторов и программ проÑмотра" Midnight Commander позволÑет задать некоторые параметрыы Ð´Ð»Ñ Ð²Ð½ÐµÑˆÐ½Ð¸Ñ… редакторов -и программ проÑмотра. Они задаютÑÑ Ð² Ñекции "[External editor or viewer parameters]", +и программ проÑмотра. Они задаютÑÑ Ð² Ñекции [External editor or viewer parameters], ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ñначала ищетÑÑ Ð² ÑиÑтемном (mc.lib), а затем в пользовательÑком (~/.config/mc/ini) файле инициализации. Ð˜Ð¼Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° должно Ñовпадать Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ внешнего редактора или программы проÑмотра. Значение параметра может Ñодержать Ñледующие переменные: @@ -4789,9 +4785,9 @@ insert=\\e[Op .PP .I %pkgdatadir%/mc.lib .IP -Глобальные уÑтановки Ð´Ð»Ñ Midnight Commander. УÑтановки из Ñтого файла +Глобальные уÑтановки Ð´Ð»Ñ Midnight Commander. УÑтановки из Ñтого файла дейÑтвительны Ð´Ð»Ñ Ð²Ñех пользователей, незавиÑимо от того, имеют ли они -~/.config/mc/ini или нет. Ð’ наÑтоÑщий момент только +~/.config/mc/ini или нет. Ð’ наÑтоÑщий момент только .\"LINK2" наÑтройки терминалов .\"Terminal databases" @@ -4851,7 +4847,7 @@ insert=\\e[Op .SH Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ Ðта программа раÑпроÑтранÑетÑÑ Ð² надежде, что она будет полезной, но БЕЗ КÐКИХ\-ЛИБО ГÐÐ ÐÐТИЙ; даже без подразумеваемых гарантий КОММЕРЧЕСКОЙ -ЦЕÐÐОСТИ или ПРИГОДÐОСТИ ДЛЯ КОÐКРЕТÐОЙ ЦЕЛИ. Ð”Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ñ‹Ñ… +ЦЕÐÐОСТИ или ПРИГОДÐОСТИ ДЛЯ КОÐКРЕТÐОЙ ЦЕЛИ. Ð”Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ñ‹Ñ… Ñведений Ñмотрите УниверÑальную ОбщеÑтвенную Лицензию GNU. .\"NODE "AVAILABILITY" .SH "Обновление верÑий" @@ -4868,7 +4864,7 @@ zsh(1), mcedit(1). .fi .PP Ð”Ð°Ð½Ð½Ð°Ñ Ñтраница оперативного руководÑтва Ñодержит информацию, актуальную -Ð´Ð»Ñ Ð²ÐµÑ€Ñии 4.6.0 (Ñнварь 2003 года). ЕÑли вы иÑпользуете более Ñвежую +Ð´Ð»Ñ Ð²ÐµÑ€Ñии 4.6.0 (Ñнварь 2003 года). ЕÑли вы иÑпользуете более Ñвежую верÑию программы, Ð¾Ñ€Ð¸Ð³Ð¸Ð½Ð°Ð»ÑŒÐ½Ð°Ñ Ñтраница на английÑком Ñзыке может Ñодержать более полную и актуальную информацию. Ð”Ð»Ñ Ð¿Ñ€Ð¾Ñмотра оригинальной Ñтраницы в оболочке bash можно иÑпользовать команду diff --git a/doc/man/sr/Makefile.in b/doc/man/sr/Makefile.in index fd8619f..de5d7f6 100644 --- a/doc/man/sr/Makefile.in +++ b/doc/man/sr/Makefile.in @@ -133,7 +133,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/doc/man/sr/mc.1.in b/doc/man/sr/mc.1.in index dd04dec..a7484cf 100644 --- a/doc/man/sr/mc.1.in +++ b/doc/man/sr/mc.1.in @@ -2865,7 +2865,7 @@ dnormal, dfocus, dhotnormal, dhotfocus. Боје помоћи Ñу: helpnormal, helpbold, helplink, helpslink. Боја прегледача је: viewunderline. ПоÑебне боје за иÑтицање Ñу: executable, directory, link, stalelink, device, special, core. Viewer colors are: viewnormal, viewbold, viewunderline, -viewselected. Боје уређивача Ñу: editnormal, editbold, editmarked. +viewselected. Боје уређивача Ñу: editnormal, editbold, editmarked, editnonprintable. .PP .I input одређује боју редова за ÑƒÐ½Ð¾Ñ ÐºÐ¾Ñ˜Ð¸ Ñе кориÑте у дијалозима упита. diff --git a/lib/Makefile.in b/lib/Makefile.in index 26a3fb1..99664da 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -138,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/lib/charsets.c b/lib/charsets.c index c97a3cf..c5ccaea 100644 --- a/lib/charsets.c +++ b/lib/charsets.c @@ -1,7 +1,7 @@ /* Text conversion from one charset to another. - Copyright (C) 2001-2023 + Copyright (C) 2001-2024 Free Software Foundation, Inc. Written by: @@ -136,6 +136,7 @@ load_codepages_list_from_file (GPtrArray ** list, const char *fname) if (*list == NULL) { *list = g_ptr_array_sized_new (16); + g_ptr_array_set_free_func (*list, free_codepage_desc); g_ptr_array_add (*list, new_codepage_desc (id, p)); } else diff --git a/lib/event/Makefile.in b/lib/event/Makefile.in index 298c4e4..fba93d4 100644 --- a/lib/event/Makefile.in +++ b/lib/event/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/lib/event/event.c b/lib/event/event.c index 10df96d..1c782f8 100644 --- a/lib/event/event.c +++ b/lib/event/event.c @@ -2,7 +2,7 @@ Handle events in application. Interface functions: init/deinit; start/stop - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/event/manage.c b/lib/event/manage.c index b8f9733..4657af5 100644 --- a/lib/event/manage.c +++ b/lib/event/manage.c @@ -2,7 +2,7 @@ Handle any events in application. Manage events: add, delete, destroy, search - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/event/raise.c b/lib/event/raise.c index 37cad46..8806b02 100644 --- a/lib/event/raise.c +++ b/lib/event/raise.c @@ -2,7 +2,7 @@ Handle any events in application. Raise events. - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/filehighlight/Makefile.in b/lib/filehighlight/Makefile.in index 7ad3212..5bbdc82 100644 --- a/lib/filehighlight/Makefile.in +++ b/lib/filehighlight/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/lib/filehighlight/common.c b/lib/filehighlight/common.c index d519744..71994aa 100644 --- a/lib/filehighlight/common.c +++ b/lib/filehighlight/common.c @@ -2,7 +2,7 @@ File highlight plugin. Interface functions - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/filehighlight/get-color.c b/lib/filehighlight/get-color.c index cdca7e4..4122408 100644 --- a/lib/filehighlight/get-color.c +++ b/lib/filehighlight/get-color.c @@ -2,7 +2,7 @@ File highlight plugin. Interface functions. get color pair index for highlighted file. - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/filehighlight/ini-file-read.c b/lib/filehighlight/ini-file-read.c index bf12b9b..69b13a7 100644 --- a/lib/filehighlight/ini-file-read.c +++ b/lib/filehighlight/ini-file-read.c @@ -2,7 +2,7 @@ File highlight plugin. Reading and parse rules from ini-files - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/fileloc.h b/lib/fileloc.h index ebcfe9d..a075d03 100644 --- a/lib/fileloc.h +++ b/lib/fileloc.h @@ -30,23 +30,23 @@ #define CHARSETS_LIST "mc.charsets" #define MC_MACRO_FILE "mc.macros" -#define FISH_PREFIX "fish" - -#define FISH_LS_FILE "ls" -#define FISH_EXISTS_FILE "fexists" -#define FISH_MKDIR_FILE "mkdir" -#define FISH_UNLINK_FILE "unlink" -#define FISH_CHOWN_FILE "chown" -#define FISH_CHMOD_FILE "chmod" -#define FISH_UTIME_FILE "utime" -#define FISH_RMDIR_FILE "rmdir" -#define FISH_LN_FILE "ln" -#define FISH_MV_FILE "mv" -#define FISH_HARDLINK_FILE "hardlink" -#define FISH_GET_FILE "get" -#define FISH_SEND_FILE "send" -#define FISH_APPEND_FILE "append" -#define FISH_INFO_FILE "info" +#define VFS_SHELL_PREFIX "shell" + +#define VFS_SHELL_LS_FILE "ls" +#define VFS_SHELL_EXISTS_FILE "fexists" +#define VFS_SHELL_MKDIR_FILE "mkdir" +#define VFS_SHELL_UNLINK_FILE "unlink" +#define VFS_SHELL_CHOWN_FILE "chown" +#define VFS_SHELL_CHMOD_FILE "chmod" +#define VFS_SHELL_UTIME_FILE "utime" +#define VFS_SHELL_RMDIR_FILE "rmdir" +#define VFS_SHELL_LN_FILE "ln" +#define VFS_SHELL_MV_FILE "mv" +#define VFS_SHELL_HARDLINK_FILE "hardlink" +#define VFS_SHELL_GET_FILE "get" +#define VFS_SHELL_SEND_FILE "send" +#define VFS_SHELL_APPEND_FILE "append" +#define VFS_SHELL_INFO_FILE "info" #define MC_EXTFS_DIR "extfs.d" diff --git a/lib/glibcompat.c b/lib/glibcompat.c index 0522c0f..0d58e49 100644 --- a/lib/glibcompat.c +++ b/lib/glibcompat.c @@ -1,7 +1,7 @@ /* GLIB - Library of useful routines for C programming - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: @@ -111,29 +111,8 @@ g_clear_list (GList ** list_ptr, GDestroyNotify destroy) } } -/* --------------------------------------------------------------------------------------------- */ - #endif /* ! GLIB_CHECK_VERSION (2, 63, 3) */ -#if ! GLIB_CHECK_VERSION (2, 32, 0) -/** - * g_queue_free_full: - * @queue: a pointer to a #GQueue - * @free_func: the function to be called to free each element's data - * - * Convenience method, which frees all the memory used by a #GQueue, - * and calls the specified destroy function on every element's data. - * - * Since: 2.32 - */ -void -g_queue_free_full (GQueue * queue, GDestroyNotify free_func) -{ - g_queue_foreach (queue, (GFunc) free_func, NULL); - g_queue_free (queue); -} -#endif /* ! GLIB_CHECK_VERSION (2, 32, 0) */ - /* --------------------------------------------------------------------------------------------- */ #if ! GLIB_CHECK_VERSION (2, 60, 0) @@ -161,6 +140,41 @@ g_queue_clear_full (GQueue * queue, GDestroyNotify free_func) /* --------------------------------------------------------------------------------------------- */ +#if ! GLIB_CHECK_VERSION (2, 77, 0) +/** + * g_string_new_take: + * @init: (nullable): initial text used as the string. + * Ownership of the string is transferred to the #GString. + * Passing NULL creates an empty string. + * + * Creates a new #GString, initialized with the given string. + * + * After this call, @init belongs to the #GString and may no longer be + * modified by the caller. The memory of @data has to be dynamically + * allocated and will eventually be freed with g_free(). + * + * Returns: the new #GString + */ +GString * +g_string_new_take (char *init) +{ + GString *string; + + if (init == NULL) + return g_string_new (NULL); + + string = g_slice_new (GString); + + string->str = init; + string->len = strlen (string->str); + string->allocated_len = string->len + 1; + + return string; +} +#endif /* ! GLIB_CHECK_VERSION (2, 77, 0) */ + +/* --------------------------------------------------------------------------------------------- */ + /** * mc_g_string_copy: * @dest: (not nullable): the destination #GString. Its current contents are destroyed diff --git a/lib/glibcompat.h b/lib/glibcompat.h index cb40966..4f0b4d6 100644 --- a/lib/glibcompat.h +++ b/lib/glibcompat.h @@ -21,14 +21,14 @@ void g_clear_slist (GSList ** slist_ptr, GDestroyNotify destroy); void g_clear_list (GList ** list_ptr, GDestroyNotify destroy); #endif /* ! GLIB_CHECK_VERSION (2, 63, 3) */ -#if ! GLIB_CHECK_VERSION (2, 32, 0) -void g_queue_free_full (GQueue * queue, GDestroyNotify free_func); -#endif /* ! GLIB_CHECK_VERSION (2, 32, 0) */ - #if ! GLIB_CHECK_VERSION (2, 60, 0) void g_queue_clear_full (GQueue * queue, GDestroyNotify free_func); #endif /* ! GLIB_CHECK_VERSION (2, 60, 0) */ +#if ! GLIB_CHECK_VERSION (2, 77, 0) +GString *g_string_new_take (char *init); +#endif /* ! GLIB_CHECK_VERSION (2, 77, 0) */ + /* There is no such API in GLib2 */ GString *mc_g_string_copy (GString * dest, const GString * src); diff --git a/lib/global.c b/lib/global.c index 0b1639d..40efcf9 100644 --- a/lib/global.c +++ b/lib/global.c @@ -1,7 +1,7 @@ /* Global structure for some library-related variables - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: @@ -4,7 +4,7 @@ Slavaz: Warning! this file is deprecated and should be replaced by mcevents functional. - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/keybind.c b/lib/keybind.c index ebbc82e..2fed74e 100644 --- a/lib/keybind.c +++ b/lib/keybind.c @@ -1,7 +1,7 @@ /* Definitions of key bindings. - Copyright (C) 2005-2023 + Copyright (C) 2005-2024 Free Software Foundation, Inc. Written by: @@ -174,8 +174,8 @@ static name_keymap_t command_names[] = { ADD_KEYMAP_NAME (LinkSymbolicEdit), ADD_KEYMAP_NAME (ExternalPanelize), ADD_KEYMAP_NAME (Filter), -#ifdef ENABLE_VFS_FISH - ADD_KEYMAP_NAME (ConnectFish), +#ifdef ENABLE_VFS_SHELL + ADD_KEYMAP_NAME (ConnectShell), #endif #ifdef ENABLE_VFS_FTP ADD_KEYMAP_NAME (ConnectFtp), diff --git a/lib/keybind.h b/lib/keybind.h index 9c0fe98..4c01f58 100644 --- a/lib/keybind.h +++ b/lib/keybind.h @@ -151,7 +151,7 @@ enum CK_LinkSymbolicEdit, CK_ExternalPanelize, CK_Filter, - CK_ConnectFish, + CK_ConnectShell, CK_ConnectFtp, CK_ConnectSftp, CK_PanelInfo, @@ -1,7 +1,7 @@ /* File locking - Copyright (C) 2003-2023 + Copyright (C) 2003-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/logging.c b/lib/logging.c index 6dd0731..8e28612 100644 --- a/lib/logging.c +++ b/lib/logging.c @@ -1,7 +1,7 @@ /* Provides a log file to ease tracing the program. - Copyright (C) 2006-2023 + Copyright (C) 2006-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/mcconfig.h b/lib/mcconfig.h index 0c3ab3b..abc28ef 100644 --- a/lib/mcconfig.h +++ b/lib/mcconfig.h @@ -105,6 +105,8 @@ vfs_path_t *mc_config_get_full_vpath (const char *config_name); /* read history to the mc_config, but don't save config to file */ GList *mc_config_history_get (const char *name); +/* read recent item from the history */ +char *mc_config_history_get_recent_item (const char *name); /* load history from the mc_config */ GList *mc_config_history_load (mc_config_t * cfg, const char *name); /* save history to the mc_config, but don't save config to file */ diff --git a/lib/mcconfig/Makefile.in b/lib/mcconfig/Makefile.in index ae9c856..fd5aeda 100644 --- a/lib/mcconfig/Makefile.in +++ b/lib/mcconfig/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/lib/mcconfig/common.c b/lib/mcconfig/common.c index 75979be..4891a39 100644 --- a/lib/mcconfig/common.c +++ b/lib/mcconfig/common.c @@ -1,7 +1,7 @@ /* Configure module for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. This file is part of the Midnight Commander. diff --git a/lib/mcconfig/get.c b/lib/mcconfig/get.c index f8ecfb1..4793b61 100644 --- a/lib/mcconfig/get.c +++ b/lib/mcconfig/get.c @@ -1,7 +1,7 @@ /* Configure module for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. This file is part of the Midnight Commander. diff --git a/lib/mcconfig/history.c b/lib/mcconfig/history.c index bfbdf0a..57249c4 100644 --- a/lib/mcconfig/history.c +++ b/lib/mcconfig/history.c @@ -1,7 +1,7 @@ /* - Widgets for the Midnight Commander + Configure module for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: @@ -10,7 +10,7 @@ Jakub Jelinek, 1995 Andrej Borsenkow, 1996 Norbert Warmuth, 1997 - Andrew Borodin <aborodin@vmail.ru>, 2009-2019 + Andrew Borodin <aborodin@vmail.ru>, 2009-2023 This file is part of the Midnight Commander. @@ -65,7 +65,7 @@ int num_history_items_recorded = 60; /* --------------------------------------------------------------------------------------------- */ /** - * Load the history from the ${XDG_CACHE_HOME}/mc/history file. + * Load the history from the ${XDG_DATA_HOME}/mc/history file. * It is called with the widgets history name and returns the GList list. */ @@ -95,6 +95,33 @@ mc_config_history_get (const char *name) /* --------------------------------------------------------------------------------------------- */ /** + * Get the recent item of a history from the ${XDG_DATA_HOME}/mc/history file. + * + * TODO: get rid of load the entire history to get the only top item. + */ + +char * +mc_config_history_get_recent_item (const char *name) +{ + GList *history; + char *item = NULL; + + history = mc_config_history_get (name); + if (history != NULL) + { + /* FIXME: can history->data be NULL? */ + item = (char *) history->data; + history->data = NULL; + history = g_list_first (history); + g_list_free_full (history, g_free); + } + + return item; +} + +/* --------------------------------------------------------------------------------------------- */ + +/** * Load history from the mc_config */ GList * @@ -177,8 +204,7 @@ mc_config_history_save (mc_config_t * cfg, const char *name, GList * h) for (i = 0; (i < num_history_items_recorded - 1) && (h->prev != NULL); i++) h = g_list_previous (h); - if (name != NULL) - mc_config_del_group (cfg, name); + mc_config_del_group (cfg, name); /* create charset conversion handler to convert strings from system codepage to UTF-8 */ diff --git a/lib/mcconfig/paths.c b/lib/mcconfig/paths.c index 46ec14d..fbb71c3 100644 --- a/lib/mcconfig/paths.c +++ b/lib/mcconfig/paths.c @@ -1,7 +1,7 @@ /* paths to configuration files - Copyright (C) 2010-2023 + Copyright (C) 2010-2024 Free Software Foundation, Inc. Written by: @@ -74,7 +74,7 @@ static const struct /* data */ { &mc_data_str, MC_SKINS_DIR }, - { &mc_data_str, FISH_PREFIX }, + { &mc_data_str, VFS_SHELL_PREFIX }, { &mc_data_str, MC_ASHRC_FILE }, { &mc_data_str, MC_BASHRC_FILE }, { &mc_data_str, MC_INPUTRC_FILE }, diff --git a/lib/mcconfig/set.c b/lib/mcconfig/set.c index 961435f..ce6d887 100644 --- a/lib/mcconfig/set.c +++ b/lib/mcconfig/set.c @@ -1,7 +1,7 @@ /* Configure module for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. This file is part of the Midnight Commander. diff --git a/lib/search/Makefile.in b/lib/search/Makefile.in index b587d13..b081433 100644 --- a/lib/search/Makefile.in +++ b/lib/search/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/lib/search/glob.c b/lib/search/glob.c index 5874aba..a0326d0 100644 --- a/lib/search/glob.c +++ b/lib/search/glob.c @@ -2,7 +2,7 @@ Search text engine. Glob-style pattern matching - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/search/hex.c b/lib/search/hex.c index 50af6fb..a5764d8 100644 --- a/lib/search/hex.c +++ b/lib/search/hex.c @@ -2,7 +2,7 @@ Search text engine. HEX-style pattern matching - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/search/lib.c b/lib/search/lib.c index 2c22504..1158e83 100644 --- a/lib/search/lib.c +++ b/lib/search/lib.c @@ -2,7 +2,7 @@ Search text engine. Common share code for module. - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/search/normal.c b/lib/search/normal.c index 9042bfc..9d86b44 100644 --- a/lib/search/normal.c +++ b/lib/search/normal.c @@ -2,7 +2,7 @@ Search text engine. Plain search - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/search/regex.c b/lib/search/regex.c index d24cf48..b1c61c5 100644 --- a/lib/search/regex.c +++ b/lib/search/regex.c @@ -2,7 +2,7 @@ Search text engine. Regex search - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: @@ -397,17 +397,16 @@ mc_search_regex__get_max_num_of_replace_tokens (const gchar * str, gsize len) { int max_token = 0; gsize loop; + for (loop = 0; loop < len - 1; loop++) - { if (str[loop] == '\\' && g_ascii_isdigit (str[loop + 1])) { if (strutils_is_char_escaped (str, &str[loop])) continue; if (max_token < str[loop + 1] - '0') max_token = str[loop + 1] - '0'; - continue; } - if (str[loop] == '$' && str[loop + 1] == '{') + else if (str[loop] == '$' && str[loop + 1] == '{') { gsize tmp_len; @@ -430,7 +429,7 @@ mc_search_regex__get_max_num_of_replace_tokens (const gchar * str, gsize len) g_free (tmp_str); } } - } + return max_token; } diff --git a/lib/search/search.c b/lib/search/search.c index 8ccb65f..ddbdc2b 100644 --- a/lib/search/search.c +++ b/lib/search/search.c @@ -2,7 +2,7 @@ Search text engine. Interface functions - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/serialize.c b/lib/serialize.c index 1db0a9c..6021af5 100644 --- a/lib/serialize.c +++ b/lib/serialize.c @@ -1,7 +1,7 @@ /* Provides a serialize/unserialize functionality for INI-like formats. - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/shell.c b/lib/shell.c index 0646171..2a10b90 100644 --- a/lib/shell.c +++ b/lib/shell.c @@ -1,7 +1,7 @@ /* Provides a functions for working with shell. - Copyright (C) 2006-2023 + Copyright (C) 2006-2024 Free Software Foundation, Inc. Written by: @@ -87,28 +87,29 @@ * Last is defined to view color. */ #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] +#define EDITOR_NONPRINTABLE_COLOR mc_skin_color__cache[50] +#define EDITOR_BOLD_COLOR mc_skin_color__cache[51] +#define EDITOR_MARKED_COLOR mc_skin_color__cache[52] +#define EDITOR_WHITESPACE_COLOR mc_skin_color__cache[53] +#define EDITOR_RIGHT_MARGIN_COLOR mc_skin_color__cache[54] +#define EDITOR_BACKGROUND mc_skin_color__cache[55] +#define EDITOR_FRAME mc_skin_color__cache[56] +#define EDITOR_FRAME_ACTIVE mc_skin_color__cache[57] +#define EDITOR_FRAME_DRAG mc_skin_color__cache[58] /* color of left 8 char status per line */ -#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] +#define LINE_STATE_COLOR mc_skin_color__cache[59] +#define BOOK_MARK_COLOR mc_skin_color__cache[60] +#define BOOK_MARK_FOUND_COLOR mc_skin_color__cache[61] /* Diff colors */ -#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 67 +#define DFF_ADD_COLOR mc_skin_color__cache[62] +#define DFF_CHG_COLOR mc_skin_color__cache[63] +#define DFF_CHH_COLOR mc_skin_color__cache[64] +#define DFF_CHD_COLOR mc_skin_color__cache[65] +#define DFF_DEL_COLOR mc_skin_color__cache[66] +#define DFF_ERROR_COLOR mc_skin_color__cache[67] + +#define MC_SKIN_COLOR_CACHE_COUNT 68 /*** enums ***************************************************************************************/ diff --git a/lib/skin/Makefile.in b/lib/skin/Makefile.in index 62f642b..f7ce1d0 100644 --- a/lib/skin/Makefile.in +++ b/lib/skin/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/lib/skin/colors-old.c b/lib/skin/colors-old.c index 628b2aa..3430cd6 100644 --- a/lib/skin/colors-old.c +++ b/lib/skin/colors-old.c @@ -2,7 +2,7 @@ Skins engine. Work with colors - backward compatibility - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: @@ -69,6 +69,7 @@ static const mc_skin_colors_old_t old_colors[] = { {"editframedrag", "editor", "editframedrag"}, {"editlinestate", "editor", "editlinestate"}, {"editmarked", "editor", "editmarked"}, + {"editnonprintable", "editor", "editnonprintable"}, {"editnormal", "editor", "_default_"}, {"editwhitespace", "editor", "editwhitespace"}, {"errdhotfocus", "error", "errdhotfocus"}, diff --git a/lib/skin/colors.c b/lib/skin/colors.c index 87e9442..688866e 100644 --- a/lib/skin/colors.c +++ b/lib/skin/colors.c @@ -2,7 +2,7 @@ Skins engine. Work with colors - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: @@ -49,11 +49,11 @@ int mc_skin_color__cache[MC_SKIN_COLOR_CACHE_COUNT]; /*** file scope functions ************************************************************************/ /* --------------------------------------------------------------------------------------------- */ -static mc_skin_color_t * +static tty_color_pair_t * mc_skin_color_get_from_hash (mc_skin_t * mc_skin, const gchar * group, const gchar * key) { gchar kname[BUF_TINY]; - mc_skin_color_t *mc_skin_color; + tty_color_pair_t *mc_skin_color; if (group == NULL || key == NULL) return NULL; @@ -62,7 +62,7 @@ mc_skin_color_get_from_hash (mc_skin_t * mc_skin, const gchar * group, const gch mc_skin = &mc_skin__default; g_snprintf (kname, sizeof (kname), "%s.%s", group, key); - mc_skin_color = (mc_skin_color_t *) g_hash_table_lookup (mc_skin->colors, (gpointer) kname); + mc_skin_color = (tty_color_pair_t *) g_hash_table_lookup (mc_skin->colors, (gpointer) kname); return mc_skin_color; } @@ -89,7 +89,7 @@ mc_skin_color_remove_from_hash (mc_skin_t * mc_skin, const gchar * group, const static void mc_skin_color_add_to_hash (mc_skin_t * mc_skin, const gchar * group, const gchar * key, - mc_skin_color_t * mc_skin_color) + tty_color_pair_t * mc_skin_color) { gchar *kname; @@ -105,10 +105,10 @@ mc_skin_color_add_to_hash (mc_skin_t * mc_skin, const gchar * group, const gchar /* --------------------------------------------------------------------------------------------- */ -static mc_skin_color_t * +static tty_color_pair_t * mc_skin_color_get_with_defaults (const gchar * group, const gchar * name) { - mc_skin_color_t *mc_skin_color; + tty_color_pair_t *mc_skin_color; mc_skin_color = mc_skin_color_get_from_hash (NULL, group, name); if (mc_skin_color != NULL) @@ -179,12 +179,12 @@ mc_skin_color_look_up_alias (mc_skin_t * mc_skin, gchar * str) /* --------------------------------------------------------------------------------------------- */ -static mc_skin_color_t * +static tty_color_pair_t * mc_skin_color_get_from_ini_file (mc_skin_t * mc_skin, const gchar * group, const gchar * key) { gsize items_count; gchar **values; - mc_skin_color_t *mc_skin_color, *tmp; + tty_color_pair_t *mc_skin_color, *tmp; values = mc_config_get_string_list (mc_skin->config, group, key, &items_count); if (values == NULL || values[0] == NULL) @@ -193,7 +193,7 @@ mc_skin_color_get_from_ini_file (mc_skin_t * mc_skin, const gchar * group, const return NULL; } - mc_skin_color = g_try_new0 (mc_skin_color_t, 1); + mc_skin_color = g_try_new0 (tty_color_pair_t, 1); if (mc_skin_color == NULL) { g_strfreev (values); @@ -201,21 +201,19 @@ mc_skin_color_get_from_ini_file (mc_skin_t * mc_skin, const gchar * group, const } tmp = mc_skin_color_get_with_defaults (group, "_default_"); - mc_skin_color->fgcolor = (items_count > 0 && values[0][0]) ? + mc_skin_color->fg = (items_count > 0 && values[0][0]) ? mc_skin_color_look_up_alias (mc_skin, g_strstrip (g_strdup (values[0]))) : - (tmp != NULL) ? g_strdup (tmp->fgcolor) : NULL; - mc_skin_color->bgcolor = (items_count > 1 && values[1][0]) ? + (tmp != NULL) ? g_strdup (tmp->fg) : NULL; + mc_skin_color->bg = (items_count > 1 && values[1][0]) ? mc_skin_color_look_up_alias (mc_skin, g_strstrip (g_strdup (values[1]))) : - (tmp != NULL) ? g_strdup (tmp->bgcolor) : NULL; + (tmp != NULL) ? g_strdup (tmp->bg) : NULL; mc_skin_color->attrs = (items_count > 2 && values[2][0]) ? mc_skin_color_look_up_alias (mc_skin, g_strstrip (g_strdup (values[2]))) : (tmp != NULL) ? g_strdup (tmp->attrs) : NULL; g_strfreev (values); - mc_skin_color->pair_index = - tty_try_alloc_color_pair2 (mc_skin_color->fgcolor, mc_skin_color->bgcolor, - mc_skin_color->attrs, FALSE); + mc_skin_color->pair_index = tty_try_alloc_color_pair (mc_skin_color, FALSE); return mc_skin_color; } @@ -225,16 +223,15 @@ mc_skin_color_get_from_ini_file (mc_skin_t * mc_skin, const gchar * group, const static void mc_skin_color_set_default_for_terminal (mc_skin_t * mc_skin) { - mc_skin_color_t *mc_skin_color; - mc_skin_color = g_try_new0 (mc_skin_color_t, 1); + tty_color_pair_t *mc_skin_color; + + mc_skin_color = g_try_new0 (tty_color_pair_t, 1); if (mc_skin_color != NULL) { - mc_skin_color->fgcolor = g_strdup ("default"); - mc_skin_color->bgcolor = g_strdup ("default"); + mc_skin_color->fg = g_strdup ("default"); + mc_skin_color->bg = g_strdup ("default"); mc_skin_color->attrs = NULL; - mc_skin_color->pair_index = - tty_try_alloc_color_pair2 (mc_skin_color->fgcolor, mc_skin_color->bgcolor, - mc_skin_color->attrs, FALSE); + mc_skin_color->pair_index = tty_try_alloc_color_pair (mc_skin_color, FALSE); mc_skin_color_add_to_hash (mc_skin, "skin", "terminal_default_color", mc_skin_color); } } @@ -305,6 +302,7 @@ mc_skin_color_cache_init (void) EDITOR_BOLD_COLOR = mc_skin_color_get ("editor", "editbold"); EDITOR_MARKED_COLOR = mc_skin_color_get ("editor", "editmarked"); EDITOR_WHITESPACE_COLOR = mc_skin_color_get ("editor", "editwhitespace"); + EDITOR_NONPRINTABLE_COLOR = mc_skin_color_get ("editor", "editnonprintable"); EDITOR_RIGHT_MARGIN_COLOR = mc_skin_color_get ("editor", "editrightmargin"); LINE_STATE_COLOR = mc_skin_color_get ("editor", "editlinestate"); EDITOR_BACKGROUND = mc_skin_color_get ("editor", "editbg"); @@ -363,7 +361,7 @@ mc_skin_color_parse_ini_file (mc_skin_t * mc_skin) gboolean ret = FALSE; gsize items_count; gchar **groups, **orig_groups; - mc_skin_color_t *mc_skin_color; + tty_color_pair_t *mc_skin_color; mc_skin_color_check_bw_mode (mc_skin); @@ -377,7 +375,7 @@ mc_skin_color_parse_ini_file (mc_skin_t * mc_skin) if (mc_skin_color == NULL) goto ret; - tty_color_set_defaults (mc_skin_color->fgcolor, mc_skin_color->bgcolor, mc_skin_color->attrs); + tty_color_set_defaults (mc_skin_color); mc_skin_color_add_to_hash (mc_skin, "core", "_default_", mc_skin_color); for (groups = orig_groups; *groups != NULL; groups++) @@ -412,7 +410,7 @@ mc_skin_color_parse_ini_file (mc_skin_t * mc_skin) int mc_skin_color_get (const gchar * group, const gchar * name) { - mc_skin_color_t *mc_skin_color; + tty_color_pair_t *mc_skin_color; mc_skin_color = mc_skin_color_get_with_defaults (group, name); diff --git a/lib/skin/common.c b/lib/skin/common.c index 85790f2..e94977c 100644 --- a/lib/skin/common.c +++ b/lib/skin/common.c @@ -2,7 +2,7 @@ Skins engine. Interface functions - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: @@ -54,9 +54,10 @@ static gboolean mc_skin_is_init = FALSE; static void mc_skin_hash_destroy_value (gpointer data) { - mc_skin_color_t *mc_skin_color = (mc_skin_color_t *) data; - g_free (mc_skin_color->fgcolor); - g_free (mc_skin_color->bgcolor); + tty_color_pair_t *mc_skin_color = (tty_color_pair_t *) data; + + g_free (mc_skin_color->fg); + g_free (mc_skin_color->bg); g_free (mc_skin_color->attrs); g_free (mc_skin_color); } @@ -180,8 +181,7 @@ mc_skin_init (const gchar * skin_override, GError ** mcerror) void mc_skin_deinit (void) { - tty_color_free_all_tmp (); - tty_color_free_all_non_tmp (); + tty_color_free_all (); MC_PTR_FREE (mc_skin__default.name); g_hash_table_destroy (mc_skin__default.colors); diff --git a/lib/skin/hc-skins.c b/lib/skin/hc-skins.c index 95ac73d..1a13dec 100644 --- a/lib/skin/hc-skins.c +++ b/lib/skin/hc-skins.c @@ -2,7 +2,7 @@ Skins engine. Set of hardcoded skins - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/skin/ini-file.c b/lib/skin/ini-file.c index 6d92435..24d7c25 100644 --- a/lib/skin/ini-file.c +++ b/lib/skin/ini-file.c @@ -2,7 +2,7 @@ Skins engine. Reading and parse ini-files - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/skin/internal.h b/lib/skin/internal.h index 8b468db..6bc0a23 100644 --- a/lib/skin/internal.h +++ b/lib/skin/internal.h @@ -10,14 +10,6 @@ /*** structures declarations (and typedefs of structures)*****************************************/ -typedef struct mc_skin_color_struct -{ - gchar *fgcolor; - gchar *bgcolor; - gchar *attrs; - int pair_index; -} mc_skin_color_t; - /*** global variables defined in .c file *********************************************************/ /*** declarations of public functions ************************************************************/ diff --git a/lib/skin/lines.c b/lib/skin/lines.c index 90cc028..436f555 100644 --- a/lib/skin/lines.c +++ b/lib/skin/lines.c @@ -2,7 +2,7 @@ Skins engine. Work with line draving chars. - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: @@ -68,33 +68,31 @@ mc_skin_lines_parse_ini_file (mc_skin_t * mc_skin) mc_skin_hardcoded_space_lines (mc_skin); else if (mc_global.tty.ugly_line_drawing) mc_skin_hardcoded_ugly_lines (mc_skin); - else - { - /* single lines */ - mc_tty_frm[MC_TTY_FRM_VERT] = mc_skin_lines_load_frm (mc_skin, "vert"); - mc_tty_frm[MC_TTY_FRM_HORIZ] = mc_skin_lines_load_frm (mc_skin, "horiz"); - mc_tty_frm[MC_TTY_FRM_LEFTTOP] = mc_skin_lines_load_frm (mc_skin, "lefttop"); - mc_tty_frm[MC_TTY_FRM_RIGHTTOP] = mc_skin_lines_load_frm (mc_skin, "righttop"); - mc_tty_frm[MC_TTY_FRM_LEFTBOTTOM] = mc_skin_lines_load_frm (mc_skin, "leftbottom"); - mc_tty_frm[MC_TTY_FRM_RIGHTBOTTOM] = mc_skin_lines_load_frm (mc_skin, "rightbottom"); - mc_tty_frm[MC_TTY_FRM_TOPMIDDLE] = mc_skin_lines_load_frm (mc_skin, "topmiddle"); - mc_tty_frm[MC_TTY_FRM_BOTTOMMIDDLE] = mc_skin_lines_load_frm (mc_skin, "bottommiddle"); - mc_tty_frm[MC_TTY_FRM_LEFTMIDDLE] = mc_skin_lines_load_frm (mc_skin, "leftmiddle"); - mc_tty_frm[MC_TTY_FRM_RIGHTMIDDLE] = mc_skin_lines_load_frm (mc_skin, "rightmiddle"); - mc_tty_frm[MC_TTY_FRM_CROSS] = mc_skin_lines_load_frm (mc_skin, "cross"); - - /* double lines */ - mc_tty_frm[MC_TTY_FRM_DVERT] = mc_skin_lines_load_frm (mc_skin, "dvert"); - mc_tty_frm[MC_TTY_FRM_DHORIZ] = mc_skin_lines_load_frm (mc_skin, "dhoriz"); - mc_tty_frm[MC_TTY_FRM_DLEFTTOP] = mc_skin_lines_load_frm (mc_skin, "dlefttop"); - mc_tty_frm[MC_TTY_FRM_DRIGHTTOP] = mc_skin_lines_load_frm (mc_skin, "drighttop"); - mc_tty_frm[MC_TTY_FRM_DLEFTBOTTOM] = mc_skin_lines_load_frm (mc_skin, "dleftbottom"); - mc_tty_frm[MC_TTY_FRM_DRIGHTBOTTOM] = mc_skin_lines_load_frm (mc_skin, "drightbottom"); - mc_tty_frm[MC_TTY_FRM_DTOPMIDDLE] = mc_skin_lines_load_frm (mc_skin, "dtopmiddle"); - mc_tty_frm[MC_TTY_FRM_DBOTTOMMIDDLE] = mc_skin_lines_load_frm (mc_skin, "dbottommiddle"); - mc_tty_frm[MC_TTY_FRM_DLEFTMIDDLE] = mc_skin_lines_load_frm (mc_skin, "dleftmiddle"); - mc_tty_frm[MC_TTY_FRM_DRIGHTMIDDLE] = mc_skin_lines_load_frm (mc_skin, "drightmiddle"); - } + + /* single lines */ + mc_tty_frm[MC_TTY_FRM_VERT] = mc_skin_lines_load_frm (mc_skin, "vert"); + mc_tty_frm[MC_TTY_FRM_HORIZ] = mc_skin_lines_load_frm (mc_skin, "horiz"); + mc_tty_frm[MC_TTY_FRM_LEFTTOP] = mc_skin_lines_load_frm (mc_skin, "lefttop"); + mc_tty_frm[MC_TTY_FRM_RIGHTTOP] = mc_skin_lines_load_frm (mc_skin, "righttop"); + mc_tty_frm[MC_TTY_FRM_LEFTBOTTOM] = mc_skin_lines_load_frm (mc_skin, "leftbottom"); + mc_tty_frm[MC_TTY_FRM_RIGHTBOTTOM] = mc_skin_lines_load_frm (mc_skin, "rightbottom"); + mc_tty_frm[MC_TTY_FRM_TOPMIDDLE] = mc_skin_lines_load_frm (mc_skin, "topmiddle"); + mc_tty_frm[MC_TTY_FRM_BOTTOMMIDDLE] = mc_skin_lines_load_frm (mc_skin, "bottommiddle"); + mc_tty_frm[MC_TTY_FRM_LEFTMIDDLE] = mc_skin_lines_load_frm (mc_skin, "leftmiddle"); + mc_tty_frm[MC_TTY_FRM_RIGHTMIDDLE] = mc_skin_lines_load_frm (mc_skin, "rightmiddle"); + mc_tty_frm[MC_TTY_FRM_CROSS] = mc_skin_lines_load_frm (mc_skin, "cross"); + + /* double lines */ + mc_tty_frm[MC_TTY_FRM_DVERT] = mc_skin_lines_load_frm (mc_skin, "dvert"); + mc_tty_frm[MC_TTY_FRM_DHORIZ] = mc_skin_lines_load_frm (mc_skin, "dhoriz"); + mc_tty_frm[MC_TTY_FRM_DLEFTTOP] = mc_skin_lines_load_frm (mc_skin, "dlefttop"); + mc_tty_frm[MC_TTY_FRM_DRIGHTTOP] = mc_skin_lines_load_frm (mc_skin, "drighttop"); + mc_tty_frm[MC_TTY_FRM_DLEFTBOTTOM] = mc_skin_lines_load_frm (mc_skin, "dleftbottom"); + mc_tty_frm[MC_TTY_FRM_DRIGHTBOTTOM] = mc_skin_lines_load_frm (mc_skin, "drightbottom"); + mc_tty_frm[MC_TTY_FRM_DTOPMIDDLE] = mc_skin_lines_load_frm (mc_skin, "dtopmiddle"); + mc_tty_frm[MC_TTY_FRM_DBOTTOMMIDDLE] = mc_skin_lines_load_frm (mc_skin, "dbottommiddle"); + mc_tty_frm[MC_TTY_FRM_DLEFTMIDDLE] = mc_skin_lines_load_frm (mc_skin, "dleftmiddle"); + mc_tty_frm[MC_TTY_FRM_DRIGHTMIDDLE] = mc_skin_lines_load_frm (mc_skin, "drightmiddle"); } /* --------------------------------------------------------------------------------------------- */ diff --git a/lib/strutil/Makefile.in b/lib/strutil/Makefile.in index fe19e5c..483506a 100644 --- a/lib/strutil/Makefile.in +++ b/lib/strutil/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/lib/strutil/replace.c b/lib/strutil/replace.c index 99356ee..a2d700d 100644 --- a/lib/strutil/replace.c +++ b/lib/strutil/replace.c @@ -1,7 +1,7 @@ /* Functions for replacing substrings in strings. - Copyright (C) 2013-2023 + Copyright (C) 2013-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/strutil/strescape.c b/lib/strutil/strescape.c index a605ad8..1412fee 100644 --- a/lib/strutil/strescape.c +++ b/lib/strutil/strescape.c @@ -1,7 +1,7 @@ /* Functions for escaping and unescaping strings - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/strutil/strutil.c b/lib/strutil/strutil.c index 0c5f96a..4e24e7f 100644 --- a/lib/strutil/strutil.c +++ b/lib/strutil/strutil.c @@ -1,7 +1,7 @@ /* Common strings utilities - Copyright (C) 2007-2023 + Copyright (C) 2007-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/strutil/strutil8bit.c b/lib/strutil/strutil8bit.c index 2002e5e..468e6ea 100644 --- a/lib/strutil/strutil8bit.c +++ b/lib/strutil/strutil8bit.c @@ -1,7 +1,7 @@ /* 8bit strings utilities - Copyright (C) 2007-2023 + Copyright (C) 2007-2024 Free Software Foundation, Inc. Written by: @@ -677,13 +677,14 @@ str_8bit_casecmp (const char *s1, const char *s2) return strcasecmp (s1, s2); #else - gint c1, c2; g_return_val_if_fail (s1 != NULL, 0); g_return_val_if_fail (s2 != NULL, 0); - while (*s1 != '\0' && *s2 != '\0') + for (; *s1 != '\0' && *s2 != '\0'; s1++, s2++) { + gint c1, c2; + /* According to A. Cox, some platforms have islower's that * don't work right on non-uppercase */ @@ -691,8 +692,6 @@ str_8bit_casecmp (const char *s1, const char *s2) c2 = isupper ((guchar) * s2) ? tolower ((guchar) * s2) : *s2; if (c1 != c2) return (c1 - c2); - s1++; - s2++; } return (((gint) (guchar) * s1) - ((gint) (guchar) * s2)); @@ -716,11 +715,12 @@ str_8bit_ncasecmp (const char *s1, const char *s2) #ifdef HAVE_STRNCASECMP return strncasecmp (s1, s2, n); #else - gint c1, c2; - while (n != 0 && *s1 != '\0' && *s2 != '\0') + for (; *s1 != '\0' && *s2 != '\0'; s1++, s2++) { - n -= 1; + gint c1, c2; + + n--; /* According to A. Cox, some platforms have islower's that * don't work right on non-uppercase */ @@ -728,8 +728,6 @@ str_8bit_ncasecmp (const char *s1, const char *s2) c2 = isupper ((guchar) * s2) ? tolower ((guchar) * s2) : *s2; if (c1 != c2) return (c1 - c2); - s1++; - s2++; } if (n == 0) diff --git a/lib/strutil/strutilascii.c b/lib/strutil/strutilascii.c index 421bfdb..eb0a742 100644 --- a/lib/strutil/strutilascii.c +++ b/lib/strutil/strutilascii.c @@ -1,7 +1,7 @@ /* ASCII strings utilities - Copyright (C) 2007-2023 + Copyright (C) 2007-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/strutil/strutilutf8.c b/lib/strutil/strutilutf8.c index e143abe..9142f3d 100644 --- a/lib/strutil/strutilutf8.c +++ b/lib/strutil/strutilutf8.c @@ -1,7 +1,7 @@ /* UTF-8 strings utilities - Copyright (C) 2007-2023 + Copyright (C) 2007-2024 Free Software Foundation, Inc. Written by: @@ -901,12 +901,12 @@ str_utf8_offset_to_pos (const char *text, size_t length) else { int result; - GString *buffer; + char *buffer; - buffer = g_string_new (text); - str_utf8_fix_string (buffer->str); - result = g_utf8_offset_to_pointer (buffer->str, length) - buffer->str; - g_string_free (buffer, TRUE); + buffer = g_strdup (text); + str_utf8_fix_string (buffer); + result = g_utf8_offset_to_pointer (buffer, length) - buffer; + g_free (buffer); return result; } } diff --git a/lib/strutil/strverscmp.c b/lib/strutil/strverscmp.c index 7d720c5..26ab5e9 100644 --- a/lib/strutil/strverscmp.c +++ b/lib/strutil/strverscmp.c @@ -1,7 +1,7 @@ /* Compare strings while treating digits characters numerically. - Copyright (C) 1997-2023 + Copyright (C) 1997-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/strutil/xstrtol.c b/lib/strutil/xstrtol.c index a0f93ce..5695c19 100644 --- a/lib/strutil/xstrtol.c +++ b/lib/strutil/xstrtol.c @@ -1,6 +1,6 @@ /* A more useful interface to strtol. - Copyright (C) 1995-2023 + Copyright (C) 1995-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/timefmt.c b/lib/timefmt.c index 43bd429..caa7a1d 100644 --- a/lib/timefmt.c +++ b/lib/timefmt.c @@ -1,7 +1,7 @@ /* Time formatting functions - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/tty/Makefile.in b/lib/tty/Makefile.in index 0aa0af8..26f9901 100644 --- a/lib/tty/Makefile.in +++ b/lib/tty/Makefile.in @@ -137,7 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/lib/tty/color-internal.c b/lib/tty/color-internal.c index 8db2b6c..16b76ef 100644 --- a/lib/tty/color-internal.c +++ b/lib/tty/color-internal.c @@ -1,7 +1,7 @@ /* Internal stuff of color setup - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: @@ -184,9 +184,9 @@ tty_color_get_name_by_index (int idx) char name[9]; if (idx < 256) - sprintf (name, "color%d", idx); + g_snprintf (name, sizeof (name), "color%d", idx); else - sprintf (name, "#%06X", (unsigned int) idx & 0xFFFFFF); + g_snprintf (name, sizeof (name), "#%06X", (unsigned int) idx & 0xFFFFFF); return g_intern_string (name); } return "default"; diff --git a/lib/tty/color-internal.h b/lib/tty/color-internal.h index dc85225..a9b8d69 100644 --- a/lib/tty/color-internal.h +++ b/lib/tty/color-internal.h @@ -31,14 +31,15 @@ typedef enum { /*** structures declarations (and typedefs of structures)*****************************************/ -typedef struct mc_color_pair_struct +/* Screen library specific color pair */ +typedef struct { - int ifg; - int ibg; + int fg; + int bg; int attr; size_t pair_index; gboolean is_temp; -} tty_color_pair_t; +} tty_color_lib_pair_t; /*** global variables defined in .c file *********************************************************/ @@ -54,7 +55,7 @@ int tty_attr_get_bits (const char *attrs); void tty_color_init_lib (gboolean disable, gboolean force); void tty_color_deinit_lib (void); -void tty_color_try_alloc_pair_lib (tty_color_pair_t * mc_color_pair); +void tty_color_try_alloc_lib_pair (tty_color_lib_pair_t * mc_color_pair); /*** inline functions ****************************************************************************/ diff --git a/lib/tty/color-ncurses.c b/lib/tty/color-ncurses.c index f01d697..055a3af 100644 --- a/lib/tty/color-ncurses.c +++ b/lib/tty/color-ncurses.c @@ -1,7 +1,7 @@ /* Color setup for NCurses screen library - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: @@ -103,7 +103,7 @@ color_get_attr (int color_pair) /* --------------------------------------------------------------------------------------------- */ static void -mc_tty_color_pair_init_special (tty_color_pair_t * mc_color_pair, +mc_tty_color_pair_init_special (tty_color_lib_pair_t * mc_color_pair, int fg1, int bg1, int fg2, int bg2, int attr) { if (has_colors () && !mc_tty_color_disable) @@ -145,11 +145,11 @@ tty_color_deinit_lib (void) /* --------------------------------------------------------------------------------------------- */ void -tty_color_try_alloc_pair_lib (tty_color_pair_t * mc_color_pair) +tty_color_try_alloc_lib_pair (tty_color_lib_pair_t * mc_color_pair) { - if (mc_color_pair->ifg <= (int) SPEC_A_REVERSE) + if (mc_color_pair->fg <= (int) SPEC_A_REVERSE) { - switch (mc_color_pair->ifg) + switch (mc_color_pair->fg) { case SPEC_A_REVERSE: mc_tty_color_pair_init_special (mc_color_pair, @@ -179,8 +179,8 @@ tty_color_try_alloc_pair_lib (tty_color_pair_t * mc_color_pair) { int ifg, ibg, attr; - ifg = mc_color_pair->ifg; - ibg = mc_color_pair->ibg; + ifg = mc_color_pair->fg; + ibg = mc_color_pair->bg; attr = mc_color_pair->attr; /* In legacy color mode, change bright colors into bold */ diff --git a/lib/tty/color-slang.c b/lib/tty/color-slang.c index 5dd2663..33344b5 100644 --- a/lib/tty/color-slang.c +++ b/lib/tty/color-slang.c @@ -1,7 +1,7 @@ /* Color setup for S_Lang screen library - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: @@ -99,7 +99,7 @@ has_colors (gboolean disable, gboolean force) /* --------------------------------------------------------------------------------------------- */ static void -mc_tty_color_pair_init_special (tty_color_pair_t * mc_color_pair, +mc_tty_color_pair_init_special (tty_color_lib_pair_t * mc_color_pair, const char *fg1, const char *bg1, const char *fg2, const char *bg2, SLtt_Char_Type mask) { @@ -145,11 +145,11 @@ tty_color_deinit_lib (void) /* --------------------------------------------------------------------------------------------- */ void -tty_color_try_alloc_pair_lib (tty_color_pair_t * mc_color_pair) +tty_color_try_alloc_lib_pair (tty_color_lib_pair_t * mc_color_pair) { - if (mc_color_pair->ifg <= (int) SPEC_A_REVERSE) + if (mc_color_pair->fg <= (int) SPEC_A_REVERSE) { - switch (mc_color_pair->ifg) + switch (mc_color_pair->fg) { case SPEC_A_REVERSE: mc_tty_color_pair_init_special (mc_color_pair, @@ -176,8 +176,8 @@ tty_color_try_alloc_pair_lib (tty_color_pair_t * mc_color_pair) { const char *fg, *bg; - fg = tty_color_get_name_by_index (mc_color_pair->ifg); - bg = tty_color_get_name_by_index (mc_color_pair->ibg); + fg = tty_color_get_name_by_index (mc_color_pair->fg); + bg = tty_color_get_name_by_index (mc_color_pair->bg); SLtt_set_color (mc_color_pair->pair_index, (char *) "", (char *) fg, (char *) bg); SLtt_add_color_attribute (mc_color_pair->pair_index, mc_color_pair->attr); } diff --git a/lib/tty/color.c b/lib/tty/color.c index c79e13a..78d50b7 100644 --- a/lib/tty/color.c +++ b/lib/tty/color.c @@ -2,7 +2,7 @@ Color setup. Interface functions. - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: @@ -46,9 +46,15 @@ /*** global variables ****************************************************************************/ -static char *tty_color_defaults__fg = NULL; -static char *tty_color_defaults__bg = NULL; -static char *tty_color_defaults__attrs = NULL; +/* *INDENT-OFF* */ +static tty_color_pair_t tty_color_defaults = +{ + .fg = NULL, + .bg = NULL, + .attrs = NULL, + .pair_index = 0 +}; +/* *INDENT-ON* */ /* Set if we are actually using colors */ gboolean use_colors = FALSE; @@ -67,25 +73,23 @@ static GHashTable *mc_tty_color__hashtable = NULL; /*** file scope functions ************************************************************************/ /* --------------------------------------------------------------------------------------------- */ -static gboolean -tty_color_free_condition_cb (gpointer key, gpointer value, gpointer user_data) +static void +mc_color__deinit (tty_color_pair_t * color) { - tty_color_pair_t *mc_color_pair = (tty_color_pair_t *) value; - gboolean is_temp_color; - - (void) key; - - is_temp_color = user_data != NULL; - return (mc_color_pair->is_temp == is_temp_color); + g_free (color->fg); + g_free (color->bg); + g_free (color->attrs); } /* --------------------------------------------------------------------------------------------- */ -static void -tty_color_free_all (gboolean is_temp_color) +static gboolean +tty_color_free_temp_cb (gpointer key, gpointer value, gpointer user_data) { - g_hash_table_foreach_remove (mc_tty_color__hashtable, tty_color_free_condition_cb, - is_temp_color ? GSIZE_TO_POINTER (1) : NULL); + (void) key; + (void) user_data; + + return ((tty_color_lib_pair_t *) value)->is_temp; } /* --------------------------------------------------------------------------------------------- */ @@ -93,7 +97,7 @@ tty_color_free_all (gboolean is_temp_color) static gboolean tty_color_get_next_cpn_cb (gpointer key, gpointer value, gpointer user_data) { - tty_color_pair_t *mc_color_pair = (tty_color_pair_t *) value; + tty_color_lib_pair_t *mc_color_pair = (tty_color_lib_pair_t *) value; size_t cp = GPOINTER_TO_SIZE (user_data); (void) key; @@ -134,10 +138,7 @@ void tty_colors_done (void) { tty_color_deinit_lib (); - g_free (tty_color_defaults__fg); - g_free (tty_color_defaults__bg); - g_free (tty_color_defaults__attrs); - + mc_color__deinit (&tty_color_defaults); g_hash_table_destroy (mc_tty_color__hashtable); } @@ -152,30 +153,27 @@ tty_use_colors (void) /* --------------------------------------------------------------------------------------------- */ int -tty_try_alloc_color_pair2 (const char *fg, const char *bg, const char *attrs, - gboolean is_temp_color) +tty_try_alloc_color_pair (const tty_color_pair_t * color, gboolean is_temp) { + gboolean is_base; gchar *color_pair; - tty_color_pair_t *mc_color_pair; + tty_color_lib_pair_t *mc_color_pair; int ifg, ibg, attr; - if (fg == NULL || strcmp (fg, "base") == 0) - fg = tty_color_defaults__fg; - if (bg == NULL || strcmp (bg, "base") == 0) - bg = tty_color_defaults__bg; - if (attrs == NULL || strcmp (attrs, "base") == 0) - attrs = tty_color_defaults__attrs; - - ifg = tty_color_get_index_by_name (fg); - ibg = tty_color_get_index_by_name (bg); - attr = tty_attr_get_bits (attrs); + is_base = (color->fg == NULL || strcmp (color->fg, "base") == 0); + ifg = tty_color_get_index_by_name (is_base ? tty_color_defaults.fg : color->fg); + is_base = (color->bg == NULL || strcmp (color->bg, "base") == 0); + ibg = tty_color_get_index_by_name (is_base ? tty_color_defaults.bg : color->bg); + is_base = (color->attrs == NULL || strcmp (color->attrs, "base") == 0); + attr = tty_attr_get_bits (is_base ? tty_color_defaults.attrs : color->attrs); color_pair = g_strdup_printf ("%d.%d.%d", ifg, ibg, attr); if (color_pair == NULL) return 0; mc_color_pair = - (tty_color_pair_t *) g_hash_table_lookup (mc_tty_color__hashtable, (gpointer) color_pair); + (tty_color_lib_pair_t *) g_hash_table_lookup (mc_tty_color__hashtable, + (gpointer) color_pair); if (mc_color_pair != NULL) { @@ -183,20 +181,20 @@ tty_try_alloc_color_pair2 (const char *fg, const char *bg, const char *attrs, return mc_color_pair->pair_index; } - mc_color_pair = g_try_new0 (tty_color_pair_t, 1); + mc_color_pair = g_try_new0 (tty_color_lib_pair_t, 1); if (mc_color_pair == NULL) { g_free (color_pair); return 0; } - mc_color_pair->is_temp = is_temp_color; - mc_color_pair->ifg = ifg; - mc_color_pair->ibg = ibg; + mc_color_pair->is_temp = is_temp; + mc_color_pair->fg = ifg; + mc_color_pair->bg = ibg; mc_color_pair->attr = attr; mc_color_pair->pair_index = tty_color_get_next__color_pair_number (); - tty_color_try_alloc_pair_lib (mc_color_pair); + tty_color_try_alloc_lib_pair (mc_color_pair); g_hash_table_insert (mc_tty_color__hashtable, (gpointer) color_pair, (gpointer) mc_color_pair); @@ -205,40 +203,31 @@ tty_try_alloc_color_pair2 (const char *fg, const char *bg, const char *attrs, /* --------------------------------------------------------------------------------------------- */ -int -tty_try_alloc_color_pair (const char *fg, const char *bg, const char *attrs) -{ - return tty_try_alloc_color_pair2 (fg, bg, attrs, TRUE); -} - -/* --------------------------------------------------------------------------------------------- */ - void -tty_color_free_all_tmp (void) +tty_color_free_temp (void) { - tty_color_free_all (TRUE); + g_hash_table_foreach_remove (mc_tty_color__hashtable, tty_color_free_temp_cb, NULL); } /* --------------------------------------------------------------------------------------------- */ void -tty_color_free_all_non_tmp (void) +tty_color_free_all (void) { - tty_color_free_all (FALSE); + g_hash_table_remove_all (mc_tty_color__hashtable); } /* --------------------------------------------------------------------------------------------- */ void -tty_color_set_defaults (const char *fgcolor, const char *bgcolor, const char *attrs) +tty_color_set_defaults (const tty_color_pair_t * color) { - g_free (tty_color_defaults__fg); - g_free (tty_color_defaults__bg); - g_free (tty_color_defaults__attrs); + mc_color__deinit (&tty_color_defaults); - tty_color_defaults__fg = g_strdup (fgcolor); - tty_color_defaults__bg = g_strdup (bgcolor); - tty_color_defaults__attrs = g_strdup (attrs); + tty_color_defaults.fg = g_strdup (color->fg); + tty_color_defaults.bg = g_strdup (color->bg); + tty_color_defaults.attrs = g_strdup (color->attrs); + tty_color_defaults.pair_index = 0; } /* --------------------------------------------------------------------------------------------- */ diff --git a/lib/tty/color.h b/lib/tty/color.h index 583cce3..e09516f 100644 --- a/lib/tty/color.h +++ b/lib/tty/color.h @@ -21,6 +21,14 @@ /*** typedefs(not structures) and defined constants **********************************************/ +typedef struct +{ + char *fg; + char *bg; + char *attrs; + size_t pair_index; +} tty_color_pair_t; + /*** enums ***************************************************************************************/ /*** structures declarations (and typedefs of structures)*****************************************/ @@ -33,18 +41,16 @@ void tty_init_colors (gboolean disable, gboolean force); void tty_colors_done (void); gboolean tty_use_colors (void); -int tty_try_alloc_color_pair (const char *fg, const char *bg, const char *attrs); -int tty_try_alloc_color_pair2 (const char *fg, const char *bg, const char *attrs, - gboolean is_temp_color); +int tty_try_alloc_color_pair (const tty_color_pair_t * color, gboolean is_temp); -void tty_color_free_all_tmp (void); -void tty_color_free_all_non_tmp (void); +void tty_color_free_temp (void); +void tty_color_free_all (void); void tty_setcolor (int color); void tty_lowlevel_setcolor (int color); void tty_set_normal_attrs (void); -void tty_color_set_defaults (const char *fgcolor, const char *bgcolor, const char *attrs); +void tty_color_set_defaults (const tty_color_pair_t * color); extern gboolean tty_use_256colors (GError ** error); extern gboolean tty_use_truecolors (GError ** error); diff --git a/lib/tty/key.c b/lib/tty/key.c index 5671666..8e7770b 100644 --- a/lib/tty/key.c +++ b/lib/tty/key.c @@ -1,7 +1,7 @@ /* Keyboard support routines. - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: @@ -1173,28 +1173,19 @@ getch_with_timeout (unsigned int delay_us) /* --------------------------------------------------------------------------------------------- */ static void -learn_store_key (char *buffer, char **p, int c) +learn_store_key (GString * buffer, int c) { - if (*p - buffer > 253) - return; - if (c == ESC_CHAR) - { - *(*p)++ = '\\'; - *(*p)++ = 'e'; - } + g_string_append (buffer, "\\e"); else if (c < ' ') { - *(*p)++ = '^'; - *(*p)++ = c + 'a' - 1; + g_string_append_c (buffer, '^'); + g_string_append_c (buffer, c + 'a' - 1); } else if (c == '^') - { - *(*p)++ = '^'; - *(*p)++ = '^'; - } + g_string_append (buffer, "^^"); else - *(*p)++ = (char) c; + g_string_append_c (buffer, (char) c); } /* --------------------------------------------------------------------------------------------- */ @@ -2163,14 +2154,15 @@ learn_key (void) fd_set Read_FD_Set; gint64 end_time; int c; - char buffer[256]; - char *p = buffer; + GString *buffer; + + buffer = g_string_sized_new (16); tty_keypad (FALSE); /* disable interpreting keys by ncurses */ c = tty_lowlevel_getch (); while (c == -1) c = tty_lowlevel_getch (); /* Sanity check, should be unnecessary */ - learn_store_key (buffer, &p, c); + learn_store_key (buffer, c); end_time = g_get_monotonic_time () + LEARN_TIMEOUT * MC_USEC_PER_MSEC; @@ -2194,12 +2186,12 @@ learn_key (void) } if (c == -1) break; - learn_store_key (buffer, &p, c); + learn_store_key (buffer, c); } tty_keypad (TRUE); tty_nodelay (FALSE); - *p = '\0'; - return (buffer[0] != '\0' ? g_strdup (buffer) : NULL); + + return g_string_free (buffer, buffer->len == 0); #undef LEARN_TIMEOUT } diff --git a/lib/tty/keyxdef.c b/lib/tty/keyxdef.c index a496f67..4527161 100644 --- a/lib/tty/keyxdef.c +++ b/lib/tty/keyxdef.c @@ -3,7 +3,7 @@ /* Additional keyboard support routines. - Copyright (C) 1998-2023 + Copyright (C) 1998-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/tty/mouse.c b/lib/tty/mouse.c index cf42287..574e349 100644 --- a/lib/tty/mouse.c +++ b/lib/tty/mouse.c @@ -1,7 +1,7 @@ /* Mouse managing - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/tty/tty-internal.c b/lib/tty/tty-internal.c index c79301d..4693235 100644 --- a/lib/tty/tty-internal.c +++ b/lib/tty/tty-internal.c @@ -1,7 +1,7 @@ /* Internal stuff of the terminal controlling library. - Copyright (C) 2019-2023 + Copyright (C) 2019-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/tty/tty-ncurses.c b/lib/tty/tty-ncurses.c index 08f663d..fa503da 100644 --- a/lib/tty/tty-ncurses.c +++ b/lib/tty/tty-ncurses.c @@ -2,7 +2,7 @@ Interface to the terminal controlling library. Ncurses wrapper. - Copyright (C) 2005-2023 + Copyright (C) 2005-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/tty/tty-slang.c b/lib/tty/tty-slang.c index 3aa74de..752825b 100644 --- a/lib/tty/tty-slang.c +++ b/lib/tty/tty-slang.c @@ -2,7 +2,7 @@ Interface to the terminal controlling library. Slang wrapper. - Copyright (C) 2005-2023 + Copyright (C) 2005-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/tty/tty.c b/lib/tty/tty.c index cae0a05..55ba0e9 100644 --- a/lib/tty/tty.c +++ b/lib/tty/tty.c @@ -1,7 +1,7 @@ /* Interface to the terminal controlling library. - Copyright (C) 2005-2023 + Copyright (C) 2005-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/tty/win.c b/lib/tty/win.c index 45451a4..5ac8a5a 100644 --- a/lib/tty/win.c +++ b/lib/tty/win.c @@ -1,7 +1,7 @@ /* Terminal management xterm and rxvt support - Copyright (C) 1995-2023 + Copyright (C) 1995-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/tty/x11conn.c b/lib/tty/x11conn.c index 20e201b..dfd6454 100644 --- a/lib/tty/x11conn.c +++ b/lib/tty/x11conn.c @@ -1,7 +1,7 @@ /* X11 support for the Midnight Commander. - Copyright (C) 2005-2023 + Copyright (C) 2005-2024 Free Software Foundation, Inc. Written by: @@ -1,7 +1,7 @@ /* Various utilities - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: @@ -256,6 +256,9 @@ name_quote (const char *s, gboolean quote_percent) { GString *ret; + if (s == NULL || *s == '\0') + return NULL; + ret = g_string_sized_new (64); if (*s == '-') @@ -305,7 +308,7 @@ name_quote (const char *s, gboolean quote_percent) g_string_append_c (ret, *s); } - return g_string_free (ret, FALSE); + return g_string_free (ret, ret->len == 0); } /* --------------------------------------------------------------------------------------------- */ @@ -314,7 +317,8 @@ char * fake_name_quote (const char *s, gboolean quote_percent) { (void) quote_percent; - return g_strdup (s); + + return (s == NULL || *s == '\0' ? NULL : g_strdup (s)); } /* --------------------------------------------------------------------------------------------- */ @@ -887,6 +891,11 @@ get_compression_type (int fd, const char *name) && magic[2] == 'Z' && magic[3] == 'M' && magic[4] == 'A' && magic[5] == 0x00) return COMPRESSION_LZMA; + /* LZO format - \x89\x4c\x5a\x4f\x00\x0d\x0a\x1a\x0a lzop compressed data */ + if (magic[0] == 0x89 && magic[1] == 0x4c && + magic[2] == 0x5a && magic[3] == 0x4f && magic[4] == 0x00 && magic[5] == 0x0d) + return COMPRESSION_LZO; + /* XZ compression magic */ if (magic[0] == 0xFD && magic[1] == 0x37 @@ -926,6 +935,8 @@ decompress_extension (int type) return "/ulz4" VFS_PATH_URL_DELIMITER; case COMPRESSION_LZMA: return "/ulzma" VFS_PATH_URL_DELIMITER; + case COMPRESSION_LZO: + return "/ulzo" VFS_PATH_URL_DELIMITER; case COMPRESSION_XZ: return "/uxz" VFS_PATH_URL_DELIMITER; case COMPRESSION_ZSTD: @@ -84,6 +84,7 @@ enum compression_type COMPRESSION_LZIP, COMPRESSION_LZ4, COMPRESSION_LZMA, + COMPRESSION_LZO, COMPRESSION_XZ, COMPRESSION_ZSTD, }; diff --git a/lib/utilunix.c b/lib/utilunix.c index 42e0f6d..e652e51 100644 --- a/lib/utilunix.c +++ b/lib/utilunix.c @@ -1,7 +1,7 @@ /* Various utilities - Unix variants - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/vfs/Makefile.in b/lib/vfs/Makefile.in index bf588f9..91ac02a 100644 --- a/lib/vfs/Makefile.in +++ b/lib/vfs/Makefile.in @@ -135,7 +135,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/lib/vfs/direntry.c b/lib/vfs/direntry.c index 32b8594..5f9a8ef 100644 --- a/lib/vfs/direntry.c +++ b/lib/vfs/direntry.c @@ -1,7 +1,7 @@ /* Directory cache support - Copyright (C) 1998-2023 + Copyright (C) 1998-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/vfs/gc.c b/lib/vfs/gc.c index 0914b75..6c5deb0 100644 --- a/lib/vfs/gc.c +++ b/lib/vfs/gc.c @@ -1,7 +1,7 @@ /* Virtual File System garbage collection code - Copyright (C) 2003-2023 + Copyright (C) 2003-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/vfs/interface.c b/lib/vfs/interface.c index 1b2de26..545dd1d 100644 --- a/lib/vfs/interface.c +++ b/lib/vfs/interface.c @@ -1,7 +1,7 @@ /* Virtual File System: interface functions - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/vfs/netutil.c b/lib/vfs/netutil.c index 1306879..3f31d46 100644 --- a/lib/vfs/netutil.c +++ b/lib/vfs/netutil.c @@ -1,7 +1,7 @@ /* Network utilities for the Midnight Commander Virtual File System. - Copyright (C) 1995-2023 + Copyright (C) 1995-2024 Free Software Foundation, Inc. This file is part of the Midnight Commander. diff --git a/lib/vfs/parse_ls_vga.c b/lib/vfs/parse_ls_vga.c index 779792f..dcb82be 100644 --- a/lib/vfs/parse_ls_vga.c +++ b/lib/vfs/parse_ls_vga.c @@ -1,7 +1,7 @@ /* Routines for parsing output from the 'ls' command. - Copyright (C) 1988-2023 + Copyright (C) 1988-2024 Free Software Foundation, Inc. Copyright (C) 1995, 1996 Miguel de Icaza @@ -49,7 +49,7 @@ /*** file scope macro definitions ****************************************************************/ -/* Parsing code is used by ftpfs, fish and extfs */ +/* Parsing code is used by ftpfs, shell and extfs */ #define MAXCOLS 30 /*** file scope type declarations ****************************************************************/ diff --git a/lib/vfs/path.c b/lib/vfs/path.c index c599e25..85faa9a 100644 --- a/lib/vfs/path.c +++ b/lib/vfs/path.c @@ -1,7 +1,7 @@ /* Virtual File System path handlers - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: @@ -546,13 +546,12 @@ vfs_path_tokens_add_class_info (const vfs_path_element_t * element, GString * re g_string_append (ret_tokens, VFS_PATH_URL_DELIMITER); url_str = vfs_path_build_url_params_str (element, TRUE); - if (url_str->len != 0) + if (url_str != NULL) { g_string_append_len (ret_tokens, url_str->str, url_str->len); g_string_append_c (ret_tokens, PATH_SEP); + g_string_free (url_str, TRUE); } - - g_string_free (url_str, TRUE); } #ifdef HAVE_CHARSET @@ -663,13 +662,12 @@ vfs_path_to_str_flags (const vfs_path_t * vpath, int elements_count, vfs_path_fl g_string_append (buffer, VFS_PATH_URL_DELIMITER); url_str = vfs_path_build_url_params_str (element, !(flags & VPF_STRIP_PASSWORD)); - if (url_str->len != 0) + if (url_str != NULL) { g_string_append_len (buffer, url_str->str, url_str->len); g_string_append_c (buffer, PATH_SEP); + g_string_free (url_str, TRUE); } - - g_string_free (url_str, TRUE); } #ifdef HAVE_CHARSET @@ -1514,7 +1512,7 @@ vfs_path_vtokens_get (const vfs_path_t * vpath, ssize_t start_position, ssize_t * @param element path element * @param keep_password TRUE or FALSE * - * @return newly allocated string + * @return newly allocated non-empty string or NULL */ GString * @@ -1553,7 +1551,11 @@ vfs_path_build_url_params_str (const vfs_path_element_t * element, gboolean keep g_string_append_printf (buffer, "%d", element->port); } - return buffer; + if (buffer->len != 0) + return buffer; + + g_string_free (buffer, TRUE); + return NULL; } /* --------------------------------------------------------------------------------------------- */ @@ -1574,14 +1576,16 @@ vfs_path_element_build_pretty_path_str (const vfs_path_element_t * element) g_string_append (pretty_path, VFS_PATH_URL_DELIMITER); url_params = vfs_path_build_url_params_str (element, FALSE); - g_string_append_len (pretty_path, url_params->str, url_params->len); - g_string_free (url_params, TRUE); + if (url_params != NULL) + { + g_string_append_len (pretty_path, url_params->str, url_params->len); + g_string_free (url_params, TRUE); + } if (!IS_PATH_SEP (*element->path)) g_string_append_c (pretty_path, PATH_SEP); - g_string_append (pretty_path, element->path); - return pretty_path; + return g_string_append (pretty_path, element->path); } /* --------------------------------------------------------------------------------------------- */ diff --git a/lib/vfs/utilvfs.c b/lib/vfs/utilvfs.c index 162eb4c..0356832 100644 --- a/lib/vfs/utilvfs.c +++ b/lib/vfs/utilvfs.c @@ -1,7 +1,7 @@ /* Utilities for VFS modules. - Copyright (C) 1988-2023 + Copyright (C) 1988-2024 Free Software Foundation, Inc. Copyright (C) 1995, 1996 Miguel de Icaza diff --git a/lib/vfs/vfs.c b/lib/vfs/vfs.c index ad57189..18d15ed 100644 --- a/lib/vfs/vfs.c +++ b/lib/vfs/vfs.c @@ -1,7 +1,7 @@ /* Virtual File System switch code - Copyright (C) 1995-2023 + Copyright (C) 1995-2024 Free Software Foundation, Inc. Written by: 1995 Miguel de Icaza diff --git a/lib/vfs/vfs.h b/lib/vfs/vfs.h index ee78ff5..260e8f3 100644 --- a/lib/vfs/vfs.h +++ b/lib/vfs/vfs.h @@ -68,7 +68,7 @@ #endif #ifdef EREMOTEIO -#define E_REMOTE EREMOTEIO /* if other side of ftp/fish reports error */ +#define E_REMOTE EREMOTEIO /* if other side of ftp/shell reports error */ #else #define E_REMOTE ENETUNREACH /* :-( there's no EREMOTEIO on some systems */ #endif @@ -133,7 +133,7 @@ typedef struct vfs_class { const char *name; /* "FIles over SHell" */ vfs_flags_t flags; - const char *prefix; /* "fish:" */ + const char *prefix; /* "shell:" */ int verrno; /* can't use errno because glibc2 might define errno as function */ gboolean flush; /* if set to TRUE, invalidate directory cache */ FILE *logfile; diff --git a/lib/vfs/xdirentry.h b/lib/vfs/xdirentry.h index e1244cb..9424658 100644 --- a/lib/vfs/xdirentry.h +++ b/lib/vfs/xdirentry.h @@ -109,7 +109,7 @@ typedef struct } vfs_file_handler_t; /* - * One of our subclasses (tar, cpio, fish, ftpfs) with data and methods. + * One of our subclasses (tar, cpio, shell, ftpfs) with data and methods. * Extends vfs_class. */ struct vfs_s_subclass diff --git a/lib/widget/Makefile.in b/lib/widget/Makefile.in index 9353dec..85b2493 100644 --- a/lib/widget/Makefile.in +++ b/lib/widget/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/lib/widget/background.c b/lib/widget/background.c index 1965dee..afea825 100644 --- a/lib/widget/background.c +++ b/lib/widget/background.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 2020-2023 + Copyright (C) 2020-2024 The Free Software Foundation, Inc. Authors: diff --git a/lib/widget/button.c b/lib/widget/button.c index 9f0bfa5..2cdaafc 100644 --- a/lib/widget/button.c +++ b/lib/widget/button.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/buttonbar.c b/lib/widget/buttonbar.c index 4522000..24e4f75 100644 --- a/lib/widget/buttonbar.c +++ b/lib/widget/buttonbar.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/check.c b/lib/widget/check.c index 63c55e3..b77573e 100644 --- a/lib/widget/check.c +++ b/lib/widget/check.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/dialog-switch.c b/lib/widget/dialog-switch.c index 959cbf9..74aedff 100644 --- a/lib/widget/dialog-switch.c +++ b/lib/widget/dialog-switch.c @@ -3,7 +3,7 @@ Original idea and code: Oleg "Olegarch" Konovalov <olegarch@linuxinside.com> - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: diff --git a/lib/widget/dialog.c b/lib/widget/dialog.c index 3ab2191..2596857 100644 --- a/lib/widget/dialog.c +++ b/lib/widget/dialog.c @@ -1,7 +1,7 @@ /* Dialog box features module for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. This file is part of the Midnight Commander. @@ -83,7 +83,7 @@ dlg_default_get_colors (const Widget * w) /* --------------------------------------------------------------------------------------------- */ /** - * Read histories from the ${XDG_CACHE_HOME}/mc/history file + * Read histories from the ${XDG_DATA_HOME}/mc/history file */ static void dlg_read_history (WDialog * h) @@ -122,6 +122,16 @@ refresh_cmd (void) /* --------------------------------------------------------------------------------------------- */ +static void +dlg_help (const WDialog * h) +{ + ev_help_t event_data = { NULL, h->help_ctx }; + + mc_event_raise (MCEVENT_GROUP_CORE, "help", &event_data); +} + +/* --------------------------------------------------------------------------------------------- */ + static cb_ret_t dlg_execute_cmd (WDialog * h, long command) { @@ -152,10 +162,7 @@ dlg_execute_cmd (WDialog * h, long command) break; case CK_Help: - { - ev_help_t event_data = { NULL, h->help_ctx }; - mc_event_raise (MCEVENT_GROUP_CORE, "help", &event_data); - } + dlg_help (h); break; case CK_Suspend: @@ -571,7 +578,7 @@ dlg_run (WDialog * h) /* --------------------------------------------------------------------------------------------- */ /** - * Write history to the ${XDG_CACHE_HOME}/mc/history file + * Write history to the ${XDG_DATA_HOME}/mc/history file */ void dlg_save_history (WDialog * h) diff --git a/lib/widget/frame.c b/lib/widget/frame.c index 31127ab..127649e 100644 --- a/lib/widget/frame.c +++ b/lib/widget/frame.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 2020-2023 + Copyright (C) 2020-2024 The Free Software Foundation, Inc. Authors: diff --git a/lib/widget/gauge.c b/lib/widget/gauge.c index 5eebb11..14b5fa8 100644 --- a/lib/widget/gauge.c +++ b/lib/widget/gauge.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/group.c b/lib/widget/group.c index eb6ba1e..f1a170c 100644 --- a/lib/widget/group.c +++ b/lib/widget/group.c @@ -1,7 +1,7 @@ /* Widget group features module for the Midnight Commander - Copyright (C) 2020-2023 + Copyright (C) 2020-2024 The Free Software Foundation, Inc. Written by: diff --git a/lib/widget/groupbox.c b/lib/widget/groupbox.c index 49cf7b0..4f6a021 100644 --- a/lib/widget/groupbox.c +++ b/lib/widget/groupbox.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/history.c b/lib/widget/history.c index 8197db8..7076d13 100644 --- a/lib/widget/history.c +++ b/lib/widget/history.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/hline.c b/lib/widget/hline.c index 73e261a..0f77a84 100644 --- a/lib/widget/hline.c +++ b/lib/widget/hline.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/input.c b/lib/widget/input.c index 3a67b49..a7ad7f5 100644 --- a/lib/widget/input.c +++ b/lib/widget/input.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/input_complete.c b/lib/widget/input_complete.c index 94a4c3b..bc44115 100644 --- a/lib/widget/input_complete.c +++ b/lib/widget/input_complete.c @@ -2,7 +2,7 @@ Input line filename/username/hostname/variable/command completion. (Let mc type for you...) - Copyright (C) 1995-2023 + Copyright (C) 1995-2024 Free Software Foundation, Inc. Written by: @@ -98,7 +98,6 @@ static char **hosts = NULL; static char **hosts_p = NULL; static int hosts_alloclen = 0; -static int complete_height, complete_width; static WInput *input; static int min_end; static int start = 0; @@ -1275,11 +1274,9 @@ complete_engine (WInput * in, int what_to_do) input = in; min_end = end; - complete_height = h; - complete_width = w; complete_dlg = - dlg_create (TRUE, y, x, complete_height, complete_width, WPOS_KEEP_DEFAULT, TRUE, + dlg_create (TRUE, y, x, h, w, WPOS_KEEP_DEFAULT, TRUE, dialog_colors, complete_callback, NULL, "[Completion]", NULL); complete_list = listbox_new (1, 1, h - 2, w - 2, FALSE, NULL); group_add_widget (GROUP (complete_dlg), complete_list); diff --git a/lib/widget/label.c b/lib/widget/label.c index 5a04a0f..4cde190 100644 --- a/lib/widget/label.c +++ b/lib/widget/label.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/listbox-window.c b/lib/widget/listbox-window.c index 47d7f8b..7cad872 100644 --- a/lib/widget/listbox-window.c +++ b/lib/widget/listbox-window.c @@ -1,7 +1,7 @@ /* Widget based utility functions. - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/listbox.c b/lib/widget/listbox.c index 9f25487..76f07ad 100644 --- a/lib/widget/listbox.c +++ b/lib/widget/listbox.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/menu.c b/lib/widget/menu.c index 4a30c02..b27c4c3 100644 --- a/lib/widget/menu.c +++ b/lib/widget/menu.c @@ -1,7 +1,7 @@ /* Pulldown menu code - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: @@ -530,6 +530,24 @@ menubar_try_exec_menu (WMenuBar * menubar, int hotkey) /* --------------------------------------------------------------------------------------------- */ +static void +menubar_help (const WMenuBar * menubar) +{ + ev_help_t event_data; + + event_data.filename = NULL; + + if (menubar->is_dropped) + event_data.node = MENU (g_list_nth_data (menubar->menu, menubar->current))->help_node; + else + event_data.node = "[Menu Bar]"; + + mc_event_raise (MCEVENT_GROUP_CORE, "help", &event_data); + menubar_draw (menubar); +} + +/* --------------------------------------------------------------------------------------------- */ + static cb_ret_t menubar_execute_cmd (WMenuBar * menubar, long command) { @@ -538,18 +556,7 @@ menubar_execute_cmd (WMenuBar * menubar, long command) switch (command) { case CK_Help: - { - ev_help_t event_data = { NULL, NULL }; - - if (menubar->is_dropped) - event_data.node = - MENU (g_list_nth_data (menubar->menu, menubar->current))->help_node; - else - event_data.node = "[Menu Bar]"; - - mc_event_raise (MCEVENT_GROUP_CORE, "help", &event_data); - menubar_draw (menubar); - } + menubar_help (menubar); break; case CK_Left: diff --git a/lib/widget/mouse.c b/lib/widget/mouse.c index 15ad5f5..2183903 100644 --- a/lib/widget/mouse.c +++ b/lib/widget/mouse.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 2016-2023 + Copyright (C) 2016-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/quick.c b/lib/widget/quick.c index 35f5d68..3a6d165 100644 --- a/lib/widget/quick.c +++ b/lib/widget/quick.c @@ -1,7 +1,7 @@ /* Widget based utility functions. - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/radio.c b/lib/widget/radio.c index 8fb52d8..94463f6 100644 --- a/lib/widget/radio.c +++ b/lib/widget/radio.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/rect.c b/lib/widget/rect.c index 34ae8b0..8c2d464 100644 --- a/lib/widget/rect.c +++ b/lib/widget/rect.c @@ -1,6 +1,6 @@ /* Rectangular class for Midnight Commander widgets - Copyright (C) 2020-2023 + Copyright (C) 2020-2024 The Free Software Foundation, Inc. Written by: diff --git a/lib/widget/widget-common.c b/lib/widget/widget-common.c index 821b7b3..459de10 100644 --- a/lib/widget/widget-common.c +++ b/lib/widget/widget-common.c @@ -1,7 +1,7 @@ /* Widgets for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/lib/widget/wtools.c b/lib/widget/wtools.c index a4af4b5..d1df8da 100644 --- a/lib/widget/wtools.c +++ b/lib/widget/wtools.c @@ -1,7 +1,7 @@ /* Widget based utility functions. - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Authors: diff --git a/m4.include/mc-ext2fs-attr.m4 b/m4.include/mc-ext2fs-attr.m4 index 6a57cd5..42e4a29 100644 --- a/m4.include/mc-ext2fs-attr.m4 +++ b/m4.include/mc-ext2fs-attr.m4 @@ -12,9 +12,8 @@ AC_DEFUN([mc_EXT2FS_ATTR], if test x"$found_e2p" = "xyes"; then AC_DEFINE(ENABLE_EXT2FS_ATTR, 1, [Define to enable support for ext2fs attributes]) - AC_SUBST(EXT2FS_CFLAGS) - AC_SUBST(E2P_CFLAGS) MCLIBS="$MCLIBS $E2P_LIBS" + CPPFLAGS="$CPPFLAGS $EXT2FS_CFLAGS $E2P_CFLAGS" ext2fs_attr_msg="yes" else AC_MSG_WARN([e2p library not found or version too old (must be >= 1.42.4)]) diff --git a/m4.include/mc-glib.m4 b/m4.include/mc-glib.m4 index 4008207..f93962f 100644 --- a/m4.include/mc-glib.m4 +++ b/m4.include/mc-glib.m4 @@ -8,12 +8,12 @@ AC_DEFUN([mc_G_MODULE_SUPPORTED], [ g_module_supported="" found_gmodule=no - PKG_CHECK_MODULES(GMODULE, [gmodule-no-export-2.0 >= 2.30], [found_gmodule=yes], [:]) + PKG_CHECK_MODULES(GMODULE, [gmodule-no-export-2.0 >= 2.32], [found_gmodule=yes], [:]) if test x"$found_gmodule" = xyes; then g_module_supported="gmodule-no-export-2.0" else dnl try fallback to the generic gmodule - PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.30], [found_gmodule=yes], [:]) + PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.32], [found_gmodule=yes], [:]) if test x"$found_gmodule" = xyes; then g_module_supported="gmodule-2.0" fi @@ -78,9 +78,9 @@ AC_DEFUN([mc_CHECK_GLIB], [ AS_HELP_STRING([--with-glib-static], [Link glib statically @<:@no@:>@])) glib_found=no - PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.30], [glib_found=yes], [:]) + PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.32], [glib_found=yes], [:]) if test x"$glib_found" = xno; then - AC_MSG_ERROR([glib-2.0 not found or version too old (must be >= 2.30)]) + AC_MSG_ERROR([glib-2.0 not found or version too old (must be >= 2.32)]) fi ]) diff --git a/m4.include/mc-vfs.m4 b/m4.include/mc-vfs.m4 index f14fcfe..82567bd 100644 --- a/m4.include/mc-vfs.m4 +++ b/m4.include/mc-vfs.m4 @@ -13,7 +13,7 @@ m4_include([m4.include/vfs/mc-vfs-extfs.m4]) m4_include([m4.include/vfs/mc-vfs-sfs.m4]) m4_include([m4.include/vfs/mc-vfs-ftp.m4]) m4_include([m4.include/vfs/mc-vfs-sftp.m4]) -m4_include([m4.include/vfs/mc-vfs-fish.m4]) +m4_include([m4.include/vfs/mc-vfs-shell.m4]) m4_include([m4.include/vfs/mc-vfs-undelfs.m4]) m4_include([m4.include/vfs/mc-vfs-tarfs.m4]) m4_include([m4.include/vfs/mc-vfs-cpiofs.m4]) @@ -71,7 +71,7 @@ AC_DEFUN([mc_VFS_CHECKS], mc_VFS_CPIOFS mc_VFS_EXTFS - mc_VFS_FISH + mc_VFS_SHELL mc_VFS_FTP mc_VFS_SFS mc_VFS_SFTP @@ -80,7 +80,7 @@ AC_DEFUN([mc_VFS_CHECKS], AM_CONDITIONAL(ENABLE_VFS, [test x"$enable_vfs" = x"yes"]) - if test x"$enable_vfs_ftp" = x"yes" -o x"$enable_vfs_fish" = x"yes" -o x"$enable_vfs_sftp" = x"yes"; then + if test x"$enable_vfs_ftp" = x"yes" -o x"$enable_vfs_shell" = x"yes" -o x"$enable_vfs_sftp" = x"yes"; then mc_ENABLE_VFS_NET fi diff --git a/m4.include/vfs/mc-vfs-fish.m4 b/m4.include/vfs/mc-vfs-fish.m4 deleted file mode 100644 index d3463ee..0000000 --- a/m4.include/vfs/mc-vfs-fish.m4 +++ /dev/null @@ -1,12 +0,0 @@ -dnl Enable FISH protocol (classic) -AC_DEFUN([mc_VFS_FISH], -[ - AC_ARG_ENABLE([vfs-fish], - AS_HELP_STRING([--enable-vfs-fish], [Support for FISH filesystem @<:@yes@:>@])) - if test "$enable_vfs" = "yes" -a "x$enable_vfs_fish" != xno; then - enable_vfs_fish="yes" - mc_VFS_ADDNAME([fish]) - AC_DEFINE([ENABLE_VFS_FISH], [1], [Support for FISH vfs]) - fi - AM_CONDITIONAL(ENABLE_VFS_FISH, [test "$enable_vfs" = "yes" -a x"$enable_vfs_fish" = x"yes"]) -]) diff --git a/m4.include/vfs/mc-vfs-shell.m4 b/m4.include/vfs/mc-vfs-shell.m4 new file mode 100644 index 0000000..b07b22b --- /dev/null +++ b/m4.include/vfs/mc-vfs-shell.m4 @@ -0,0 +1,12 @@ +dnl Enable SHELL protocol +AC_DEFUN([mc_VFS_SHELL], +[ + AC_ARG_ENABLE([vfs-shell], + AS_HELP_STRING([--enable-vfs-shell], [Support for SHELL filesystem @<:@yes@:>@])) + if test "$enable_vfs" = "yes" -a "x$enable_vfs_shell" != xno; then + enable_vfs_shell="yes" + mc_VFS_ADDNAME([shell]) + AC_DEFINE([ENABLE_VFS_SHELL], [1], [Support for SHELL vfs]) + fi + AM_CONDITIONAL(ENABLE_VFS_SHELL, [test "$enable_vfs" = "yes" -a x"$enable_vfs_shell" = x"yes"]) +]) diff --git a/mc-version.h b/mc-version.h index 0ad9585..0d7c1f7 100644 --- a/mc-version.h +++ b/mc-version.h @@ -1,4 +1,4 @@ #ifndef MC_CURRENT_VERSION /* This is an autogenerated file. Don't edit! */ -#define MC_CURRENT_VERSION "4.8.30" +#define MC_CURRENT_VERSION "4.8.31" #endif diff --git a/misc/Makefile.in b/misc/Makefile.in index 783bd1e..929e50d 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -136,7 +136,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/misc/ext.d/Makefile.in b/misc/ext.d/Makefile.in index 61fc57a..441152d 100644 --- a/misc/ext.d/Makefile.in +++ b/misc/ext.d/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/misc/ext.d/archive.sh b/misc/ext.d/archive.sh index 840fd47..12beb01 100755 --- a/misc/ext.d/archive.sh +++ b/misc/ext.d/archive.sh @@ -32,6 +32,9 @@ do_view_action() { lzma) lzma -dc "${MC_EXT_FILENAME}" 2>/dev/null ;; + lzo) + lzop -dc "${MC_EXT_FILENAME}" 2>/dev/null + ;; xz) xz -dc "${MC_EXT_FILENAME}" 2>/dev/null ;; @@ -65,6 +68,10 @@ do_view_action() { lzma -dc "${MC_EXT_FILENAME}" 2>/dev/null | \ tar tvvf - ;; + tar.lzo|tzo) + lzop -dc "${MC_EXT_FILENAME}" 2>/dev/null | \ + tar tvvf - + ;; tar.xz) xz -dc "${MC_EXT_FILENAME}" 2>/dev/null | \ tar tvvf - @@ -114,6 +121,10 @@ do_view_action() { lz4 -dc "${MC_EXT_FILENAME}" | \ cpio -itv 2>/dev/null ;; + cpio.lzo) + lzop -dc "${MC_EXT_FILENAME}" | \ + cpio -itv 2>/dev/null + ;; cpio.xz) xz -dc "${MC_EXT_FILENAME}" | \ cpio -itv 2>/dev/null @@ -177,6 +188,9 @@ do_open_action() { lzma) lzma -dc "${MC_EXT_FILENAME}" | ${pager} ;; + lzo) + lzop -dc "${MC_EXT_FILENAME}" | ${pager} + ;; xz) xz -dc "${MC_EXT_FILENAME}" | ${pager} ;; diff --git a/misc/ext.d/image.sh b/misc/ext.d/image.sh index 04307e0..c191225 100755 --- a/misc/ext.d/image.sh +++ b/misc/ext.d/image.sh @@ -12,14 +12,19 @@ do_view_action() { filetype=$1 case "${filetype}" in - jpeg) - identify "${MC_EXT_FILENAME}" - which exif >/dev/null 2>&1 && exif "${MC_EXT_FILENAME}" 2>/dev/null - ;; xpm) - sxpm "${MC_EXT_FILENAME}" + [ -n "$DISPLAY" ] && sxpm "${MC_EXT_FILENAME}" ;; *) + if which exif >/dev/null 2>&1; then + exif "${MC_EXT_FILENAME}" 2>/dev/null + E=$? + else + E=1 + fi + if [ $E != 0 ] && which exiftool >/dev/null 2>&1; then + exiftool "${MC_EXT_FILENAME}" 2>/dev/null + fi identify "${MC_EXT_FILENAME}" ;; esac diff --git a/misc/ext.d/text.sh.in b/misc/ext.d/text.sh.in index 2bd6ca0..357f9e1 100644 --- a/misc/ext.d/text.sh.in +++ b/misc/ext.d/text.sh.in @@ -31,6 +31,9 @@ get_unpacker() { man.lzma) unpacker="lzma -dc" ;; + man.lzo) + unpacker="lzop -dc" + ;; man.xz) unpacker="xz -dc" ;; @@ -67,7 +70,7 @@ do_view_action() { nroff.ms) nroff @MAN_FLAGS@ -ms "${MC_EXT_FILENAME}" ;; - man.gz|man.bz|man.bz2|man.lz|man.lz4|man.lzma|man.xz|man.zst) + man.gz|man.bz|man.bz2|man.lz|man.lz4|man.lzma|man.lzo|man.xz|man.zst) case "${MC_EXT_FILENAME}" in */log/*|*/logs/*) ${unpacker} "${MC_EXT_FILENAME}" @@ -114,7 +117,7 @@ do_open_action() { nroff.ms) nroff @MAN_FLAGS@ -ms "${MC_EXT_FILENAME}" | ${pager} ;; - man.gz|man.bz|man.bz2|man.lz|man.lz4|man.lzma|man.xz|man.zst) + man.gz|man.bz|man.bz2|man.lz|man.lz4|man.lzma|man.lzo|man.xz|man.zst) case "${MC_EXT_FILENAME}" in */log/*|*/logs/*) ${unpacker} "${MC_EXT_FILENAME}" diff --git a/misc/filehighlight.ini b/misc/filehighlight.ini index c31f562..2882423 100644 --- a/misc/filehighlight.ini +++ b/misc/filehighlight.ini @@ -25,7 +25,7 @@ regexp=(^#.*|.*~$) [archive] - 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;vsix;xz;zip;zoo;zst + extensions=7z;Z;ace;apk;arc;arj;ark;bz2;cab;cpio;deb;gz;lha;lz;lz4;lzh;lzma;lzo;rar;rpm;tar;tbz;tbz2;tgz;tlz;txz;tzo;tzst;vsix;xz;zip;zoo;zst [doc] extensions=chm;css;ctl;diz;doc;docm;docx;dtd;fodg;fodp;fods;fodt;htm;html;json;letter;lsm;mail;man;markdown;md;me;mkd;msg;nroff;odg;odp;ods;odt;pdf;po;ppt;pptm;pptx;ps;rtf;sgml;shtml;tex;text;txt;xls;xlsm;xlsx;xml;xsd;xslt diff --git a/misc/macros.d/Makefile.in b/misc/macros.d/Makefile.in index 23206dc..808e941 100644 --- a/misc/macros.d/Makefile.in +++ b/misc/macros.d/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/misc/mc.default.keymap b/misc/mc.default.keymap index 34df586..6e7e8bd 100644 --- a/misc/mc.default.keymap +++ b/misc/mc.default.keymap @@ -50,7 +50,7 @@ ScreenList = alt-prime # EditExtensionsFile = # EditFileHighlightFile = # Filter = -# ConnectFish = +# ConnectShell = # ConnectFtp = # Undelete = EditorViewerHistory = alt-shift-e diff --git a/misc/mc.emacs.keymap b/misc/mc.emacs.keymap index d5071ab..53c4749 100644 --- a/misc/mc.emacs.keymap +++ b/misc/mc.emacs.keymap @@ -50,7 +50,7 @@ ScreenList = alt-prime # EditExtensionsFile = # EditFileHighlightFile = # Filter = -# ConnectFish = +# ConnectShell = # ConnectFtp = # Undelete = EditorViewerHistory = alt-shift-e diff --git a/misc/mc.ext.ini.in b/misc/mc.ext.ini.in index 87dc1d2..c2152ee 100644 --- a/misc/mc.ext.ini.in +++ b/misc/mc.ext.ini.in @@ -26,8 +26,8 @@ # Section [Include/xxxx] can be located as before as after sections that point to it. # # Sections are processed from top to bottom, thus the order is important. -# If there are more than one sections with the same name in this file, the first -# section will be used. +# Multiple sections with the same name are allowed, they are merged together. +# Sections may contain the same key multiple times; the last entry wins. # # [Default] should be a catch-all action and come last. # @@ -57,8 +57,12 @@ # the literal | and | has a special meaning (or), and () have a special meaning # and \( \) stand for literal ( ). # +# An unescaped backslash \ is handled as invalid escape sequences in glib = 2.77.3 and +# glib >= 2.79 (https://gitlab.gnome.org/GNOME/glib/-/issues/3094), therefore backslash +# must be escaped. +# # Example: -# Regex=\.t(ar\.lzma|lz)$ +# Regex=\\.t(ar\\.lzma|lz)$ # matches *.tar.lzma or *.tlz. # # RegexIgnoreCase [true|false] @@ -188,7 +192,7 @@ Version=4.0 ### GIT Repo ### [gitfs changeset] -Regex=^\[git\] +Regex=^\\[git\\] Open=%cd %p/changesetfs:// View=%cd %p/patchsetfs:// @@ -200,7 +204,7 @@ View=%cd %p/patchsetfs:// # .tgz, .tpz, .tar.gz, .tar.z, .tar.Z [tar.gzip] -Regex=\.t([gp]?z|ar\.g?[zZ])$ +Regex=\\.t([gp]?z|ar\\.g?[zZ])$ Include=tar.gz [ipk] @@ -217,13 +221,13 @@ Shell=.tar.bz View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.bzip [tar.bzip2] -Regex=\.t(ar\.bz2|bz2?|b2)$ +Regex=\\.t(ar\\.bz2|bz2?|b2)$ Open=%cd %p/utar:// View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.bzip2 # .tar.lzma, .tlz [tar.lzma] -Regex=\.t(ar\.lzma|lz)$ +Regex=\\.t(ar\\.lzma|lz)$ Open=%cd %p/utar:// View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.lzma @@ -234,19 +238,25 @@ View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.lz # .tar.lz4, .tlz4 [tar.lz4] -Regex=\.t(ar\.lz4|lz4)$ +Regex=\\.t(ar\\.lz4|lz4)$ Open=%cd %p/utar:// View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.lz4 +# .tar.lzo, .tzo +[tar.lzo] +Regex=\\.t(ar\\.lzo|zo)$ +Open=%cd %p/utar:// +View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.lzo + # .tar.xz, .txz [tar.xz] -Regex=\.t(ar\.xz|xz)$ +Regex=\\.t(ar\\.xz|xz)$ Open=%cd %p/utar:// View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.xz # .tar.zst, .tzst [tar.zst] -Regex=\.t(ar\.zst|zst)$ +Regex=\\.t(ar\\.zst|zst)$ Open=%cd %p/utar:// View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.zst @@ -258,7 +268,7 @@ View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.F # .qpr/.qpk - QNX Neutrino package installer files [tar.qpr] -Regex=\.qp[rk]$ +Regex=\\.qp[rk]$ Open=%cd %p/utar:// View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.qpr @@ -269,7 +279,7 @@ Open=%cd %p/utar:// View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar [arj] -Regex=\.a(rj|[0-9][0-9])$ +Regex=\\.a(rj|[0-9][0-9])$ RegexIgnoreCase=true Open=%cd %p/uarj:// View=%view{ascii} @EXTHELPERSDIR@/archive.sh view arj @@ -287,7 +297,7 @@ Open=%cd %p/uha:// View=%view{ascii} @EXTHELPERSDIR@/archive.sh view ha [rar] -Regex=\.r(ar|[0-9][0-9])$ +Regex=\\.r(ar|[0-9][0-9])$ RegexIgnoreCase=true Open=%cd %p/urar:// View=%view{ascii} @EXTHELPERSDIR@/archive.sh view rar @@ -314,6 +324,11 @@ Shell=.cpio.lz4 Open=%cd %p/ucpio:// View=%view{ascii} @EXTHELPERSDIR@/archive.sh view cpio.lz4 +[cpio.lzo] +Shell=.cpio.lzo +Open=%cd %p/ucpio:// +View=%view{ascii} @EXTHELPERSDIR@/archive.sh view cpio.lzo + [cpio.xz] Shell=.cpio.xz Open=%cd %p/ucpio:// @@ -335,7 +350,7 @@ ShellIgnoreCase=true Include=cpio [initrd] -Regex=^(initramfs.*\.img|initrd(-.+)?\.img(-.+)?)$ +Regex=^(initramfs.*\\.img|initrd(-.+)?\\.img(-.+)?)$ Include=cpio [7zip] @@ -345,32 +360,32 @@ Open=%cd %p/u7z:// View=%view{ascii} @EXTHELPERSDIR@/archive.sh view 7z [patch] -Regex=\.(diff|patch)$ +Regex=\\.(diff|patch)$ Open=%cd %p/patchfs:// View=%view{ascii} @EXTHELPERSDIR@/misc.sh view cat [patch.gz] -Regex=\.(diff|patch)\.(gz|Z)$ +Regex=\\.(diff|patch)\\.(gz|Z)$ Open=%cd %p/patchfs:// View=%view{ascii} @EXTHELPERSDIR@/archive.sh view gz [patch.bz2] -Regex=\.(diff|patch)\.bz2$ +Regex=\\.(diff|patch)\\.bz2$ Open=%cd %p/patchfs:// View=%view{ascii} @EXTHELPERSDIR@/archive.sh view bz2 [patch.xz] -Regex=\.(diff|patch)\.xz$ +Regex=\\.(diff|patch)\\.xz$ Open=%cd %p/patchfs:// View=%view{ascii} @EXTHELPERSDIR@/archive.sh view xz [patch.zst] -Regex=\.(diff|patch)\.zst$ +Regex=\\.(diff|patch)\\.zst$ Open=%cd %p/patchfs:// View=%view{ascii} @EXTHELPERSDIR@/archive.sh view zst [ls-lR] -Regex=(^|\.)ls-?lR(\.gz|Z|bz2)$ +Regex=(^|\\.)ls-?lR(\\.gz|Z|bz2)$ Open=%cd %p/lslR:// [trpm] @@ -380,7 +395,7 @@ View=%view{ascii} @EXTHELPERSDIR@/package.sh view trpm # RPM packages (SuSE uses *.spm for source packages) [src.rpm] -Regex=\.(src\.rpm|spm)$ +Regex=\\.(src\\.rpm|spm)$ Open=%cd %p/rpm:// View=%view{ascii} @EXTHELPERSDIR@/package.sh view src.rpm @@ -390,7 +405,7 @@ Open=%cd %p/rpm:// View=%view{ascii} @EXTHELPERSDIR@/package.sh view rpm [deb] -Regex=\.u?deb$ +Regex=\\.u?deb$ Open=%cd %p/deb:// View=%view{ascii} @EXTHELPERSDIR@/package.sh view deb @@ -411,7 +426,7 @@ Open=%cd %p/iso9660:// View=%view{ascii} @EXTHELPERSDIR@/misc.sh view iso9660 [ar] -Regex=\.s?a$ +Regex=\\.s?a$ Open=%cd %p/uar:// #Open=%view{ascii} ar tv %f View=%view{ascii} @EXTHELPERSDIR@/misc.sh view ar @@ -425,12 +440,12 @@ View=%view{ascii} @EXTHELPERSDIR@/misc.sh view lib ### Sources ### [C/C++] -Regex=\.(c|cc|cpp|cxx|c\+\+)$ +Regex=\\.(c|cc|cpp|cxx|c\\+\\+)$ RegexIgnoreCase=true Include=editor [C/C++ header] -Regex=\.(h|hh|hpp|hxx|h\+\+)$ +Regex=\\.(h|hh|hpp|hxx|h\\+\\+)$ RegexIgnoreCase=true Include=editor @@ -440,7 +455,7 @@ ShellIgnoreCase=true Include=editor [Assembler] -Regex=\.(s|asm)$ +Regex=\\.(s|asm)$ RegexIgnoreCase=true Include=editor @@ -452,19 +467,19 @@ Include=editor # .so libraries [so] -Regex=\.(so|so\.[0-9\.]*)$ +Regex=\\.(so|so\\.[0-9\\.]*)$ View=%view{ascii} @EXTHELPERSDIR@/misc.sh view so # .dylib libraries [dylib] -Regex=\.(dylib|dylib\.[0-9\.]*)$ +Regex=\\.(dylib|dylib\\.[0-9\\.]*)$ View=%view{ascii} @EXTHELPERSDIR@/misc.sh view dylib ### Documentation ### #[Texinfo] -#Regex=\.(te?xi|texinfo)$ +#Regex=\\.(te?xi|texinfo)$ [info-by-shell] Shell=.info @@ -497,27 +512,32 @@ View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view nroff.ms %var{PAGER:more} # Manual page [man.lz] -Regex=([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.lz$ +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} [man.lz4] -Regex=([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.lz4$ +Regex=([^0-9]|^[^\\.]*)\\.([1-9][A-Za-z]*|[ln])\\.lz4$ Open=@EXTHELPERSDIR@/text.sh open man.lz4 %var{PAGER:more} View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view man.lz4 %var{PAGER:more} [man.lzma] -Regex=([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.lzma$ +Regex=([^0-9]|^[^\\.]*)\\.([1-9][A-Za-z]*|[ln])\\.lzma$ Open=@EXTHELPERSDIR@/text.sh open man.lzma %var{PAGER:more} View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view man.lzma %var{PAGER:more} +[man.lzo] +Regex=([^0-9]|^[^\\.]*)\\.([1-9][A-Za-z]*|[ln])\\.lzo$ +Open=@EXTHELPERSDIR@/text.sh open man.lzo %var{PAGER:more} +View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view man.lzo %var{PAGER:more} + [man.xz] -Regex=([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.xz$ +Regex=([^0-9]|^[^\\.]*)\\.([1-9][A-Za-z]*|[ln])\\.xz$ Open=@EXTHELPERSDIR@/text.sh open man.xz %var{PAGER:more} View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view man.xz %var{PAGER:more} [man.zst] -Regex=([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.zst$ +Regex=([^0-9]|^[^\\.]*)\\.([1-9][A-Za-z]*|[ln])\\.zst$ Open=@EXTHELPERSDIR@/text.sh open man.zst %var{PAGER:more} View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view man.zst %var{PAGER:more} @@ -556,17 +576,26 @@ ShellIgnoreCase=true View=%view{ascii} @EXTHELPERSDIR@/image.sh view svg Open=@EXTHELPERSDIR@/image.sh open svg +[webp] +Shell=.webp +View=%view{ascii} @EXTHELPERSDIR@/image.sh view webp +Open=@EXTHELPERSDIR@/image.sh open webp + +[avif] +Shell=.avif +View=%view{ascii} @EXTHELPERSDIR@/image.sh view avif +Open=@EXTHELPERSDIR@/image.sh open avif ### Sound files ### [sound] -Regex=\.(wav|snd|voc|au|smp|aiff|snd|m4a|ape|aac|wv|spx|flac)$ +Regex=\\.(wav|snd|voc|au|smp|aiff|snd|m4a|ape|aac|wv|spx|flac)$ RegexIgnoreCase=true Open=@EXTHELPERSDIR@/sound.sh open common View=%view{ascii} @EXTHELPERSDIR@/sound.sh view common [mod] -Regex=\.(mod|s3m|xm|it|mtm|669|stm|ult|far)$ +Regex=\\.(mod|s3m|xm|it|mtm|669|stm|ult|far)$ RegexIgnoreCase=true Open=@EXTHELPERSDIR@/sound.sh open mod @@ -582,7 +611,7 @@ Open=@EXTHELPERSDIR@/sound.sh open mp3 View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mp3 [ogg] -Regex=\.og[gax]$ +Regex=\\.og[gax]$ RegexIgnoreCase=true Open=@EXTHELPERSDIR@/sound.sh open ogg View=%view{ascii} @EXTHELPERSDIR@/sound.sh view ogg @@ -594,7 +623,7 @@ Open=@EXTHELPERSDIR@/sound.sh open opus View=%view{ascii} @EXTHELPERSDIR@/sound.sh view opus [midi] -Regex=\.(midi?|rmid?)$ +Regex=\\.(midi?|rmid?)$ RegexIgnoreCase=true Open=@EXTHELPERSDIR@/sound.sh open midi @@ -606,7 +635,7 @@ View=%view{ascii} @EXTHELPERSDIR@/sound.sh view wma # Play list [playlist] -Regex=\.(m3u|pls)$ +Regex=\\.(m3u|pls)$ RegexIgnoreCase=true Open=@EXTHELPERSDIR@/sound.sh open playlist @@ -619,7 +648,7 @@ ShellIgnoreCase=true Include=video [asf] -Regex=\.as[fx]$ +Regex=\\.as[fx]$ RegexIgnoreCase=true Include=video @@ -634,12 +663,12 @@ ShellIgnoreCase=true Include=video [mov] -Regex=\.(mov|qt)$ +Regex=\\.(mov|qt)$ RegexIgnoreCase=true Include=video [mp4] -Regex=\.(mp4|m4v|mpe?g)$ +Regex=\\.(mp4|m4v|mpe?g)$ RegexIgnoreCase=true Include=video @@ -665,7 +694,7 @@ ShellIgnoreCase=true Include=video [fli] -Regex=\.fl[icv]$ +Regex=\\.fl[icv]$ RegexIgnoreCase=true Include=video @@ -675,7 +704,7 @@ ShellIgnoreCase=true Include=video [realaudio] -Regex=\.ra?m$ +Regex=\\.ra?m$ RegexIgnoreCase=true Open=@EXTHELPERSDIR@/video.sh open ram @@ -688,7 +717,7 @@ Include=video ### Documents ### [html] -Regex=\.html?$ +Regex=\\.html?$ RegexIgnoreCase=true Open=@EXTHELPERSDIR@/web.sh open html View=%view{ascii} @EXTHELPERSDIR@/web.sh view html @@ -700,7 +729,7 @@ Open=@EXTHELPERSDIR@/doc.sh open ooffice # StarOffice 6 and OpenOffice.org formats [OpenOffice.org] -Regex=\.(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)$ +Regex=\\.(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)$ RegexIgnoreCase=true Open=@EXTHELPERSDIR@/doc.sh open ooffice View=%view{ascii} @EXTHELPERSDIR@/doc.sh view odt @@ -722,21 +751,21 @@ Open=@EXTHELPERSDIR@/doc.sh open msdoc # Microsoft Word Document [msdoc-by-shell] -Regex=\.(do[ct]|wri|docx)$ +Regex=\\.(do[ct]|wri|docx)$ RegexIgnoreCase=true Open=@EXTHELPERSDIR@/doc.sh open msdoc View=%view{ascii} @EXTHELPERSDIR@/doc.sh view msdoc # Microsoft Excel Worksheet [msxls-by-shell] -Regex=\.(xl[sw]|xlsx)$ +Regex=\\.(xl[sw]|xlsx)$ RegexIgnoreCase=true Open=@EXTHELPERSDIR@/doc.sh open msxls View=%view{ascii} @EXTHELPERSDIR@/doc.sh view msxls # Microsoft PowerPoint Presentation [msppt] -Regex=\.(pp[ts]|pptx)$ +Regex=\\.(pp[ts]|pptx)$ RegexIgnoreCase=true Open=@EXTHELPERSDIR@/doc.sh open msppt View=%view{ascii} @EXTHELPERSDIR@/doc.sh view msppt @@ -753,25 +782,25 @@ ShellIgnoreCase=true Include=editor [markdown] -Regex=\.mk?d$ +Regex=\\.mk?d$ RegexIgnoreCase=true Include=editor [djvu] -Regex=\.djvu?$ +Regex=\\.djvu?$ RegexIgnoreCase=true Open=@EXTHELPERSDIR@/doc.sh open djvu View=%view{ascii} @EXTHELPERSDIR@/doc.sh view djvu # Comic Books [cbr] -Regex=\.cb[zr]$ +Regex=\\.cb[zr]$ RegexIgnoreCase=true Open=@EXTHELPERSDIR@/doc.sh open comic # Epup, mobi, fb2 [ebook] -Regex=\.(epub|mobi|fb2)$ +Regex=\\.(epub|mobi|fb2)$ RegexIgnoreCase=true Open=@EXTHELPERSDIR@/doc.sh open ebook View=%view{ascii} @EXTHELPERSDIR@/doc.sh view ebook @@ -790,11 +819,11 @@ Open=xmkmf -a # Makefile.PL (MakeMaker) [Makefile.pl] -Regex=^Makefile\.(PL|pl)$ +Regex=^Makefile\\.(PL|pl)$ Open=%var{PERL:perl} %f [Makefile] -Regex=^[Mm]akefile +Regex=^[Mm]akefile$ Open=make -f %f %{Enter parameters} [dbf] @@ -805,7 +834,7 @@ View=%view{ascii} @EXTHELPERSDIR@/misc.sh view dbf # REXX script [rexx] -Regex=\.(rexx?|cmd)$ +Regex=\\.(rexx?|cmd)$ Open=rexx %f %{Enter parameters};echo "Press ENTER";read y # Disk images for Commodore computers (VIC20, C64, C128) @@ -874,6 +903,12 @@ ShellIgnoreCase=true Open=@EXTHELPERSDIR@/archive.sh view lz4 %var{PAGER:more} View=%view{ascii} @EXTHELPERSDIR@/archive.sh view lz4 +[lzo] +Shell=.lzo +ShellIgnoreCase=true +Open=@EXTHELPERSDIR@/archive.sh view lzo %var{PAGER:more} +View=%view{ascii} @EXTHELPERSDIR@/archive.sh view lzo + [wim] Shell=.wim ShellIgnoreCase=true diff --git a/misc/mc.menu.in b/misc/mc.menu.in index c491858..9d37e37 100644 --- a/misc/mc.menu.in +++ b/misc/mc.menu.in @@ -93,6 +93,15 @@ shell_patterns=0 tar cf - "$Pwd" | zstd -f > "$tar.tar.zst" && \ echo "../$tar.tar.zst created." +8 Compress the current subdirectory (tar.lzo) + Pwd=`basename %d /` + echo -n "Name of the compressed file (without extension) [$Pwd]: " + read tar + [ "$tar"x = x ] && tar="$Pwd" + cd .. && \ + tar cf - "$Pwd" | lzop -f > "$tar.tar.lzo" && \ + echo "../$tar.tar.lzo created." + = f \.c$ & t r + f \.c$ & t r & ! t t c Compile and link current .c file @@ -228,7 +237,7 @@ U Uudecode marked news articles (needs work) fi echo "Please test the output file before deleting anything." -=+ f \.tar\.gz$ | f \.tar\.z$ | f \.tgz$ | f \.tpz$ | f \.tar\.lz$ | f \.tar\.lz4$ | f \.tar\.lzma$ | f \.tar\.7z$ | f \.tar\.xz$ | f \.tar\.zst | f \.tar\.Z$ | f \.tar\.bz2$ & t rl +=+ f \.tar\.gz$ | f \.tar\.z$ | f \.tgz$ | f \.tpz$ | f \.tar\.lz$ | f \.tar\.lz4$ | f \.tar\.lzma$ | f \.tar\.lzo$ | f \.tar\.7z$ | f \.tar\.xz$ | f \.tar\.zst | f \.tar\.Z$ | f \.tar\.bz2$ & t rl x Extract the contents of a compressed tar file unset PRG case %f in @@ -238,6 +247,7 @@ x Extract the contents of a compressed tar file *.tar.lz) PRG="lzip -dc";; *.tar.lz4) PRG="lz4 -dc";; *.tar.lzma) PRG="lzma -dc";; + *.tar.lzo) PRG="lzop -dc";; *.tar.xz) PRG="xz -dc";; *.tar.zst) PRG="zstd -dc";; *) exit 1;; diff --git a/misc/skins/Makefile.in b/misc/skins/Makefile.in index a752490..de5a2db 100644 --- a/misc/skins/Makefile.in +++ b/misc/skins/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/misc/skins/dark.ini b/misc/skins/dark.ini index 8ad29b3..707b05b 100644 --- a/misc/skins/dark.ini +++ b/misc/skins/dark.ini @@ -104,6 +104,7 @@ editbold = yellow;green editmarked = black;lightgray editwhitespace = brightblue;black + editnonprintable = ;black editlinestate = white;cyan bookmark = white;red bookmarkfound = black;green diff --git a/misc/skins/darkfar.ini b/misc/skins/darkfar.ini index 9ac7399..1329e1d 100644 --- a/misc/skins/darkfar.ini +++ b/misc/skins/darkfar.ini @@ -104,6 +104,7 @@ editbold = yellow;green editmarked = black;lightgray editwhitespace = brightblue;black + editnonprintable = ;black editlinestate = white;cyan bookmark = white;red bookmarkfound = black;green diff --git a/misc/skins/default.ini b/misc/skins/default.ini index 145eb99..a3dd3e3 100644 --- a/misc/skins/default.ini +++ b/misc/skins/default.ini @@ -104,6 +104,7 @@ editbold = yellow;green editmarked = black;cyan editwhitespace = brightblue;blue + editnonprintable = ;black editlinestate = white;cyan bookmark = white;red bookmarkfound = black;green diff --git a/misc/skins/double-lines.ini b/misc/skins/double-lines.ini index 7f35df0..f6bdac0 100644 --- a/misc/skins/double-lines.ini +++ b/misc/skins/double-lines.ini @@ -104,6 +104,7 @@ editbold = yellow;green editmarked = black;cyan editwhitespace = brightblue;blue + editnonprintable = ;black editlinestate = white;cyan bookmark = white;red bookmarkfound = black;green diff --git a/misc/skins/featured-plus.ini b/misc/skins/featured-plus.ini index a0dc070..def2147 100644 --- a/misc/skins/featured-plus.ini +++ b/misc/skins/featured-plus.ini @@ -106,6 +106,7 @@ editbold = yellow;green editmarked = black;cyan editwhitespace = brightblue;blue + editnonprintable = ;black editlinestate = white;cyan bookmark = white;red bookmarkfound = black;green diff --git a/misc/skins/featured.ini b/misc/skins/featured.ini index 43ce2f2..f5b6f5d 100644 --- a/misc/skins/featured.ini +++ b/misc/skins/featured.ini @@ -107,6 +107,7 @@ editmarked = black;cyan editwhitespace = brightblue;blue editlinestate = white;cyan + editnonprintable = ;black bookmark = white;red bookmarkfound = black;green editrightmargin = brightblue;black diff --git a/misc/skins/gotar.ini b/misc/skins/gotar.ini index 3b81867..d49ddb6 100644 --- a/misc/skins/gotar.ini +++ b/misc/skins/gotar.ini @@ -101,6 +101,7 @@ editbold = yellow;blue editmarked = brightgreen;red editwhitespace = brightblue;blue + editnonprintable = ;black editlinestate = brightgreen bookmark = white;red bookmarkfound = black;green diff --git a/misc/skins/gray-green-purple256.ini b/misc/skins/gray-green-purple256.ini index 3f00e2a..12a09e3 100644 --- a/misc/skins/gray-green-purple256.ini +++ b/misc/skins/gray-green-purple256.ini @@ -111,6 +111,7 @@ editbold = rgb400 editmarked = ;main1 editwhitespace = rgb400;bgdarker + editnonprintable = ;black editlinestate = ;bgdarker bookmark = ;rgb531 bookmarkfound = ;main2 diff --git a/misc/skins/gray-orange-blue256.ini b/misc/skins/gray-orange-blue256.ini index 4953c16..bce1a98 100644 --- a/misc/skins/gray-orange-blue256.ini +++ b/misc/skins/gray-orange-blue256.ini @@ -111,6 +111,7 @@ editbold = rgb400 editmarked = ;main1 editwhitespace = rgb400;bgdarker + editnonprintable = ;black editlinestate = ;bgdarker bookmark = ;rgb531 bookmarkfound = ;main2 diff --git a/misc/skins/julia256.ini b/misc/skins/julia256.ini index 18ed248..2a73180 100644 --- a/misc/skins/julia256.ini +++ b/misc/skins/julia256.ini @@ -107,6 +107,7 @@ editbold = yellow;green editmarked = black;lightgray editwhitespace = brightblue;black + editnonprintable = ;black editlinestate = white;cyan bookmark = white;red bookmarkfound = black;green diff --git a/misc/skins/mc46.ini b/misc/skins/mc46.ini index f971310..fe42e79 100644 --- a/misc/skins/mc46.ini +++ b/misc/skins/mc46.ini @@ -95,6 +95,7 @@ editbold = yellow; editmarked = black;cyan editwhitespace = brightblue;blue + editnonprintable = ;black editlinestate = white;cyan bookmark = white;red bookmarkfound = black;green diff --git a/misc/skins/modarcon16-defbg.ini b/misc/skins/modarcon16-defbg.ini index e06e721..c79a5a2 100644 --- a/misc/skins/modarcon16-defbg.ini +++ b/misc/skins/modarcon16-defbg.ini @@ -146,6 +146,7 @@ editbold = color15;;bold editmarked = color11;color2;bold editwhitespace = color12;color4 + editnonprintable = ;black editlinestate = color2;color0 bookmark = color0;color7 bookmarkfound = color0;color7 diff --git a/misc/skins/modarcon16.ini b/misc/skins/modarcon16.ini index e2c86d7..6e95836 100644 --- a/misc/skins/modarcon16.ini +++ b/misc/skins/modarcon16.ini @@ -146,6 +146,7 @@ editbold = color15;;bold editmarked = color11;color2;bold editwhitespace = color2;color0 + editnonprintable = ;black editlinestate = color2;color0 bookmark = color0;color7 bookmarkfound = color0;color7 diff --git a/misc/skins/modarcon16root-defbg.ini b/misc/skins/modarcon16root-defbg.ini index 5d05269..677f3ea 100644 --- a/misc/skins/modarcon16root-defbg.ini +++ b/misc/skins/modarcon16root-defbg.ini @@ -146,6 +146,7 @@ editbold = color15;;bold editmarked = color11;color1;bold editwhitespace = color12;color4 + editnonprintable = ;black editlinestate = color1;color0 bookmark = color0;color7 bookmarkfound = color0;color7 diff --git a/misc/skins/modarcon16root.ini b/misc/skins/modarcon16root.ini index 46ed695..49164d6 100644 --- a/misc/skins/modarcon16root.ini +++ b/misc/skins/modarcon16root.ini @@ -146,6 +146,7 @@ editbold = color15;;bold editmarked = color11;color1;bold editwhitespace = color12;color4 + editnonprintable = ;black editlinestate = color1;color0 bookmark = color0;color7 bookmarkfound = color0;color7 diff --git a/misc/skins/modarin256-defbg.ini b/misc/skins/modarin256-defbg.ini index 9ba2e60..d4e84fe 100644 --- a/misc/skins/modarin256-defbg.ini +++ b/misc/skins/modarin256-defbg.ini @@ -146,6 +146,7 @@ editbold = color228;;bold editmarked = color228;color23;bold editwhitespace = color56;color234 + editnonprintable = ;black editlinestate = color66;color235 bookmark = ;color239 bookmarkfound = ;color239;bold diff --git a/misc/skins/modarin256.ini b/misc/skins/modarin256.ini index 0dba217..afdd71c 100644 --- a/misc/skins/modarin256.ini +++ b/misc/skins/modarin256.ini @@ -146,6 +146,7 @@ editbold = color228;;bold editmarked = color228;color23;bold editwhitespace = color56;color234 + editnonprintable = ;black editlinestate = color66;color235 bookmark = ;color239 bookmarkfound = ;color239;bold diff --git a/misc/skins/modarin256root-defbg.ini b/misc/skins/modarin256root-defbg.ini index 2a8fa75..bb0a823 100644 --- a/misc/skins/modarin256root-defbg.ini +++ b/misc/skins/modarin256root-defbg.ini @@ -146,6 +146,7 @@ editbold = color228;;bold editmarked = color228;color88;bold editwhitespace = color56;color234 + editnonprintable = ;black editlinestate = color95;color235 bookmark = ;color239 bookmarkfound = ;color239;bold diff --git a/misc/skins/modarin256root.ini b/misc/skins/modarin256root.ini index 688fea3..dd05c00 100644 --- a/misc/skins/modarin256root.ini +++ b/misc/skins/modarin256root.ini @@ -146,6 +146,7 @@ editbold = color228;;bold editmarked = color228;color88;bold editwhitespace = color56;color234 + editnonprintable = ;black editlinestate = color95;color235 bookmark = ;color239 bookmarkfound = ;color239;bold diff --git a/misc/skins/nicedark.ini b/misc/skins/nicedark.ini index 0b5ee01..3bace63 100644 --- a/misc/skins/nicedark.ini +++ b/misc/skins/nicedark.ini @@ -104,6 +104,7 @@ editbold = brown;blue editmarked = black;cyan editwhitespace = brightblue;blue + editnonprintable = ;black editlinestate = white;cyan bookmark = white;red bookmarkfound = black;green diff --git a/misc/skins/sand256.ini b/misc/skins/sand256.ini index 664ce7a..33c43c7 100644 --- a/misc/skins/sand256.ini +++ b/misc/skins/sand256.ini @@ -161,6 +161,7 @@ editbold = rgb400 editmarked = ;rgb452;italic editwhitespace = rgb400;rgb553 + editnonprintable = ;black editlinestate = ;rgb553 bookmark = ;rgb551 bookmarkfound = ;rgb530 diff --git a/misc/skins/seasons-autumn16M.ini b/misc/skins/seasons-autumn16M.ini index 47abb4c..4a94ccb 100644 --- a/misc/skins/seasons-autumn16M.ini +++ b/misc/skins/seasons-autumn16M.ini @@ -171,6 +171,7 @@ editbold = MarkedFg;;bold editmarked = ;Selected editwhitespace = ;EditorWhitespace + editnonprintable = ;black editlinestate = #000;EditorLineNumber bookmark = #000;EditorBookmark bookmarkfound = #000;EditorFindAll diff --git a/misc/skins/seasons-spring16M.ini b/misc/skins/seasons-spring16M.ini index 855b4e1..c839f81 100644 --- a/misc/skins/seasons-spring16M.ini +++ b/misc/skins/seasons-spring16M.ini @@ -171,6 +171,7 @@ editbold = MarkedFg;;bold editmarked = ;Selected editwhitespace = ;EditorWhitespace + editnonprintable = ;black editlinestate = #000;EditorLineNumber bookmark = #000;EditorBookmark bookmarkfound = #000;EditorFindAll diff --git a/misc/skins/seasons-summer16M.ini b/misc/skins/seasons-summer16M.ini index 7cad34b..3ab0148 100644 --- a/misc/skins/seasons-summer16M.ini +++ b/misc/skins/seasons-summer16M.ini @@ -171,6 +171,7 @@ editbold = MarkedFg;;bold editmarked = ;Selected editwhitespace = ;EditorWhitespace + editnonprintable = ;black editlinestate = #000;EditorLineNumber bookmark = #000;EditorBookmark bookmarkfound = #000;EditorFindAll diff --git a/misc/skins/seasons-winter16M.ini b/misc/skins/seasons-winter16M.ini index 76479bd..cae092f 100644 --- a/misc/skins/seasons-winter16M.ini +++ b/misc/skins/seasons-winter16M.ini @@ -171,6 +171,7 @@ editbold = MarkedFg;;bold editmarked = ;Selected editwhitespace = ;EditorWhitespace + editnonprintable = ;black editlinestate = #000;EditorLineNumber bookmark = #000;EditorBookmark bookmarkfound = #000;EditorFindAll diff --git a/misc/skins/xoria256.ini b/misc/skins/xoria256.ini index cbc9c99..d1e9dd0 100644 --- a/misc/skins/xoria256.ini +++ b/misc/skins/xoria256.ini @@ -147,6 +147,7 @@ editbold = ;;bold editmarked = ;color60 editwhitespace = color236;color234 + editnonprintable = ;black editlinestate = ;color235 bookmark = ;color239; bookmarkfound = ;color239;bold diff --git a/misc/skins/yadt256-defbg.ini b/misc/skins/yadt256-defbg.ini index ea3d7c7..d59b65a 100644 --- a/misc/skins/yadt256-defbg.ini +++ b/misc/skins/yadt256-defbg.ini @@ -113,6 +113,7 @@ editbold = color228;;bold editmarked = color228;blue;bold editwhitespace = color56;color234 + editnonprintable = ;black editlinestate = color66;color235 bookmark = ;color239 bookmarkfound = ;color239;bold diff --git a/misc/skins/yadt256.ini b/misc/skins/yadt256.ini index 194c2b0..2aaf4e5 100644 --- a/misc/skins/yadt256.ini +++ b/misc/skins/yadt256.ini @@ -112,6 +112,7 @@ editbold = color228;;bold editmarked = color228;blue;bold editwhitespace = color56;color234 + editnonprintable = ;black editlinestate = color66;color235 bookmark = ;color239 bookmarkfound = ;color239;bold diff --git a/misc/syntax/Makefile.in b/misc/syntax/Makefile.in index 5d495f5..f063ef2 100644 --- a/misc/syntax/Makefile.in +++ b/misc/syntax/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/misc/syntax/sh.syntax b/misc/syntax/sh.syntax index e89142d..3f4754d 100644 --- a/misc/syntax/sh.syntax +++ b/misc/syntax/sh.syntax @@ -1564,6 +1564,7 @@ wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._ keyword whole lsusb cyan keyword whole lzip cyan keyword whole lziprecover cyan + keyword whole lzop cyan keyword whole lynx cyan keyword whole MAKEDEV cyan keyword whole MAKEFLOPPIES cyan diff --git a/po/POTFILES.in b/po/POTFILES.in index 35c0508..1d17f27 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -75,7 +75,6 @@ src/textconf.c src/usermenu.c src/vfs/cpio/cpio.c src/vfs/extfs/extfs.c -src/vfs/fish/fish.c src/vfs/ftpfs/ftpfs.c src/vfs/sfs/sfs.c src/vfs/sftpfs/config_parser.c @@ -83,6 +82,7 @@ src/vfs/sftpfs/connection.c src/vfs/sftpfs/file.c src/vfs/sftpfs/internal.c src/vfs/sftpfs/sftpfs.c +src/vfs/shell/shell.c src/vfs/tar/tar.c src/vfs/tar/tar-internal.c src/vfs/undelfs/undelfs.c @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Afrikaans (http://app.transifex.com/mc/mc/language/af/)\n" @@ -703,7 +703,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1539,7 +1540,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3900,65 +3901,23 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "" - -msgid "fish: Sending password..." -msgstr "" - -msgid "fish: Sending initial line..." -msgstr "" - -msgid "fish: Handshaking version..." -msgstr "" - -msgid "fish: Getting host info..." -msgstr "" - -#, c-format -msgid "fish: Reading directory %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#, c-format -msgid "%s: done." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "%s: failure" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "" - -msgid "fish: Local read failed, sending zeros" -msgstr "" - -msgid "fish: storing file" -msgstr "" - -msgid "Aborting transfer..." -msgstr "" - -msgid "Error reported after abort." -msgstr "" - -msgid "Aborted transfer would be successful." +msgid "Warning: cannot open %s directory\n" msgstr "" #, c-format @@ -4071,6 +4030,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "" + +#, c-format +msgid "%s: done." +msgstr "" + msgid "ftpfs: storing file" msgstr "" @@ -4204,6 +4171,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "" + +msgid "Error reported after abort." +msgstr "" + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Arabic (http://app.transifex.com/mc/mc/language/ar/)\n" @@ -704,7 +704,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1540,7 +1541,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3917,65 +3918,23 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "" - -msgid "fish: Sending password..." -msgstr "" - -msgid "fish: Sending initial line..." -msgstr "" - -msgid "fish: Handshaking version..." -msgstr "" - -msgid "fish: Getting host info..." -msgstr "" - -#, c-format -msgid "fish: Reading directory %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#, c-format -msgid "%s: done." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "%s: failure" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "" - -msgid "fish: Local read failed, sending zeros" -msgstr "" - -msgid "fish: storing file" -msgstr "" - -msgid "Aborting transfer..." -msgstr "" - -msgid "Error reported after abort." -msgstr "" - -msgid "Aborted transfer would be successful." +msgid "Warning: cannot open %s directory\n" msgstr "" #, c-format @@ -4088,6 +4047,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "" + +#, c-format +msgid "%s: done." +msgstr "" + msgid "ftpfs: storing file" msgstr "" @@ -4221,6 +4188,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "" + +msgid "Error reported after abort." +msgstr "" + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Slava Zanko <slavazanko@gmail.com>, 2011\n" "Language-Team: Azerbaijani (http://app.transifex.com/mc/mc/language/az/)\n" @@ -706,7 +706,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1542,7 +1543,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3933,67 +3934,25 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "balıq: %s dÉ™n qopdum" - -msgid "fish: Waiting for initial line..." -msgstr "balıq: Birinci xÉ™tti gözlÉ™yirÉ™m..." - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "Bağışlayın, indilik parollu tanıtma baÄŸlantıları qura bilmirik." - -#, c-format -msgid "fish: Password is required for %s" +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -msgid "fish: Sending password..." -msgstr "balıq: Parol göndÉ™rilir..." - -msgid "fish: Sending initial line..." -msgstr "balıq: Birinci xÉ™tt göndÉ™rilir..." - -msgid "fish: Handshaking version..." -msgstr "balıq: Æl sıxışmalı yol..." - -msgid "fish: Getting host info..." +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: Reading directory %s..." -msgstr "balıq: %s QovluÄŸu oxunur..." - -#, c-format -msgid "%s: done." -msgstr "%s : oldu." - -#, c-format -msgid "%s: failure" -msgstr "%s : xÉ™ta" - -#, c-format -msgid "fish: store %s: sending command..." -msgstr "balıq: %s göndÉ™r: göndÉ™rmÉ™ É™mri..." - -msgid "fish: Local read failed, sending zeros" -msgstr "balıq: Yerli oxuma bacarılmadı, sıfır göndÉ™rilir" - -msgid "fish: storing file" +msgid "Warning: cannot open %s directory\n" msgstr "" -msgid "Aborting transfer..." -msgstr "Daşıma ləğv edilÉ™r..." - -msgid "Error reported after abort." -msgstr "XÉ™ta ləğv etmÉ™dÉ™n sonra bildirildi." - -msgid "Aborted transfer would be successful." -msgstr "Ləğv edilmiÅŸ daşıma É™mÉ™liyyatı müvÉ™ffÉ™qiyyÉ™tli olmuÅŸ olmaılıdır." - #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs : %s ilÉ™ baÄŸlantı kÉ™silir" @@ -4104,6 +4063,14 @@ msgstr "(chdir first)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs : müvÉ™ffÉ™qiyyÉ™tsizlık ..; geriyÉ™ dönülÉ™cÉ™k nöqtÉ™ yoxdur" +#, c-format +msgid "%s: failure" +msgstr "%s : xÉ™ta" + +#, c-format +msgid "%s: done." +msgstr "%s : oldu." + msgid "ftpfs: storing file" msgstr "" @@ -4241,6 +4208,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "Bağışlayın, indilik parollu tanıtma baÄŸlantıları qura bilmirik." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "Daşıma ləğv edilÉ™r..." + +msgid "Error reported after abort." +msgstr "XÉ™ta ləğv etmÉ™dÉ™n sonra bildirildi." + +msgid "Aborted transfer would be successful." +msgstr "Ləğv edilmiÅŸ daşıma É™mÉ™liyyatı müvÉ™ffÉ™qiyyÉ™tli olmuÅŸ olmaılıdır." + msgid "Inconsistent tar archive" msgstr "Tar arxivi düzgün deyildir" @@ -6,7 +6,8 @@ # Pavel Suravezhkin, 2022 # debconf <prach.by@gmail.com>, 2023 # Slava Zanko <slavazanko@gmail.com>, 2011 -# ViaÄasÅ‚aÅ Chalikin, 2023 +# ViaÄasÅ‚aÅ Chalikin <viachaslavic@outlook.com>, 2023 +# ViaÄasÅ‚aÅ Chalikin <viachaslavic@outlook.com>, 2023-2024 # Viktar Palstsiuk <vipals@gmail.com>, 2015 # Yury V. Zaytsev <yury@shurup.com>, 2019 # Źmicier Turok <nashtlumach@gmail.com>, 2018 @@ -16,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" -"Last-Translator: debconf <prach.by@gmail.com>, 2023\n" +"Last-Translator: ViaÄasÅ‚aÅ Chalikin <viachaslavic@outlook.com>, 2023-2024\n" "Language-Team: Belarusian (http://app.transifex.com/mc/mc/language/be/)\n" "Language: be\n" "MIME-Version: 1.0\n" @@ -40,13 +41,13 @@ msgid "Cannot translate from %s to %s" msgstr "Ðемагчыма пераўтварыць з %s у %s" msgid "Event system already initialized" -msgstr "СіÑÑ‚Ñма падзей ужо запушчанаÑ" +msgstr "СіÑÑ‚Ñма падзей ужо ініцыÑлізаванаÑ" msgid "Failed to initialize event system" -msgstr "Ðе атрымалаÑÑ Ð·Ð°Ð¿ÑƒÑціць ÑÑ–ÑÑ‚Ñму падзей" +msgstr "Ðе атрымалаÑÑ Ñ–Ð½Ñ–Ñ†Ñ‹Ñлізаваць ÑÑ–ÑÑ‚Ñму падзей" msgid "Event system not initialized" -msgstr "СіÑÑ‚Ñма падзей не запушчанаÑ" +msgstr "СіÑÑ‚Ñма падзей не ініцыÑлізаванаÑ" msgid "Check input data! Some of parameters are NULL!" msgstr "Спраўдзіце ўведзенае! ПÑÑžÐ½Ñ‹Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ñ€Ð¾ÑžÐ½Ñ‹Ñ Â«NULL»!" @@ -67,7 +68,7 @@ msgid "" msgstr "" "Файл «%s» ужо Ñ€Ñдагуецца.\n" "КарыÑтальнік: %s\n" -"Ðумар працÑÑу: %d" +"ID працÑÑу: %d" msgid "File locked" msgstr "Файл заблакаваны" @@ -83,7 +84,7 @@ msgid "Cannot create %s directory" msgstr "Ðельга Ñтварыць каталог «%s»" msgid "FATAL: not a directory:" -msgstr "ХІБÐ: не з’ÑўлÑецца каталогам:" +msgstr "ЗГУБÐÐ: не з’ÑўлÑецца каталогам:" msgid "" "Number out of range (should be in byte range, 0 <= n <= 0xFF, expressed in " @@ -696,7 +697,7 @@ msgid "Tries to use an old highlight mouse tracking" msgstr "Спрабаваць Ñачыць за мышшу Ñтарым ÑпоÑабам" msgid "Disable mouse support in text version" -msgstr "Ðе падтрымліваць мыш у Ñ‚ÑкÑтавай верÑÑ–Ñ–" +msgstr "Ðдключыць падтрымку мышы Ñž Ñ‚ÑкÑтавай вÑÑ€ÑÑ–Ñ–" msgid "Tries to use termcap instead of terminfo" msgstr "Спрабаваць ужываць «termcap» замеÑÑ‚ «terminfo»" @@ -746,31 +747,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors KEYWORD={FORE},{BACK},{ATTR}:KEYWORD2=...\n" -"\n" -"{FORE}, {BACK} Ñ– {ATTR} могуць быць апушчаныÑ, будзе выкарыÑтоўвацца " -"прадвызначанае значÑнне \n" -"\n" -" ÐšÐ»ÑŽÑ‡Ð°Ð²Ñ‹Ñ Ñловы:\n" -" ГлабальныÑ: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -" Паказ файлаў: normal, selected, marked, markselect\n" -" ДыÑÐ»Ð¾Ð³Ð°Ð²Ñ‹Ñ Ð²Ð¾ÐºÐ½Ñ‹: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" -" errdhotfocus\n" -" Меню: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" Ð’Ñ‹Ð¿Ð»Ñ‹ÑžÐ½Ñ‹Ñ Ð¼ÐµÐ½ÑŽ: pmenunormal, pmenusel, pmenutitle\n" -" Ð Ñдактар: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -" ПраглÑд: viewnormal,viewbold, viewunderline, viewselected\n" -" Даведка: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1228,23 +1211,23 @@ msgid "Sort" msgstr "Упарадкаваць" msgid "Cannot execute sort command" -msgstr "Ðемагчыма выканаць загад «упарадкаваць»" +msgstr "Ðемагчыма выканаць каманду sort" #, c-format msgid "Sort returned non-zero: %s" msgstr "Парадкаванне вÑрнула ненулÑвы код: %s" msgid "Paste output of external command" -msgstr "УÑтавіць вывад вонкавага загада" +msgstr "УÑтавіць вывад знешнÑй каманды" msgid "Enter shell command(s):" -msgstr "УвÑдзіце загад(Ñ‹) абалонкі:" +msgstr "УвÑдзіце каманду(Ñ‹) абалонкі:" msgid "External command" -msgstr "Вонкавы загад" +msgstr "ЗнешнÑÑ ÐºÐ°Ð¼Ð°Ð½Ð´Ð°" msgid "Cannot execute command" -msgstr "Ðемагчыма выканаць загад" +msgstr "Ðемагчыма выканаць каманду" msgid "mail -s <subject> -c <cc> <to>" msgstr "mail -s <Ñ‚Ñма> -c <копіі> <каму>" @@ -1299,7 +1282,7 @@ msgid "Macro not deleted" msgstr "ÐœÐ°ÐºÑ€Ð°Ñ Ð½Ðµ выдалілі" msgid "Repeat last commands" -msgstr "Паўтарыць Ð°Ð¿Ð¾ÑˆÐ½Ñ–Ñ Ð·Ð°Ð³Ð°Ð´Ñ‹" +msgstr "Паўтарыць Ð°Ð¿Ð¾ÑˆÐ½Ñ–Ñ ÐºÐ°Ð¼Ð°Ð½Ð´Ñ‹" msgid "Repeat times:" msgstr "КолькаÑць разоў:" @@ -1515,7 +1498,7 @@ msgid "&Search" msgstr "Шукаць(&S)" msgid "&Command" -msgstr "Загад(&C)" +msgstr "Каманда(&C)" msgid "For&mat" msgstr "Фарматаванне(&M)" @@ -1638,8 +1621,8 @@ msgstr "" "Зручны Ñ‚ÑкÑтавы Ñ€Ñдактар,\n" "напіÑаны Ð´Ð»Ñ Midnight Commander." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" -msgstr "ÐўтарÑÐºÑ–Ñ Ð¿Ñ€Ð°Ð²Ñ‹ (C) 1996-2023 Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" +msgstr "ÐўтарÑкае права © 1996-2024 the Free Software Foundation" msgid "About" msgstr "Пра праграму" @@ -1791,14 +1774,14 @@ msgstr "" "MC не можа перайÑці Ñž каталог, Ñкі патрабуе\n" "ÑžÐ±ÑƒÐ´Ð°Ð²Ð°Ð½Ð°Ñ Ð°Ð±Ð°Ð»Ð¾Ð½ÐºÐ°. Можа, вы\n" "выдалілі працоўны каталог або далі Ñабе дадатковыÑ\n" -"прывілеі загадам su?" +"прывілеі камандай su?" #, c-format msgid "Cannot fetch a local copy of %s" msgstr "Ðемагчыма атрымаць лакальную копію «%s»" msgid "The shell is already running a command" -msgstr "Ðбалонка ўжо выконвае загад" +msgstr "Ðбалонка ўжо выконвае каманду" msgid "" "Not an xterm or Linux console;\n" @@ -1836,7 +1819,7 @@ msgid "Permissions (octal): %o" msgstr "Дазволы (ваÑьмерычныÑ): %o" msgid "Chown advanced command" -msgstr "Пашыраны загад «chown»" +msgstr "ÐŸÐ°ÑˆÑ‹Ñ€Ð°Ð½Ð°Ñ ÐºÐ°Ð¼Ð°Ð½Ð´Ð° «chown»" #, c-format msgid "" @@ -1960,7 +1943,7 @@ msgid "Skin:" msgstr "Ðбалонка:" msgid "&Shadows" -msgstr "" +msgstr "Цені(&S)" msgid "Appearance" msgstr "ВыглÑд" @@ -2178,6 +2161,9 @@ msgid "" "%s\n" "%s" msgstr "" +"Ðемагчыма перайÑці Ñž каталог\n" +"%s\n" +"%s" msgid "Secure deletion" msgstr "Ðадзейнае выдаленне" @@ -2331,7 +2317,7 @@ msgid "Group name:" msgstr "Ðазва групы:" msgid "Chmod command" -msgstr "Загад «chmod»" +msgstr "Каманда «chmod»" msgid "Permission" msgstr "Дазвол" @@ -2358,7 +2344,7 @@ msgid "Size" msgstr "Памер" msgid "Chown command" -msgstr "Загад «chown»" +msgstr "Каманда «chown»" msgid "User name" msgstr "Ð†Ð¼Ñ ÐºÐ°Ñ€Ñ‹Ñтальніка" @@ -2400,7 +2386,7 @@ msgid "Filtered view" msgstr "ПраглÑд вываду загада" msgid "Filter command and arguments:" -msgstr "Загад Ñ– аргументы:" +msgstr "Каманда фільтра ды Ñго аргументы:" msgid "Edit file" msgstr "Ð Ñдагаваць файл" @@ -2445,8 +2431,8 @@ msgid "" "Both panels should be in the listing mode\n" "to use this command" msgstr "" -"Каб выканаць загад, патрÑбна, каб абедзве панÑлі\n" -"адлюÑтроўваліÑÑ ÑпіÑамі" +"Ðбедзве панÑлі муÑÑць адлюÑтроўвацца ÑпіÑамі,\n" +"каб выканаць гÑтую каманду" #, c-format msgid "'%s' is not a symbolic link" @@ -2501,7 +2487,7 @@ msgid "Unable to save setup to %s" msgstr "Ðемагчыма захаваць налады Ñž «%s»" msgid "Cannot execute commands on non-local filesystems" -msgstr "Ðа нелакальных файлавых ÑÑ–ÑÑ‚Ñмах нельга выконваць загады" +msgstr "Ðа нелакальных файлавых ÑÑ–ÑÑ‚Ñмах нельга выконваць каманды" msgid "Parameter" msgstr "Параметр" @@ -2511,7 +2497,7 @@ msgid "" "Cannot create temporary command file\n" "%s" msgstr "" -"Ðемагчыма Ñтварыць чаÑовы загадны файл\n" +"Ðемагчыма Ñтварыць чаÑовы камандны файл\n" "%s" msgid "Pipe failed" @@ -2857,7 +2843,7 @@ msgid "&Keep" msgstr "Захаваць(&K)" msgid "&Continue copy" -msgstr "" +msgstr "ПрацÑгнуць капіÑванне(&C)" #, c-format msgid "" @@ -3180,7 +3166,7 @@ msgid "Show directory s&izes" msgstr "Памеры каталогаў(&I)" msgid "Command &history" -msgstr "ГіÑÑ‚Ð¾Ñ€Ñ‹Ñ Ð·Ð°Ð³Ð°Ð´Ð°Ñž(&H)" +msgstr "ГіÑÑ‚Ð¾Ñ€Ñ‹Ñ ÐºÐ°Ð¼Ð°Ð½Ð´(&H)" msgid "Viewed/edited files hi&story" msgstr "ГіÑÑ‚Ð¾Ñ€Ñ‹Ñ Ð¿Ñ€Ð°Ð³Ð»ÐµÐ´Ð¶Ð°Ð½Ñ‹Ñ… / Ñ€Ñдагаваных файлаў" @@ -3550,7 +3536,7 @@ msgid "&Menubar visible" msgstr "ÐдлюÑтроўваць меню(&M)" msgid "Command &prompt" -msgstr "Загадны радок(&P)" +msgstr "Камандны радок(&P)" msgid "&Keybar visible" msgstr "Радок клавіш(&K)" @@ -3738,16 +3724,16 @@ msgid "External panelize" msgstr "Загад на вонкавую панÑль" msgid "Other command" -msgstr "Іншы загад" +msgstr "Ð†Ð½ÑˆÐ°Ñ ÐºÐ°Ð¼Ð°Ð½Ð´Ð°" msgid "Command" -msgstr "Загад" +msgstr "Каманда" msgid "Add to external panelize" msgstr "Дадаць да загадаў" msgid "Enter command label:" -msgstr "УвÑдзіце назву загада:" +msgstr "УвÑдзіце назву каманды:" #, c-format msgid "" @@ -4181,80 +4167,44 @@ msgstr "" "Ð’Ñ–Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð°Ñ Ñ„Ð°Ð¹Ð»Ð°Ð²Ð°Ñ ÑÑ–ÑÑ‚Ñма EXTFS:\n" "%s" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Увага: немагчыма адкрыць каталог «%s»\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: адлучаемÑÑ Ð°Ð´ «%s»" - -msgid "fish: Waiting for initial line..." -msgstr "fish: чакаецца пачатковы радок..." - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "Пакуль немагчыма злучыцца Ñ– ўвеÑці пароль." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: «%s» патрабуе пароль" - -msgid "fish: Sending password..." -msgstr "fish: адпраўлÑецца пароль..." - -msgid "fish: Sending initial line..." -msgstr "fish: адпраўлÑецца пачатковы радок..." - -msgid "fish: Handshaking version..." -msgstr "fish: пацвÑрджаецца верÑÑ–Ñ..." - -msgid "fish: Getting host info..." -msgstr "fish: атрымліваюцца звеÑткі пра вузел..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: чытаецца каталог «%s»..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" +msgstr "" +"Ð’Ñ–Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð°Ñ Ñ„Ð°Ð¹Ð»Ð°Ð²Ð°Ñ ÑÑ–ÑÑ‚Ñма EXTFS:\n" +"Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ¾Ð²Ð°Ñ Ð½Ð°Ð·Ð²Ð° файла" -#, c-format -msgid "%s: done." -msgstr "%s: завершана." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" +"Ð’Ñ–Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð°Ñ Ñ„Ð°Ð¹Ð»Ð°Ð²Ð°Ñ ÑÑ–ÑÑ‚Ñма EXTFS:\n" +"Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ¾Ð²Ð°Ñ Ð½Ð°Ð·Ð²Ð° архіва" -#, c-format -msgid "%s: failure" -msgstr "%s: не атрымалаÑÑ" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" +"Ð’Ñ–Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð°Ñ Ñ„Ð°Ð¹Ð»Ð°Ð²Ð°Ñ ÑÑ–ÑÑ‚Ñма EXTFS:\n" +"немагчыма Ñтварыць каманду" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: захаваць «%s»: адпраўлÑецца загад..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: не атрымалаÑÑ Ð¿Ñ€Ð°Ñ‡Ñ‹Ñ‚Ð°Ñ†ÑŒ лакальнае, адпраўлÑюцца нулі" - -msgid "fish: storing file" -msgstr "fish: захоўваецца файл" - -msgid "Aborting transfer..." -msgstr "Перадача ÑкаÑоўваецца..." - -msgid "Error reported after abort." -msgstr "ПаÑÐ»Ñ ÑкаÑÐ°Ð²Ð°Ð½Ð½Ñ Ð²Ñ‹Ñўлена памылка." - -msgid "Aborted transfer would be successful." -msgstr "Перадача ÑкаÑаванаÑ." +msgid "Warning: cannot open %s directory\n" +msgstr "Увага: немагчыма адкрыць каталог «%s»\n" #, c-format msgid "ftpfs: Disconnecting from %s" -msgstr "ftpfs: адлучаемÑÑ Ð°Ð´ «%s»" +msgstr "ftpfs: адлучÑнне ад «%s»" #, c-format msgid "FTP: Password required for %s" msgstr "FTP: «%s» патрабуе пароль" msgid "ftpfs: sending login name" -msgstr "ftpfs: адпраўлÑецца Ñ–Ð¼Ñ ÐºÐ°Ñ€Ñ‹Ñтальніка" +msgstr "ftpfs: адпраўка Ñ–Ð¼Ñ ÐºÐ°Ñ€Ñ‹Ñтальніка" msgid "ftpfs: sending user password" -msgstr "ftpfs: адпраўлÑецца пароль карыÑтальніка" +msgstr "ftpfs: адпраўка Ð¿Ð°Ñ€Ð¾Ð»Ñ ÐºÐ°Ñ€Ñ‹Ñтальніка" #, c-format msgid "FTP: Account required for user %s" @@ -4264,7 +4214,7 @@ msgid "Account:" msgstr "Ðкаўнт:" msgid "ftpfs: sending user account" -msgstr "ftpfs: адпраўлÑецца рахунак карыÑтальніка" +msgstr "ftpfs: адпраўка акаўнта карыÑтальніка" msgid "ftpfs: logged in" msgstr "ftpfs: увайшлі" @@ -4282,10 +4232,10 @@ msgstr "ftpfs: %s" #, c-format msgid "ftpfs: making connection to %s" -msgstr "ftpfs: злучаемÑÑ Ð· «%s»" +msgstr "ftpfs: здзÑйÑненне злучÑÐ½Ð½Ñ Ð· «%s»" msgid "ftpfs: connection interrupted by user" -msgstr "ftpfs: карыÑтальнік кінуў злучацца" +msgstr "ftpfs: злучÑнне перарванае карыÑтальнікам" #, c-format msgid "ftpfs: connection to server failed: %s" @@ -4301,11 +4251,11 @@ msgstr "ftpfs: немагчыма пераўтварць Ð°Ð´Ñ€Ð°Ñ Ñƒ імÑ: % #, c-format msgid "ftpfs: try reconnect to server, attempt %u" -msgstr "ftpfs: Ñпрабую перападключыцца да Ñервера, Ñпроба %u" +msgstr "ftpfs: Ñпрабаванне паўторнага злучÑÐ½Ð½Ñ Ð· Ñерверам, Ñпроба %u" #, c-format msgid "ftpfs: could not get socket name: %s" -msgstr "ftpfs: не магу атрымаць Ñ–Ð¼Ñ Ñокета: %s" +msgstr "ftpfs: не ўдалоÑÑ Ð°Ñ‚Ñ€Ñ‹Ð¼Ð°Ñ†ÑŒ назву Ñокета: %s" msgid "ftpfs: could not reconnect to server" msgstr "ftpfs: не ўдалоÑÑ Ð¿Ð°ÑžÑ‚Ð¾Ñ€Ð½Ð° злучыцца з Ñерверам" @@ -4315,20 +4265,20 @@ msgstr "ftpfs: Ñ…Ñ–Ð±Ð½Ð°Ñ ÑÑÐ¼â€™Ñ Ð°Ð´Ñ€Ð°Ñоў" #, c-format msgid "ftpfs: could not create socket: %s" -msgstr "ftpfs: нельга Ñтварыць Ñокет: %s" +msgstr "ftpfs: не ўдалоÑÑ Ñтварыць Ñокет: %s" msgid "ftpfs: could not setup passive mode" -msgstr "ftpfs: нельга наладзіць паÑіўны Ñ€Ñжым" +msgstr "ftpfs: не ўдалоÑÑ Ð½Ð°Ð»Ð°Ð´Ð·Ñ–Ñ†ÑŒ паÑіўны Ñ€Ñжым" msgid "ftpfs: aborting transfer." -msgstr "ftpfs: перадача ÑкаÑоўваецца." +msgstr "ftpfs: ÑкаÑаванне перадачы." #, c-format msgid "ftpfs: abort error: %s" -msgstr "ftpfs: не атрымалаÑÑ ÑкаÑаваць: %s" +msgstr "ftpfs: памылка ÑкаÑаваннÑ: %s" msgid "ftpfs: abort failed" -msgstr "ftpfs: памылка Ð¿Ð°Ð´Ñ‡Ð°Ñ ÑкаÑаваннÑ" +msgstr "ftpfs: не атрымалаÑÑ ÑкаÑаваць" msgid "ftpfs: CWD failed." msgstr "ftpfs: не атрымалаÑÑ Ð·Ð¼Ñніць бÑгучы працоўны каталог." @@ -4341,7 +4291,7 @@ msgstr "Разбіраецца ÑÑ–Ð¼Ð²Ð°Ð»Ñ–Ñ‡Ð½Ð°Ñ ÑпаÑылка..." #, c-format msgid "ftpfs: Reading FTP directory %s... %s%s" -msgstr "ftpfs: чытаецца FTP-каталог «%s»… %s%s" +msgstr "ftpfs: чытанне каталога FTP %s... %s%s" msgid "(strict rfc959)" msgstr "(абмежаванне RFC959)" @@ -4352,8 +4302,16 @@ msgstr "(Ñпачатку «chdir»)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: памылка; нÑма куды вÑрнуцца Ñž аварыйны Ñтан" +#, c-format +msgid "%s: failure" +msgstr "%s: не атрымалаÑÑ" + +#, c-format +msgid "%s: done." +msgstr "%s: завершана." + msgid "ftpfs: storing file" -msgstr "ftpfs: захоўваецца файл" +msgstr "ftpfs: захоўванне файла" msgid "" "~/.netrc file has incorrect mode\n" @@ -4509,6 +4467,52 @@ msgstr "sftp: чытаецца ÑÐ¿Ñ–Ñ (Ñпыніць — «Ctrl-G»)… %s" msgid "sftp: Listing done." msgstr "sftp: ÑÐ¿Ñ–Ñ Ð¿Ñ€Ð°Ñ‡Ñ‹Ñ‚Ð°Ð½Ñ‹." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "shell: адлучÑнне ад «%s»" + +msgid "shell: Waiting for initial line..." +msgstr "shell: чаканне пачатковага радка..." + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "Пакуль немагчыма злучыцца Ñ– ўвеÑці пароль." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "shell: «%s» патрабуе пароль" + +msgid "shell: Sending password..." +msgstr "shell: адпраўка паролÑ..." + +msgid "shell: Sending initial line..." +msgstr "shell: адпраўка пачатковага радка..." + +msgid "shell: Getting host info..." +msgstr "shell: атрыманне звеÑтак пра вузел..." + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "shell: чытанне каталога «%s»..." + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "shell: захоўванне «%s»: адпраўка каманды..." + +msgid "shell: Local read failed, sending zeros" +msgstr "shell: не атрымалаÑÑ Ð¿Ñ€Ð°Ñ‡Ñ‹Ñ‚Ð°Ñ†ÑŒ лакальна, адпраўлÑюцца нулі" + +msgid "shell: storing file" +msgstr "shell: захоўванне файла" + +msgid "Aborting transfer..." +msgstr "Перадача ÑкаÑоўваецца..." + +msgid "Error reported after abort." +msgstr "ПаÑÐ»Ñ ÑкаÑÐ°Ð²Ð°Ð½Ð½Ñ Ð²Ñ‹Ñўлена памылка." + +msgid "Aborted transfer would be successful." +msgstr "Перадача ÑкаÑаванаÑ." + msgid "Inconsistent tar archive" msgstr "ÐеÑумÑшчальны архіў tar" @@ -4520,7 +4524,7 @@ msgid "" "Cannot open tar archive\n" "%s" msgstr "" -"Ðемагчыма адкрыць tar-архіў\n" +"Ðемагчыма адкрыць архіў tar\n" "%s" #, c-format @@ -4528,9 +4532,11 @@ msgid "" "%s\n" "doesn't look like a tar archive" msgstr "" +"%s\n" +"не падобны на архіў tar" msgid "tar: mc_lseek not stopped at a record boundary" -msgstr "" +msgstr "tar: mc_lseek не ÑпыніўÑÑ Ð½Ð° мÑжы запіÑу" msgid "undelfs: error" msgstr "undelfs: памылка" Binary files differ@@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>, 2022\n" "Language-Team: Bulgarian (http://app.transifex.com/mc/mc/language/bg/)\n" @@ -739,31 +739,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors КЛЮЧОВÐ_ДУМÐ={ЦВЯТ},{ФОÐ},{ÐТРИБУТ}:КЛЮЧОВÐ_ДУМÐ_2=…\n" -"\n" -"Когато пропуÑнете {ЦВЯТ}, {ФОÐ} или {ÐТРИБУТ}, Ñе ползват Ñтандартните\n" -"ÑтойноÑти\n" -"\n" -"Ключови думи:\n" -" Глобални: errors, disabled, reverse, gauge, header,\n" -" input, inputmark, inputunchanged, commandlinemark,\n" -" bbarhotkey, bbarbutton, statusbar\n" -" Файлове: normal, selected, marked, markselect\n" -" Диалогови прозорци: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" -" errdhotfocus\n" -" Менюта: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" ИзÑкачащи менюта: pmenunormal, pmenusel, pmenutitle\n" -" Редактор: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive,\n" -" editframedrag\n" -" Преглед: viewnormal, viewbold, viewunderline, viewselected\n" -" Помощ: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1633,7 +1615,7 @@ msgstr "" "Удобен текÑтови редактор\n" "за Midnight Commander." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -4157,66 +4139,24 @@ msgstr "" "Виртуална ФС по EXTFS:\n" "%s" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Предупреждение: директориÑта %s не може да Ñе отвори \n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: Изключване от %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: Изчаква Ñе начален ред…" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "ЗаÑега връзки Ñ Ð¿Ð°Ñ€Ð¾Ð»Ð° не може да Ñе оÑъщеÑтвÑÑ‚." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: Ðужна е парола за %s" - -msgid "fish: Sending password..." -msgstr "fish: Изпращане на парола…" - -msgid "fish: Sending initial line..." -msgstr "fish: Изпращане на начален ред…" - -msgid "fish: Handshaking version..." -msgstr "fish: Потвърждаване на верÑиÑта…" - -msgid "fish: Getting host info..." -msgstr "fish: Получаване на данни за хоÑта…" - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: Прочитане на директориÑта %s…" +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" +msgstr "" -#, c-format -msgid "%s: done." -msgstr "%s: готово." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" -#, c-format -msgid "%s: failure" -msgstr "%s: неуÑпех" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° %s: изпращане на командата…" - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: ÐеуÑпешно локалнот четене, изпращат Ñе нули" - -msgid "fish: storing file" -msgstr "fish: Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° файл" - -msgid "Aborting transfer..." -msgstr "ОтмÑна на пренаÑÑнето…" - -msgid "Error reported after abort." -msgstr "Грешка Ñлед отмÑната." - -msgid "Aborted transfer would be successful." -msgstr "ПреноÑÑŠÑ‚ е отменен уÑпешно." +msgid "Warning: cannot open %s directory\n" +msgstr "Предупреждение: директориÑта %s не може да Ñе отвори \n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4328,6 +4268,14 @@ msgstr "(първо cd)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: неуÑпех; нÑма мÑÑто за връщане" +#, c-format +msgid "%s: failure" +msgstr "%s: неуÑпех" + +#, c-format +msgid "%s: done." +msgstr "%s: готово." + msgid "ftpfs: storing file" msgstr "ftpfs: ÑъхранÑване на файл" @@ -4485,6 +4433,52 @@ msgstr "sftp: (прекъÑване Ñ Ctrl-G) Извеждане… %s" msgid "sftp: Listing done." msgstr "sftp: Извеждането приключи." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "ЗаÑега връзки Ñ Ð¿Ð°Ñ€Ð¾Ð»Ð° не може да Ñе оÑъщеÑтвÑÑ‚." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "ОтмÑна на пренаÑÑнето…" + +msgid "Error reported after abort." +msgstr "Грешка Ñлед отмÑната." + +msgid "Aborted transfer would be successful." +msgstr "ПреноÑÑŠÑ‚ е отменен уÑпешно." + msgid "Inconsistent tar archive" msgstr "Ñгрешен архив tar" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Irriep Nala Novram <per.morvan.bzh29@gmail.com>, 2017-2018\n" "Language-Team: Breton (http://app.transifex.com/mc/mc/language/br/)\n" @@ -708,7 +708,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1544,7 +1545,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3917,65 +3918,23 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "" - -msgid "fish: Sending password..." -msgstr "" - -msgid "fish: Sending initial line..." -msgstr "" - -msgid "fish: Handshaking version..." -msgstr "" - -msgid "fish: Getting host info..." -msgstr "" - -#, c-format -msgid "fish: Reading directory %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#, c-format -msgid "%s: done." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "%s: failure" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "" - -msgid "fish: Local read failed, sending zeros" -msgstr "" - -msgid "fish: storing file" -msgstr "" - -msgid "Aborting transfer..." -msgstr "" - -msgid "Error reported after abort." -msgstr "" - -msgid "Aborted transfer would be successful." +msgid "Warning: cannot open %s directory\n" msgstr "" #, c-format @@ -4088,6 +4047,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "" + +#, c-format +msgid "%s: done." +msgstr "" + msgid "ftpfs: storing file" msgstr "" @@ -4221,6 +4188,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "" + +msgid "Error reported after abort." +msgstr "" + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "" @@ -3,7 +3,7 @@ # This file is distributed under the same license as the mc package. # # Translators: -# Antoni Bella Pérez <antonibella5@yahoo.com>, 2017-2023 +# Antoni Bella Pérez <antonibella5@yahoo.com>, 2017-2024 # Daniel <danicases@gmail.com>, 2011 # Daniel <danicases@gmail.com>, 2011-2012 # Daniel <danicases@gmail.com>, 2012 @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" -"Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>, 2017-2023\n" +"Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>, 2017-2024\n" "Language-Team: Catalan (http://app.transifex.com/mc/mc/language/ca/)\n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -750,30 +750,34 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors KEYWORD={FORE},{BACK},{ATTR}:KEYWORD2=...\n" +"--colors PARAULA_CLAU={FORE},{BACK},{ATTR}:PARAULA_CLAU_2=...\n" "\n" -"{FORE}, {BACK} i {ATTR} es poden ometre i s'usarà el valor predeterminat\n" +"{FORE}, {BACK} i {ATTR} es pot ometre i s'usarà el valor predeterminat\n" "\n" " Paraules clau:\n" -" Global: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -" Visor fitxer: normal, selected, marked, markselect\n" -" Dià legs: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" -" errdhotfocus\n" -" Menús: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" Menús emerg: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -" Visor: viewnormal,viewbold, viewunderline, viewselected\n" -" Ajuda: helpnormal, helpitalic, helpbold, helplink, helpslink\n" +" Global: errors, disabled, reverse, gauge, header,\n" +" input, inputmark, inputunchanged, commandlinemark,\n" +" bbarhotkey, bbarbutton i statusbar.\n" +" Mostra els fitxers: normal, selected, marked i markselect.\n" +" Dià legs: dnormal, dfocus, dhotnormal, dhotfocus, " +"errdhotnormal\n" +" i errdhotfocus.\n" +" Menús: menunormal, menuhot, menusel, menuhotsel i " +"menuinactive.\n" +" Menús emergents: pmenunormal, pmenusel i pmenutitle.\n" +" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" editnonprintable, editlinestate, editbg, editframe,\n" +" editframeactive i editframedrag.\n" +" Visor: viewnormal,viewbold, viewunderline i viewselected.\n" +" Ajuda: helpnormal, helpitalic, helpbold, helplink i " +"helpslink.\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1644,8 +1648,8 @@ msgstr "" "Un editor de text fà cil d'emprar\n" "escrit per al Midnight Commander." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" -msgstr "Copyright (C) 1996-2023 la «Free Software Foundation»" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" +msgstr "Copyright (C) 1996-2024 la Free Software Foundation" msgid "About" msgstr "Quant a" @@ -2184,6 +2188,9 @@ msgid "" "%s\n" "%s" msgstr "" +"No s'ha pogut canviar el directori a\n" +"%s\n" +"%s" msgid "Secure deletion" msgstr "Supressió segura" @@ -4186,67 +4193,30 @@ msgstr "" "Sistema de fitxers virtual EXTFS:\n" "%s" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "AvÃs: no s'ha pogut obrir el directori %s\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: S'està desconnectant de %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: Està esperant a la lÃnia inicial..." - -msgid "Sorry, we cannot do password authenticated connections for now." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -"Ho sentim, de moment no es poden fer connexions autenticades amb contrasenya." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: Contrasenya requerida per %s" - -msgid "fish: Sending password..." -msgstr "fish: S'està enviant la contrasenya..." - -msgid "fish: Sending initial line..." -msgstr "fish: S'està enviant la lÃnia inicial..." - -msgid "fish: Handshaking version..." -msgstr "fish: S'està intercanviant la versió..." - -msgid "fish: Getting host info..." -msgstr "fish: S'està obtenint informació de l'amfitrió..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: S'està llegint el directori %s..." +"Sistema de fitxers virtual EXTFS:\n" +"nom de fitxer incorrecte" -#, c-format -msgid "%s: done." -msgstr "%s: fet." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" +"Sistema de fitxers virtual EXTFS:\n" +"nom d'arxiu incorrecte" -#, c-format -msgid "%s: failure" -msgstr "%s: fallada" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" +"Sistema de fitxers virtual EXTFS:\n" +"no s'ha pogut crear l'ordre" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: emmagatzema %s: s'està enviant l'ordre..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: Ha fallat la lectura local, s'estan enviant zeros" - -msgid "fish: storing file" -msgstr "fish: s'està emmagatzemant el fitxer" - -msgid "Aborting transfer..." -msgstr "S'està interrompent la transferència..." - -msgid "Error reported after abort." -msgstr "S'ha informat d'un error després d'interrompre." - -msgid "Aborted transfer would be successful." -msgstr "Transferència interrompuda amb èxit." +msgid "Warning: cannot open %s directory\n" +msgstr "AvÃs: no s'ha pogut obrir el directori %s\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4358,6 +4328,14 @@ msgstr "(primer canvia de directori)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "FTPFS: ha fallat; enlloc per a retornar-hi" +#, c-format +msgid "%s: failure" +msgstr "%s: fallada" + +#, c-format +msgid "%s: done." +msgstr "%s: fet." + msgid "ftpfs: storing file" msgstr "FTPFS: s'està emmagatzemant el fitxer" @@ -4520,6 +4498,53 @@ msgstr "sftp: (Ctrl-G per a cancel·lar) s'està llistant... %s" msgid "sftp: Listing done." msgstr "sftp: el llistat s'ha completat." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "intèrpret d'ordres: S'està desconnectant de %s" + +msgid "shell: Waiting for initial line..." +msgstr "intèrpret d'ordres: S'està esperant la lÃnia inicial..." + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" +"Ho sentim, de moment no es poden fer connexions autenticades amb contrasenya." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "intèrpret d'ordres: Es requereix una contrasenya per a %s" + +msgid "shell: Sending password..." +msgstr "intèrpret d'ordres: S'està enviant la contrasenya..." + +msgid "shell: Sending initial line..." +msgstr "intèrpret d'ordres: S'està enviant la lÃnia inicial..." + +msgid "shell: Getting host info..." +msgstr "intèrpret d'ordres: S'està rebent informació de l'amfitrió..." + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "intèrpret d'ordres: S'està llegint el directori %s..." + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "intèrpret d'ordres: emmagatzematge %s: s'està enviant l'ordre..." + +msgid "shell: Local read failed, sending zeros" +msgstr "intèrpret d'ordres: La lectura local ha fallat, s'estan enviant zeros" + +msgid "shell: storing file" +msgstr "intèrpret d'ordres: fitxer d'emmagatzematge" + +msgid "Aborting transfer..." +msgstr "S'està interrompent la transferència..." + +msgid "Error reported after abort." +msgstr "S'ha informat d'un error després d'interrompre." + +msgid "Aborted transfer would be successful." +msgstr "Transferència interrompuda amb èxit." + msgid "Inconsistent tar archive" msgstr "L'arxiu TAR no és coherent" @@ -4539,9 +4564,11 @@ msgid "" "%s\n" "doesn't look like a tar archive" msgstr "" +"%s\n" +"no sembla un arxiu tar" msgid "tar: mc_lseek not stopped at a record boundary" -msgstr "" +msgstr "tar: «mc_lseek» no s'ha aturat en un lÃmit de registre" msgid "undelfs: error" msgstr "undelfs: error" Binary files differ@@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2017-2023\n" "Language-Team: Czech (http://app.transifex.com/mc/mc/language/cs/)\n" @@ -742,30 +742,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors KLICOVESLOVO={FORE},{BACK},{ATTR}:KEYWORD2=...\n" -"\n" -"{FORE}, {BACK} and {ATTR} can be omitted, and the default will be used\n" -"\n" -" KlÃÄová slova:\n" -" GlobálnÃ: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -" Zobrazenà souborů: normal, selected, marked, markselect\n" -" Dialogy: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" -" errdhotfocus\n" -" NabÃdka: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" Vyskakovcà nabÃdka: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -" ProhlÞeÄ: viewnormal,viewbold, viewunderline, viewselected\n" -" NápovÄ›da: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1632,8 +1615,8 @@ msgstr "" "Uživatelsky pÅ™ÃvÄ›tivý textový editor\n" "napsaný pro Midnight Commander." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" -msgstr "Autorská práva © 1996-2023 nadace Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" +msgstr "" msgid "About" msgstr "O programu" @@ -4185,67 +4168,24 @@ msgstr "" "Virtuálnà souborový systém EXTFS:\n" "%s" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "VarovánÃ: složku %s se nedařà otevÅ™Ãt\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: Odpojovánà od %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: ÄŒekánà na úvodnà spojenÃ…" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "Je nám lÃto, ale prozatÃm nelze navazovat heslem se ověřujÃcà spojenÃ." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: Pro %s je vyžadováno heslo" - -msgid "fish: Sending password..." -msgstr "fish: OdesÃlánà hesla…" - -msgid "fish: Sending initial line..." -msgstr "fish: OdesÃlá se úvodnà řádek…" - -msgid "fish: Handshaking version..." -msgstr "fish: Domlouvánà verze…" - -msgid "fish: Getting host info..." -msgstr "fish: ZÃskávánà informacà o hostiteli…" - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: NaÄÃtanà složky %s…" - -#, c-format -msgid "%s: done." -msgstr "%s: hotovo." - -#, c-format -msgid "%s: failure" -msgstr "%s: nezdar" - -#, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: ukládánà %s: odesÃlánà pÅ™Ãkazu…" - -msgid "fish: Local read failed, sending zeros" +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -"fish: NaÄtenà mÃstnÃho souboru se nezdaÅ™ilo, náhradnÄ› se odesÃlajà nuly" - -msgid "fish: storing file" -msgstr "fish: ukládánà souboru" -msgid "Aborting transfer..." -msgstr "PÅ™eruÅ¡enà pÅ™enosu…" +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" -msgid "Error reported after abort." -msgstr "Po pÅ™eruÅ¡enà byla oznámena chyba." +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" -msgid "Aborted transfer would be successful." -msgstr "PÅ™eruÅ¡enà pÅ™enosu probÄ›hlo v pořádku." +#, c-format +msgid "Warning: cannot open %s directory\n" +msgstr "VarovánÃ: složku %s se nedařà otevÅ™Ãt\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4357,6 +4297,14 @@ msgstr "(nejdÅ™Ãve chdir)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: nezdar; nenà jiná možnost" +#, c-format +msgid "%s: failure" +msgstr "%s: nezdar" + +#, c-format +msgid "%s: done." +msgstr "%s: hotovo." + msgid "ftpfs: storing file" msgstr "ftpfs: ukládá se soubor" @@ -4515,6 +4463,52 @@ msgstr "sftp: (pÅ™eruÅ¡enà CTRL+G) vypisovánÃ… %s" msgid "sftp: Listing done." msgstr "sftp: Vypsánà dokonÄeno." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "Je nám lÃto, ale prozatÃm nelze navazovat heslem se ověřujÃcà spojenÃ." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "PÅ™eruÅ¡enà pÅ™enosu…" + +msgid "Error reported after abort." +msgstr "Po pÅ™eruÅ¡enà byla oznámena chyba." + +msgid "Aborted transfer would be successful." +msgstr "PÅ™eruÅ¡enà pÅ™enosu probÄ›hlo v pořádku." + msgid "Inconsistent tar archive" msgstr "Nekonzistentnà archiv .tar" @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Morten Bo Johansen <mortenbo@hotmail.com>, 2018,2023\n" "Language-Team: Danish (http://app.transifex.com/mc/mc/language/da/)\n" @@ -738,30 +738,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors NØGLEORD={FORG},{BAGG},{ATTR}:NØGLEORD2=...\n" -"\n" -"{FORG}, {BAGG} og {ATTR} kan udelades, sÃ¥ bruges standarden\n" -"\n" -" Nøgleord:\n" -" Globale: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -" Filvisning: normal, selected, marked, markselect\n" -" Dialogbokse: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" -" errdhotfocus\n" -" Menuer: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" Pop op-menuer: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -" Fremviser: viewnormal,viewbold, viewunderline, viewselected\n" -" Hjælp: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1629,8 +1612,8 @@ msgstr "" "En brugervenlig teksteditor\n" "skrevet til Midnight Commander." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" -msgstr "Ophavsret (C) 1996-2023, The Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" +msgstr "" msgid "About" msgstr "Om" @@ -4168,66 +4151,24 @@ msgstr "" "Virtuelt EXTFS-filsystem:\n" "%s" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Advarsel: Kan ikke Ã¥bne mappen %s\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fisk: Afkobler fra %s" - -msgid "fish: Waiting for initial line..." -msgstr "fisk: Venter pÃ¥ begyndelseslinje..." - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "Beklager, vi kan ikke lave adgangskodebekræftede forbindelser endnu." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fisk: Adgangskode er krævet for %s" - -msgid "fish: Sending password..." -msgstr "fisk: Sender adgangskode..." - -msgid "fish: Sending initial line..." -msgstr "fisk: Sender begyndelseslinje..." - -msgid "fish: Handshaking version..." -msgstr "fisk: HÃ¥ndrystende version..." - -msgid "fish: Getting host info..." -msgstr "fisk: Indhenter værtsinformation..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fisk: Læser mappe %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" +msgstr "" -#, c-format -msgid "%s: done." -msgstr "%s: færdig." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" -#, c-format -msgid "%s: failure" -msgstr "%s: fejl" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fisk: gem %s: sender kommando..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fisk: Lokal læsning fejlede, sender nuller" - -msgid "fish: storing file" -msgstr "fisk: gemmer fil" - -msgid "Aborting transfer..." -msgstr "Afbryder overførsel..." - -msgid "Error reported after abort." -msgstr "Fejl meldt tilbage efter afbrydelse." - -msgid "Aborted transfer would be successful." -msgstr "Afbrudt overførsel ville være lykkedes." +msgid "Warning: cannot open %s directory\n" +msgstr "Advarsel: Kan ikke Ã¥bne mappen %s\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4339,6 +4280,14 @@ msgstr "(chdir først)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: Fejlede; ingen steder at falde tilbage pÃ¥" +#, c-format +msgid "%s: failure" +msgstr "%s: fejl" + +#, c-format +msgid "%s: done." +msgstr "%s: færdig." + msgid "ftpfs: storing file" msgstr "ftpfs: Gemmer fil" @@ -4495,6 +4444,52 @@ msgstr "sftp: (Ctrl-G break) Liste... %s" msgid "sftp: Listing done." msgstr "sftp: Liste færdig." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "Beklager, vi kan ikke lave adgangskodebekræftede forbindelser endnu." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "Afbryder overførsel..." + +msgid "Error reported after abort." +msgstr "Fejl meldt tilbage efter afbrydelse." + +msgid "Aborted transfer would be successful." +msgstr "Afbrudt overførsel ville være lykkedes." + msgid "Inconsistent tar archive" msgstr "Inkonsistent tar-arkiv" @@ -6,7 +6,7 @@ # Atha Translate, 2016 # Benjamin M. Berwien <alt.ji-f7q3y0v@courriel.fr.nf>, 2023 # cheese <cheese@nosuchhost.net>, 2016 -# Ettore Atalan <atalanttore@googlemail.com>, 2015-2023 +# Ettore Atalan <atalanttore@googlemail.com>, 2015-2024 # Fabian Affolter <fab@fedoraproject.org>, 2012-2013 # Johannes Hellmuth <johannes.hellmuth@gmail.com>, 2020 # Karsten <waldstadt@web.de>, 2016 @@ -21,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" -"Last-Translator: Benjamin M. Berwien <alt.ji-f7q3y0v@courriel.fr.nf>, 2023\n" +"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>, 2015-2024\n" "Language-Team: German (http://app.transifex.com/mc/mc/language/de/)\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -547,7 +547,7 @@ msgstr "" "%s" msgid "Cannot close pipe descriptor (p == NULL)" -msgstr "Kann Pipe Deskriptor nicht schliessen (p == NULL)" +msgstr "Kann Pipe-Deskriptor nicht schließen (p == NULL)" #, c-format msgid "" @@ -754,31 +754,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors KEYWORD={FORE},{BACK},{ATTR}:KEYWORD2=...\n" -"\n" -"{FORE}, {BACK} und {ATTR} kann weggelassen werden und der Standardwert wird " -"verwendet\n" -"\n" -" Schlüsselwörter:\n" -" Global: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -" Datei-Anzeiger: normal, selected, marked, markselect\n" -" Dialogboxen: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" -" errdhotfocus\n" -" Menü: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" Pop-up-Menü: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -" Betrachter: viewnormal, viewbold, viewunderline, viewselected\n" -" Hilfe: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1231,7 +1213,7 @@ msgstr "Sortierung ausführen" msgid "Enter sort options (see sort(1) manpage) separated by whitespace:" msgstr "" -"Gib Sortierungs-Optionen ein (siehe sort(1) manpage), getrennt durch " +"Geben Sie Sortieroptionen ein (siehe sort(1) manpage), getrennt durch " "Leerzeichen:" msgid "Sort" @@ -1648,8 +1630,8 @@ msgstr "" "Ein benutzerfreundlicher Texteditor,\n" "geschrieben für Midnight Commander." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" -msgstr "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" +msgstr "Copyright (C) 1996-2024 the Free Software Foundation" msgid "About" msgstr "Ãœber" @@ -2187,6 +2169,9 @@ msgid "" "%s\n" "%s" msgstr "" +"Kann Verzeichnis nicht wechseln zu\n" +"%s\n" +"%s" msgid "Secure deletion" msgstr "Sicheres Löschen" @@ -4186,76 +4171,36 @@ msgstr "" "Virtuelles Dateisystem EXTFS:\n" "%s" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Warnung: Kann Verzeichnis \"%s\" nicht öffnen\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: Trenne von %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: Warte auf erste Zeile..." - -msgid "Sorry, we cannot do password authenticated connections for now." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -"Entschuldigung, aber wir können momentan noch keine passwortgesicherten\n" -"Verbindungen benutzen." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: Passwort benötigt für %s" - -msgid "fish: Sending password..." -msgstr "fish: Sende Passwort..." - -msgid "fish: Sending initial line..." -msgstr "fish: Sende erste Zeile..." - -msgid "fish: Handshaking version..." -msgstr "fish: Tausche Versionsnummer aus..." - -msgid "fish: Getting host info..." -msgstr "fish: Hole Hostinformation..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: Lese Verzeichnis %s..." +"Virtuelles Dateisystem EXTFS:\n" +"falscher Dateiname" -#, c-format -msgid "%s: done." -msgstr "%s: fertig." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" +"Virtuelles Dateisystem EXTFS:\n" +"falscher Archivname" -#, c-format -msgid "%s: failure" -msgstr "%s: Fehler" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: Speichere %s: Sende Befehl..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: Lokales Lesen fehlgeschlagen, sende Nullen" - -msgid "fish: storing file" -msgstr "fish: Datei speichern" - -msgid "Aborting transfer..." -msgstr "Breche Transfer ab..." - -msgid "Error reported after abort." -msgstr "Fehler nach Abbruch gemeldet." - -msgid "Aborted transfer would be successful." -msgstr "Abgebrochener Transfer wäre erfolgreich." +msgid "Warning: cannot open %s directory\n" +msgstr "Warnung: Kann Verzeichnis \"%s\" nicht öffnen\n" #, c-format msgid "ftpfs: Disconnecting from %s" -msgstr "ftpfs: Trenne von %s" +msgstr "ftpfs: Trennen der Verbindung von %s" #, c-format msgid "FTP: Password required for %s" -msgstr "FTP: Passwort benötigt für %s" +msgstr "FTP: Passwort ist erforderlich für %s" msgid "ftpfs: sending login name" msgstr "ftpfs: Sende Loginnamen" @@ -4304,7 +4249,7 @@ msgstr "Warte bis zum nächsten Versuch... %d (Strg+G zum Abbrechen)" #, c-format msgid "ftpfs: could not make address-to-name translation: %s" -msgstr "ftpfs: Adresse-zu-Name Ãœbersetzung fehlgeschlagen: %s" +msgstr "ftpfs: Adresse-zu-Name-Ãœbersetzung fehlgeschlagen: %s" #, c-format msgid "ftpfs: try reconnect to server, attempt %u" @@ -4312,7 +4257,7 @@ msgstr "ftpfs: versuche nochmals mit Server zu verbinden, Anlauf %u" #, c-format msgid "ftpfs: could not get socket name: %s" -msgstr "ftpfs: konnte Socket-Name nicht auslesen: %s" +msgstr "ftpfs: konnte Socket-Namen nicht auslesen: %s" msgid "ftpfs: could not reconnect to server" msgstr "ftpfs: Verbindung zum Server konnte nicht wiederhergestellt werden" @@ -4359,6 +4304,14 @@ msgstr "(zuerst chdir)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: Fehlgeschlagen; alle Stricke gerissen" +#, c-format +msgid "%s: failure" +msgstr "%s: Fehler" + +#, c-format +msgid "%s: done." +msgstr "%s: fertig." + msgid "ftpfs: storing file" msgstr "ftpfs: Datei speichern" @@ -4412,7 +4365,9 @@ msgid "sftp: %s" msgstr "sftp: %s" msgid "sftp: failed to convert remote host IP address into text form" -msgstr "sftp: Fehler beim Konvertieren der Remote Host IP-Adresse in Textform" +msgstr "" +"sftp: Konvertierung der IP-Adresse des entfernten Hosts in Textform " +"fehlgeschlagen" #, c-format msgid "sftp: making connection to %s" @@ -4426,10 +4381,10 @@ msgid "sftp: connection to server failed: %s" msgstr "sftp: Verbindung zum Server fehlgeschlagen: %s" msgid "sftp: found host key of unsupported type: RSA1" -msgstr "sftp: Host-Key gefunden, aber nicht unterstützter Typ: RSA1" +msgstr "sftp: Hostschlüssel von nicht unterstütztem Typ gefunden: RSA1" msgid "sftp: unknown host key type:" -msgstr "sftp: unbekannter Host-Key Typ:" +msgstr "sftp: unbekannter Hostschlüsseltyp:" #, c-format msgid "" @@ -4442,14 +4397,15 @@ msgstr "" "zur Liste der bekannten Hosts." msgid "sftp: cannot get the remote host key" -msgstr "sftp: bekomme keinen Remote Host-Key " +msgstr "sftp: kann den Schlüssel des entfernten Hosts nicht erhalten" msgid "sftp: unsupported key type, can't check remote host key" msgstr "" -"sftp: nicht unterstützter Key-Typ, kann Remote Host-Key nicht überprüfen" +"sftp: nicht unterstützter Schlüsseltyp, kann den Schlüssel des entfernten " +"Hosts nicht überprüfen" msgid "sftp: can't compute host key fingerprint hash" -msgstr "sftp: kann Host-Key Fingerprint-Hash nicht berechnen" +msgstr "sftp: kann den Fingerprint-Hash des Hostschlüssels nicht berechnen" #, c-format msgid "" @@ -4463,9 +4419,10 @@ msgstr "" "Die Authentizität des Hosts\n" "%s (%s)\n" "kann nicht festgestellt werden!\n" -"%s Host-Key Fingerprint-Hash ist\n" +"%s Schlüssel-Fingerprint-Hash ist\n" "SHA1:%s.\n" -"Willst Du ihn zur Known-Hosts-Liste hinzufügen und weiter verbinden?" +"Möchten Sie ihn in die Liste der bekannten Hosts aufnehmen und die " +"Verbindung fortsetzen?" #, c-format msgid "" @@ -4515,6 +4472,54 @@ msgstr "sftp: Auflisten... %s (Strg+G zum Unterbrechen)" msgid "sftp: Listing done." msgstr "sftp: Auflisten beendet." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "shell: Trennen der Verbindung von %s" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" +"Entschuldigung, aber wir können momentan noch keine passwortgesicherten\n" +"Verbindungen benutzen." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "shell: Passwort ist erforderlich für %s" + +msgid "shell: Sending password..." +msgstr "Shell: Passwort wird gesendet..." + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "Shell: Verzeichnis %s wird gelesen..." + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "shell: Datei speichern" + +msgid "Aborting transfer..." +msgstr "Breche Transfer ab..." + +msgid "Error reported after abort." +msgstr "Fehler nach Abbruch gemeldet." + +msgid "Aborted transfer would be successful." +msgstr "Abgebrochener Transfer wäre erfolgreich." + msgid "Inconsistent tar archive" msgstr "Inkonsistentes tar-Archiv" @@ -4534,9 +4539,11 @@ msgid "" "%s\n" "doesn't look like a tar archive" msgstr "" +"%s\n" +"sieht nicht wie ein tar-Archiv aus" msgid "tar: mc_lseek not stopped at a record boundary" -msgstr "" +msgstr "tar: mc_lseek hält nicht an einer Satzgrenze an" msgid "undelfs: error" msgstr "undelfs: Fehler" diff --git a/po/de_CH.po b/po/de_CH.po index 01fddd0..69c144d 100644 --- a/po/de_CH.po +++ b/po/de_CH.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2015-02-26 09:48+0000\n" "Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>\n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/mc/" @@ -704,7 +704,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1540,7 +1541,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3901,65 +3902,23 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "" - -msgid "fish: Sending password..." -msgstr "" - -msgid "fish: Sending initial line..." -msgstr "" - -msgid "fish: Handshaking version..." -msgstr "" - -msgid "fish: Getting host info..." -msgstr "" - -#, c-format -msgid "fish: Reading directory %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#, c-format -msgid "%s: done." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "%s: failure" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "" - -msgid "fish: Local read failed, sending zeros" -msgstr "" - -msgid "fish: storing file" -msgstr "" - -msgid "Aborting transfer..." -msgstr "" - -msgid "Error reported after abort." -msgstr "" - -msgid "Aborted transfer would be successful." +msgid "Warning: cannot open %s directory\n" msgstr "" #, c-format @@ -4072,6 +4031,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "" + +#, c-format +msgid "%s: done." +msgstr "" + msgid "ftpfs: storing file" msgstr "" @@ -4205,6 +4172,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "" + +msgid "Error reported after abort." +msgstr "" + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>, 2015\n" "Language-Team: Greek (http://app.transifex.com/mc/mc/language/el/)\n" @@ -717,7 +717,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1564,7 +1565,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -4006,67 +4007,24 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Î Ïοειδοποίηση: δεν ήταν δυνατό το άνοιγμα του καταλόγου %s\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: Γίνεται αποσÏνδεση από %s" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -"ΛυποÏμαστε, αλλά Ï€Ïος το παÏόν συνδÎσεις με χÏήση ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î´ÎµÎ½ υποστηÏίζονται." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: Απαιτείται κωδικός Ï€Ïόσβασης για %s" -msgid "fish: Sending password..." -msgstr "fish: Αποστολή ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης..." - -msgid "fish: Sending initial line..." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -msgid "fish: Handshaking version..." +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" -msgid "fish: Getting host info..." -msgstr "fish: Γίνεται λήψη πληÏοφοÏιών υπολογιστή..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: Ανάγνωση φακÎλου %s..." - #, c-format -msgid "%s: done." -msgstr "%s: εντάξει." - -#, c-format -msgid "%s: failure" -msgstr "%s: απÎτυχε" - -#, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: αποθήκευση %s: αποστολή εντολής..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: Η τοπική ανάγνωση απÎτυψε, αποστÎλνονται μηδενικά" - -msgid "fish: storing file" -msgstr "fish: το αÏχείο αποθηκεÏεται" - -msgid "Aborting transfer..." -msgstr "ΑκÏÏωση μεταφοÏάς..." - -msgid "Error reported after abort." -msgstr "ΑναφÎÏθηκε σφάλμα μετά την ακÏÏωση." - -msgid "Aborted transfer would be successful." -msgstr "" +msgid "Warning: cannot open %s directory\n" +msgstr "Î Ïοειδοποίηση: δεν ήταν δυνατό το άνοιγμα του καταλόγου %s\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4178,6 +4136,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "%s: απÎτυχε" + +#, c-format +msgid "%s: done." +msgstr "%s: εντάξει." + msgid "ftpfs: storing file" msgstr "ftpfs: αποθήκευση αÏχείου" @@ -4315,6 +4281,53 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" +"ΛυποÏμαστε, αλλά Ï€Ïος το παÏόν συνδÎσεις με χÏήση ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î´ÎµÎ½ υποστηÏίζονται." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "ΑκÏÏωση μεταφοÏάς..." + +msgid "Error reported after abort." +msgstr "ΑναφÎÏθηκε σφάλμα μετά την ακÏÏωση." + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "ΧαλασμÎνη αÏχειοθήκη tar" diff --git a/po/en_GB.gmo b/po/en_GB.gmo Binary files differindex f9a6d4f..afd4462 100644 --- a/po/en_GB.gmo +++ b/po/en_GB.gmo diff --git a/po/en_GB.po b/po/en_GB.po index 34fa2d6..26de15b 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Andi Chandler <andi@gowling.com>, 2016-2017,2020,2022-2023\n" "Language-Team: English (United Kingdom) (http://app.transifex.com/mc/mc/" @@ -734,30 +734,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors KEYWORD={FORE},{BACK},{ATTR}:KEYWORD2=...\n" -"\n" -"{FORE}, {BACK} and {ATTR} can be omitted, and the default will be used\n" -"\n" -" Keywords:\n" -" Global: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -" File display: normal, selected, marked, markselect\n" -" Dialogue boxes: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" -" errdhotfocus\n" -" Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -" Viewer: viewnormal,viewbold, viewunderline, viewselected\n" -" Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1342,205 +1325,205 @@ msgid "Unmar&k" msgstr "Unmar&k" msgid "Cop&y" -msgstr "" +msgstr "Cop&y" msgid "Mo&ve" -msgstr "" +msgstr "Mo&ve" msgid "&Delete" -msgstr "" +msgstr "&Delete" msgid "Co&py to clipfile" -msgstr "" +msgstr "Co&py to clipfile" msgid "&Cut to clipfile" -msgstr "" +msgstr "&Cut to clipfile" msgid "Pa&ste from clipfile" -msgstr "" +msgstr "Pa&ste from clipfile" msgid "&Beginning" -msgstr "" +msgstr "&Beginning" msgid "&End" -msgstr "" +msgstr "&End" msgid "&Search..." -msgstr "" +msgstr "&Search..." msgid "Search &again" -msgstr "" +msgstr "Search &again" msgid "&Replace..." -msgstr "" +msgstr "&Replace..." msgid "&Toggle bookmark" -msgstr "" +msgstr "&Toggle bookmark" msgid "&Next bookmark" -msgstr "" +msgstr "&Next bookmark" msgid "&Prev bookmark" -msgstr "" +msgstr "&Prev bookmark" msgid "&Flush bookmarks" -msgstr "" +msgstr "&Flush bookmarks" msgid "&Go to line..." -msgstr "" +msgstr "&Go to line..." msgid "&Toggle line state" -msgstr "" +msgstr "&Toggle line state" msgid "Go to matching &bracket" -msgstr "" +msgstr "Go to matching &bracket" msgid "Toggle s&yntax highlighting" -msgstr "" +msgstr "Toggle s&yntax highlighting" msgid "&Find declaration" -msgstr "" +msgstr "&Find declaration" msgid "Back from &declaration" -msgstr "" +msgstr "Back from &declaration" msgid "For&ward to declaration" -msgstr "" +msgstr "For&ward to declaration" msgid "Encod&ing..." -msgstr "" +msgstr "Encod&ing..." msgid "&Refresh screen" -msgstr "" +msgstr "&Refresh screen" msgid "&Start/Stop record macro" -msgstr "" +msgstr "&Start/Stop record macro" msgid "Delete macr&o..." -msgstr "" +msgstr "Delete macr&o..." msgid "Record/Repeat &actions" -msgstr "" +msgstr "Record/Repeat &actions" msgid "S&pell check" -msgstr "" +msgstr "S&pell check" msgid "C&heck word" -msgstr "" +msgstr "C&heck word" msgid "Change spelling &language..." -msgstr "" +msgstr "Change spelling &language..." msgid "&Mail..." -msgstr "" +msgstr "&Mail..." msgid "Insert &literal..." -msgstr "" +msgstr "Insert &literal..." msgid "Insert &date/time" -msgstr "" +msgstr "Insert &date/time" msgid "&Format paragraph" -msgstr "" +msgstr "&Format paragraph" msgid "&Sort..." -msgstr "" +msgstr "&Sort..." msgid "&Paste output of..." -msgstr "" +msgstr "&Paste output of..." msgid "&External formatter" -msgstr "" +msgstr "&External formatter" msgid "&Move" -msgstr "" +msgstr "&Move" msgid "&Resize" -msgstr "" +msgstr "&Resize" msgid "&Toggle fullscreen" -msgstr "" +msgstr "&Toggle fullscreen" msgid "&Next" -msgstr "" +msgstr "&Next" msgid "&Previous" -msgstr "" +msgstr "&Previous" msgid "&List..." -msgstr "" +msgstr "&List..." msgid "&General..." -msgstr "" +msgstr "&General..." msgid "Save &mode..." -msgstr "" +msgstr "Save &mode..." msgid "Learn &keys..." -msgstr "" +msgstr "Learn &keys..." msgid "Syntax &highlighting..." -msgstr "" +msgstr "Syntax &highlighting..." msgid "S&yntax file" -msgstr "" +msgstr "S&yntax file" msgid "&Menu file" -msgstr "" +msgstr "&Menu file" msgid "&Save setup" -msgstr "" +msgstr "&Save setup" msgid "&File" -msgstr "" +msgstr "&File" msgid "&Edit" -msgstr "" +msgstr "&Edit" msgid "&Search" -msgstr "" +msgstr "&Search" msgid "&Command" -msgstr "" +msgstr "&Command" msgid "For&mat" -msgstr "" +msgstr "For&mat" msgid "&Window" -msgstr "" +msgstr "&Window" msgid "&Options" -msgstr "" +msgstr "&Options" msgid "&None" -msgstr "" +msgstr "&None" msgid "&Dynamic paragraphing" -msgstr "" +msgstr "&Dynamic paragraphing" msgid "Type &writer wrap" -msgstr "" +msgstr "Type &writer wrap" msgid "Wrap mode" -msgstr "" +msgstr "Wrap mode" msgid "Tabulation" -msgstr "" +msgstr "Tabulation" msgid "&Fake half tabs" -msgstr "" +msgstr "&Fake half tabs" msgid "&Backspace through tabs" -msgstr "" +msgstr "&Backspace through tabs" msgid "Fill tabs with &spaces" -msgstr "" +msgstr "Fill tabs with &spaces" msgid "Tab spacing:" -msgstr "" +msgstr "Tab spacing:" msgid "Other options" -msgstr "" +msgstr "Other options" msgid "&Return does autoindent" msgstr "" @@ -1622,7 +1605,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3983,65 +3966,23 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "" - -msgid "fish: Sending password..." -msgstr "" - -msgid "fish: Sending initial line..." -msgstr "" - -msgid "fish: Handshaking version..." -msgstr "" - -msgid "fish: Getting host info..." -msgstr "" - -#, c-format -msgid "fish: Reading directory %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#, c-format -msgid "%s: done." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "%s: failure" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "" - -msgid "fish: Local read failed, sending zeros" -msgstr "" - -msgid "fish: storing file" -msgstr "" - -msgid "Aborting transfer..." -msgstr "" - -msgid "Error reported after abort." -msgstr "" - -msgid "Aborted transfer would be successful." +msgid "Warning: cannot open %s directory\n" msgstr "" #, c-format @@ -4154,6 +4095,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "" + +#, c-format +msgid "%s: done." +msgstr "" + msgid "ftpfs: storing file" msgstr "" @@ -4287,6 +4236,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "" + +msgid "Error reported after abort." +msgstr "" + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Yury V. Zaytsev <yury@shurup.com>, 2022\n" "Language-Team: Esperanto (http://app.transifex.com/mc/mc/language/eo/)\n" @@ -735,32 +735,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors Åœlosilvorto={teksto},{fono},{atributo}:Åœlosilvorto2=...\n" -"Se {teksto}, {fono} aÅ {atributo} estas ellasitaj, la aprioraj estas uzotaj\n" -"\n" -" Åœlosilvortoj:\n" -" Tutprograma: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarhotbutton, statusbar\n" -" Dosieradministrado: normal, selected, marked, markselect\n" -" Dialogujo: dnormal, dfocus, dhotnormal, dhotfocus, " -"errdhotnormal,\n" -" errdhotfocus\n" -" Menuoj: menunormal, menuhot, menusel, menuhotsel, " -"menuinactive\n" -" Åœprucmenuoj: pmenunormal, pmenusel, pmenutitle\n" -" Tekstoredaktilo: editnormal, editbold, editmarked, editwhitespace\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -" Tekstolegilo: viewnormal, viewbold, viewunderline, viewselected\n" -" Helpilo: helpnormal, helpitalic, helpbold, helplink, " -"helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1629,8 +1610,8 @@ msgstr "" "Afabla tekstoredaktilo\n" "verkita por Midnight Commander." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" -msgstr "Kopirajto (C) 1996–2023 la Fondaĵo pri Libera Programaro" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" +msgstr "" msgid "About" msgstr "Pri" @@ -2169,6 +2150,9 @@ msgid "" "%s\n" "%s" msgstr "" +"Ne eblas ÅanÄi dosierujon al\n" +"%s\n" +"%s" msgid "Secure deletion" msgstr "Sekura forigo" @@ -4164,66 +4148,30 @@ msgstr "" "Virtuala dosiersistemo EXTFS:\n" "%s" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Averto: ne eblas malfermi dosierujon %s\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: MalkonektiÄanta de %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: Atendanta komencan linion..." - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "BedaÅrinde ni ne povas nun fari pasvortajn atestadajn konektojn." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: Pasvorto estas postulita por %s" - -msgid "fish: Sending password..." -msgstr "fish: Sendanta pasvorton..." - -msgid "fish: Sending initial line..." -msgstr "fish: Sendanta komencan linion..." - -msgid "fish: Handshaking version..." -msgstr "fish: Konsentanta eldonon..." - -msgid "fish: Getting host info..." -msgstr "fish: Akiranta gastiganto-informojn..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: Leganta dosierujon %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" +msgstr "" +"Virtuala dosiersistemo EXTFS:\n" +"malÄusta dosiernomo" -#, c-format -msgid "%s: done." -msgstr "%s: finita." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" +"Virtuala dosiersistemo EXTFS:\n" +"malÄusta arkivnomo" -#, c-format -msgid "%s: failure" -msgstr "%s: malsukceso" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" +"Virtuala dosiersistemo EXTFS:\n" +"ne eblas konstrui komandon" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: teno %s: sendanta komandon..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: Loka legado malsukcesis, sendanta nulojn" - -msgid "fish: storing file" -msgstr "fish: konservanta dosieron" - -msgid "Aborting transfer..." -msgstr "Ĉesiganta transigon..." - -msgid "Error reported after abort." -msgstr "Eraro raportita post ĉesigo." - -msgid "Aborted transfer would be successful." -msgstr "Ĉesigita transigo estus sukcesa." +msgid "Warning: cannot open %s directory\n" +msgstr "Averto: ne eblas malfermi dosierujon %s\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4335,6 +4283,14 @@ msgstr "(ÅanÄi dosierujon unue)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: malsukcesis; neniuj pluaj litoj" +#, c-format +msgid "%s: failure" +msgstr "%s: malsukceso" + +#, c-format +msgid "%s: done." +msgstr "%s: finita." + msgid "ftpfs: storing file" msgstr "ftpfs: konservanta dosieron" @@ -4490,6 +4446,52 @@ msgstr "sftp: (Stir-G rompi) Listo... %s" msgid "sftp: Listing done." msgstr "sftp: Listado finita." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "Åelo: MalkonektiÄanta de %s" + +msgid "shell: Waiting for initial line..." +msgstr "Åelo: Atendanta komencan linion..." + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "BedaÅrinde ni ne povas nun fari pasvortajn atestadajn konektojn." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "Åelo: Pasvorto estas postulita por %s" + +msgid "shell: Sending password..." +msgstr "Åelo: Sendanta pasvorton..." + +msgid "shell: Sending initial line..." +msgstr "Åelo: Sendanta komencan linion..." + +msgid "shell: Getting host info..." +msgstr "Åelo: Akiranta gastiganto-informojn..." + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "Åelo: Leganta dosierujon %s..." + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "Åelo: teno %s: sendanta komandon..." + +msgid "shell: Local read failed, sending zeros" +msgstr "Åelo: Loka legado malsukcesis, sendanta nulojn" + +msgid "shell: storing file" +msgstr "Åelo: konservanta dosieron" + +msgid "Aborting transfer..." +msgstr "Ĉesiganta transigon..." + +msgid "Error reported after abort." +msgstr "Eraro raportita post ĉesigo." + +msgid "Aborted transfer would be successful." +msgstr "Ĉesigita transigo estus sukcesa." + msgid "Inconsistent tar archive" msgstr "Malkonsekvenca tar-dosiero" @@ -4509,9 +4511,11 @@ msgid "" "%s\n" "doesn't look like a tar archive" msgstr "" +"%s\n" +"ne Åajnas esti TAR-arkivo" msgid "tar: mc_lseek not stopped at a record boundary" -msgstr "" +msgstr "tar: mc_lsek ne ĉesigita je rikorda limo" msgid "undelfs: error" msgstr "undelfs: eraro" Binary files differ@@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Slava Zanko <slavazanko@gmail.com>, 2011\n" "Language-Team: Spanish (http://app.transifex.com/mc/mc/language/es/)\n" @@ -740,7 +740,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -762,8 +763,9 @@ msgstr "" " Menús: menunormal, menuhot, menusel, menuhotsel, " "menuinactive\n" " Menús emergentes: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" +" editlinestate, editbg, editframe, editframeactive,\n" " editframedrag\n" " Visor: viewnormal, viewbold, viewunderline, viewselected\n" " Ayuda: helpnormal, helpitalic, helpbold, helplink, helpslink\n" @@ -1635,8 +1637,8 @@ msgstr "" "Un editor de texto amigable\n" "para Midnight Commander." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" -msgstr "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" +msgstr "Copyright (C) 1996-2024 the Free Software Foundation" msgid "About" msgstr "Acerca de..." @@ -3178,7 +3180,7 @@ msgid "E&xternal panelize" msgstr "búsqueda e&Xterna..." msgid "Show directory s&izes" -msgstr "mostrar &Tamaños de los directorios" +msgstr "mostrar &Tamaños de directorios" msgid "Command &history" msgstr "&Historia de órdenes" @@ -3241,7 +3243,7 @@ msgstr "Paneles:" 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?" +msgstr[1] "Hay %zu de pantallas abiertas. ¿Desea realmente salir?" msgstr[2] "Hay %zu pantallas abiertas. ¿Desea realmente salir?" msgid "The Midnight Commander" @@ -3343,7 +3345,7 @@ msgstr "Terminado" msgid "Finished (ignored %zu directory)" msgid_plural "Finished (ignored %zu directories)" msgstr[0] "Terminado (%zu directorio ignorado)" -msgstr[1] "Terminado (%zu directorios ignorados)" +msgstr[1] "Terminado (%zu de directorios ignorados)" msgstr[2] "Terminado (%zu directorios ignorados)" #, c-format @@ -3515,7 +3517,7 @@ msgstr "Tamaño: %s" msgid " (%lu block)" msgid_plural " (%lu blocks)" msgstr[0] " (%lu bloque)" -msgstr[1] " (%lu bloques)" +msgstr[1] " (%lu de bloques)" msgstr[2] " (%lu bloques)" #, c-format @@ -3695,7 +3697,7 @@ msgstr "<readlink falló>" msgid "%s in %d file" msgid_plural "%s in %d files" msgstr[0] "%s en %d archivo" -msgstr[1] "%s en %d archivos" +msgstr[1] "%s en %d de archivos" msgstr[2] "%s en %d archivos" msgid "Panelize" @@ -4178,66 +4180,30 @@ msgstr "" "Sistema de archivos virtual EXTFS:\n" "%s" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Atención: imposible abrir el directorio %s\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: Desconectando de %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: Esperando lÃnea de inicio..." - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "Lo siento, las conexiones con contraseña aún no son posibles." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: Contraseña requerida para %s" - -msgid "fish: Sending password..." -msgstr "fish: Enviando contraseña de usuario" - -msgid "fish: Sending initial line..." -msgstr "fish: Enviando lÃnea de inicio..." - -msgid "fish: Handshaking version..." -msgstr "fish: Negociando versión..." - -msgid "fish: Getting host info..." -msgstr "fish: Obteniendo información del servidor..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: Leyendo el directorio %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" +msgstr "" +"Sistema de archivos virtual EXTFS:\n" +"nombre de archivo incorrecto" -#, c-format -msgid "%s: done." -msgstr "%s: Hecho." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" +"Sistema de archivos virtual EXTFS:\n" +"nombre de archivador incorrecto" -#, c-format -msgid "%s: failure" -msgstr "%s: Fallo." +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" +"Sistema de archivos virtual EXTFS:\n" +"imposible construir comando" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: Guardar %s: enviando comando..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: Fallo de lectura local, enviando ceros" - -msgid "fish: storing file" -msgstr "fish: Guardando archivo" - -msgid "Aborting transfer..." -msgstr "Abortando transferencia." - -msgid "Error reported after abort." -msgstr "Error denunciado tras abortar." - -msgid "Aborted transfer would be successful." -msgstr "Abortada transferencia con éxito." +msgid "Warning: cannot open %s directory\n" +msgstr "Atención: imposible abrir el directorio %s\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4349,6 +4315,14 @@ msgstr "(chdir)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: Falló; no hay dónde replegarse" +#, c-format +msgid "%s: failure" +msgstr "%s: Fallo." + +#, c-format +msgid "%s: done." +msgstr "%s: Hecho." + msgid "ftpfs: storing file" msgstr "ftpfs: Guardando archivo" @@ -4503,6 +4477,52 @@ msgstr "sftp: (Ctrl-G para cancelar) Listando... %s" msgid "sftp: Listing done." msgstr "sftp: Listado completo." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "shell: Desconectando de %s" + +msgid "shell: Waiting for initial line..." +msgstr "shell: Esperando lÃnea de inicio..." + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "Lo siento, las conexiones con contraseña aún no son posibles." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "shell: Contraseña requerida para %s" + +msgid "shell: Sending password..." +msgstr "shell: Enviando contraseña de usuario" + +msgid "shell: Sending initial line..." +msgstr "shell: Enviando lÃnea de inicio..." + +msgid "shell: Getting host info..." +msgstr "shell: Obteniendo información del servidor..." + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "shell: Leyendo el directorio %s..." + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "shell: Guardar %s: enviando comando..." + +msgid "shell: Local read failed, sending zeros" +msgstr "shell: Fallo de lectura local, enviando ceros" + +msgid "shell: storing file" +msgstr "shell: Guardando archivo" + +msgid "Aborting transfer..." +msgstr "Abortando transferencia." + +msgid "Error reported after abort." +msgstr "Error denunciado tras abortar." + +msgid "Aborted transfer would be successful." +msgstr "Abortada transferencia con éxito." + msgid "Inconsistent tar archive" msgstr "Archivo de tipo tar inconsistente" @@ -4,7 +4,7 @@ # # Translators: # Ivar Smolin <okul@linux.ee>, 2021 -# Kristjan Räts <kristjanrats@gmail.com>, 2013-2016,2018-2019 +# Kristjan Räts <kristjanrats@gmail.com>, 2013-2016,2018-2019,2024 # Priit Jõerüüt <transifex@joeruut.com>, 2020-2021,2023 # vaba <vaba@riseup.net>, 2020 # vaba <vaba@riseup.net>, 2020 @@ -12,9 +12,10 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" -"Last-Translator: vaba <vaba@riseup.net>, 2020\n" +"Last-Translator: Kristjan Räts <kristjanrats@gmail.com>, " +"2013-2016,2018-2019,2024\n" "Language-Team: Estonian (http://app.transifex.com/mc/mc/language/et/)\n" "Language: et\n" "MIME-Version: 1.0\n" @@ -480,12 +481,18 @@ msgid "" "\n" "Cannot configure write end of SIGWINCH pipe: %s (%d)\n" msgstr "" +"\n" +"SIGWINCH saatmispoolt ei saa\n" +"konfigureerida: %s (%d)\n" #, c-format msgid "" "\n" "Cannot configure read end of SIGWINCH pipe: %s (%d)\n" msgstr "" +"\n" +"SIGWINCH lugemispoolt ei saa\n" +"konfigureerida: %s (%d)\n" #, c-format msgid "" @@ -531,7 +538,7 @@ msgstr "" "%s" msgid "Cannot close pipe descriptor (p == NULL)" -msgstr "" +msgstr "Toru deskriptor ei saa sulgeda (p == NULL)" #, c-format msgid "" @@ -735,7 +742,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -758,7 +766,7 @@ msgstr "" " Toimeti: editnormal, editbold, editmarked, editwhitespace,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" -" Kuvaja: viewnormal,viewbold, viewunderline, viewselected\n" +" Kuvaja: viewnormal, viewbold, viewunderline, viewselected\n" " Abi: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes @@ -1207,7 +1215,7 @@ msgid "You must first highlight a block of text" msgstr "Esmalt vali tekstiplokk" msgid "Run sort" -msgstr "Räivita sortimine" +msgstr "Käivita sortimine" msgid "Enter sort options (see sort(1) manpage) separated by whitespace:" msgstr "" @@ -1628,8 +1636,8 @@ msgstr "" "Kasutajasõbralik tekstitoimeti, mis\n" "on loodud Midnight Commanderile." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" -msgstr "Autoriõigused (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" +msgstr "Autoriõigused (C) 1996-2024 the Free Software Foundation" msgid "About" msgstr "Programmist" @@ -2034,13 +2042,13 @@ msgstr "" "Lisainfot leiad manuaalist." msgid "&Full file list" -msgstr "&Täielik failide loend" +msgstr "&Täielik faililoend" msgid "&Brief file list:" -msgstr "&Lühike failide loend:" +msgstr "&Lühike faililoend:" msgid "&Long file list" -msgstr "&Pikk failide loend" +msgstr "&Pikk faililoend" msgid "&User defined:" msgstr "&Kasutaja määratud:" @@ -2166,6 +2174,9 @@ msgid "" "%s\n" "%s" msgstr "" +"Nurjus vahetus kataloogiks \n" +"%s \n" +"%s" msgid "Secure deletion" msgstr "Turvaline kustutamine" @@ -2186,7 +2197,7 @@ msgid "Append only" msgstr "Ainult lisa" msgid "No dump" -msgstr "" +msgstr "Tõmmis puudub" msgid "No update atime" msgstr "Jäta atime uuendamata" @@ -2213,7 +2224,7 @@ msgid "Indexed directory" msgstr "Indekseeritud kataloog" msgid "No tail merging" -msgstr "" +msgstr "Keela lõppude mestimine" msgid "Top of directory hierarchies" msgstr "Kataloogihierarhiate tipp" @@ -2222,16 +2233,16 @@ msgid "Inode uses extents" msgstr "Inode kasutab ulatusi" msgid "Huge_file" -msgstr "" +msgstr "suurfail" msgid "No COW" -msgstr "" +msgstr "COW puudub" msgid "Direct access for files" msgstr "Otsene juurdepääs failidele" msgid "Casefolded file" -msgstr "" +msgstr "Tõstutundetustatud fail" msgid "Inode has inline data" msgstr "I-kirjel on põimitud andmeid" @@ -2259,6 +2270,8 @@ msgid "" "Cannot chattr \"%s\"\n" "%s" msgstr "" +"\"%s\" attribuutide muutmine nurjus\n" +"%s" #, c-format msgid "" @@ -2431,8 +2444,8 @@ msgid "" "Both panels should be in the listing mode\n" "to use this command" msgstr "" -"Selle käsu kasutamiseks peaksid mõlemad\n" -"paneelid kuvama failide loendit" +"Selle käsu kasutamiseks peaksid\n" +"mõlemad paneelid kuvama faililoendit" #, c-format msgid "'%s' is not a symbolic link" @@ -3044,7 +3057,7 @@ msgid "Invalid source pattern '%s'" msgstr "Vigane lähtemuster \"%s\"" msgid "File listin&g" -msgstr "F&ailide loend" +msgstr "F&aililoend" msgid "&Quick view" msgstr "&Kiirvaade" @@ -3053,7 +3066,7 @@ msgid "&Info" msgstr "&Info" msgid "&Tree" -msgstr "&Puu" +msgstr "P&uu" msgid "&Listing format..." msgstr "&Loendi vormindus..." @@ -3077,7 +3090,7 @@ msgid "SFTP li&nk..." msgstr "SFTP li&nk..." msgid "Paneli&ze" -msgstr "Pa&neelile" +msgstr "&Paneelile" msgid "&Rescan" msgstr "Ko&rdusskannimine" @@ -3188,7 +3201,7 @@ msgid "&Undelete files (ext2fs only)" msgstr "F&ailide taastamine (ainult ext2fs)" msgid "&Listing format edit" -msgstr "&Loend vorminduse muutmine" +msgstr "Muuda &loendi vormindust" msgid "Edit &extension file" msgstr "Muuda &laiendite faili" @@ -3572,7 +3585,7 @@ msgid "sort|u" msgstr "sort|m" msgid "&Unsorted" -msgstr "Sorti&mata" +msgstr "S&ortimata" #. TRANSLATORS: one single character to represent 'name' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix @@ -4160,66 +4173,30 @@ msgstr "" "EXTFS virtuaalne failisüsteem:\n" "%s" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Hoiatus: kataloogi %s avamine nurjus\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: katkestatakse ühendus serveriga %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: oodatakse serveri vastust..." - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "Vabandust, parooliga autenditud ühendused ei ole hetkel võimalikud." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: Server %s küsib parooli" - -msgid "fish: Sending password..." -msgstr "fish: saadetakse parooli..." - -msgid "fish: Sending initial line..." -msgstr "fish: lähtestamine..." - -msgid "fish: Handshaking version..." -msgstr "fish: Versiooni kokku leppimine..." - -msgid "fish: Getting host info..." -msgstr "fish: Hangitakse hosti infot..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: Loetakse kataloogi %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" +msgstr "" +"EXTFS virtuaalne failisüsteem:\n" +"vale failinimi" -#, c-format -msgid "%s: done." -msgstr "%s: valmis." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" +"EXTFS virtuaalne failisüsteem:\n" +"vale arhiivinimi" -#, c-format -msgid "%s: failure" -msgstr "%s: nurjumine" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" +"EXTFS virtuaalne failisüsteem:\n" +"käsu loomine nurjus" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: salvesta %s: saadetakse käsku..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: kohalik lugemine nurjus, saadetakse nullid" - -msgid "fish: storing file" -msgstr "fish: salvestatakse fail" - -msgid "Aborting transfer..." -msgstr "Saatmine katkestatakse..." - -msgid "Error reported after abort." -msgstr "Pärast katkestamist raporteeriti viga." - -msgid "Aborted transfer would be successful." -msgstr "Katkestatud ülekanne oleks edukas." +msgid "Warning: cannot open %s directory\n" +msgstr "Hoiatus: kataloogi %s avamine nurjus\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4331,6 +4308,14 @@ msgstr "(esmalt chdir)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: nurjumine; täiendavaid alternatiive ei ole" +#, c-format +msgid "%s: failure" +msgstr "%s: nurjumine" + +#, c-format +msgid "%s: done." +msgstr "%s: valmis." + msgid "ftpfs: storing file" msgstr "ftpfs: salvestatakse faili" @@ -4411,7 +4396,7 @@ msgid "" msgstr "" "Püsivalt lisatud\n" "%s (%s)\n" -"teadaolevate hostide loendisse." +"tuntud hostide loendisse." msgid "sftp: cannot get the remote host key" msgstr "sftp: ei saa kaughosti võtit hankida" @@ -4431,13 +4416,12 @@ msgid "" "SHA1:%s.\n" "Do you want to add it to the list of known hosts and continue connecting?" msgstr "" -"Hosti autentsus\n" +"Hosti autentsust ei saa kindlaks teha!\n" "%s (%s)\n" -"ei saa kindlaks teha!\n" "%s võtme sõrmejälje räsi on\n" "SHA1:%s.\n" -"Kas soovite selle teadaolevate hostide loendisse lisada ja ühenduse loomist " -"jätkata?" +"Kas soovite selle lisada tuntud hostide loendisse ja jätkata ühenduse " +"loomist?" #, c-format msgid "" @@ -4450,7 +4434,7 @@ msgstr "" "%s (%s)\n" "on leitud tuntud hostide loendist, kuid\n" "VÕTMED EI SOBI KOKKU! SEE VÕIB OLLA MITM rünnak!\n" -"Kas olete kindel, et soovite selle teadaolevate hostide loendisse lisada ja " +"Kas olete kindel, et soovite selle tuntud hostide loendisse lisada ja " "ühenduse loomist jätkata?" msgid "sftp: host key verification failed" @@ -4487,6 +4471,52 @@ msgstr "sftp: (Ctrl+G katkestab) Loendamine... %s" msgid "sftp: Listing done." msgstr "sftp: Loendamine lõpetatud." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "kest: katkestatakse ühendus serveriga %s" + +msgid "shell: Waiting for initial line..." +msgstr "kest: oodatakse serveri vastust..." + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "Vabandust, parooliga autenditud ühendused ei ole hetkel võimalikud." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "kest: server %s küsib parooli" + +msgid "shell: Sending password..." +msgstr "kest: parooli saatmine..." + +msgid "shell: Sending initial line..." +msgstr "kest: lähtestamine..." + +msgid "shell: Getting host info..." +msgstr "kest: hosti info hankimine..." + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "kest: loetakse kataloogi %s..." + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "kes: salvesta %s: saadetakse käsku..." + +msgid "shell: Local read failed, sending zeros" +msgstr "kest: kohalik lugemine nurjus, saadetakse nullid" + +msgid "shell: storing file" +msgstr "kest: faili salvestamine" + +msgid "Aborting transfer..." +msgstr "Saatmine katkestatakse..." + +msgid "Error reported after abort." +msgstr "Pärast katkestamist raporteeriti viga." + +msgid "Aborted transfer would be successful." +msgstr "Katkestatud ülekanne oleks edukas." + msgid "Inconsistent tar archive" msgstr "Tar arhiiv sisaldab vasturääkivusi" @@ -4506,9 +4536,11 @@ msgid "" "%s\n" "doesn't look like a tar archive" msgstr "" +"%s\n" +"ei meenuta tar arhiivi" msgid "tar: mc_lseek not stopped at a record boundary" -msgstr "" +msgstr "tar: mc_lseek ei peatunud kirje piiril" msgid "undelfs: error" msgstr "undelfs: viga" Binary files differ@@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>, " "2011,2015-2019\n" @@ -730,32 +730,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors GAKOHITZA={AURRE},{ATZE},{EZAUGR}:GAKOHITZA2=...\n" -"\n" -"{AURRE}, {ATZE} eta {EZAUGR} jarri gabe utzi daitezke, eta lehenetsitakoa " -"erabiliko da\n" -"\n" -" Gakohitzak:\n" -" Globala: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -" Fitxategien bistaratzea: normal, selected, marked, markselect\n" -" Elkarrizketa laukiak: dnormal, dfocus, dhotnormal, dhotfocus, " -"errdhotnormal,\n" -" errdhotfocus\n" -" Menuak: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" Menu gainazaleratuak: pmenunormal, pmenusel, pmenutitle\n" -" Editorea: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -" Erakuslea: viewnormal,viewbold, viewunderline, viewselected\n" -" Laguntza: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1622,7 +1603,7 @@ msgstr "" "Testu editore lagunkoi bat\n" "Midnight Commander-rarentzako idatzia." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -4130,67 +4111,24 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Abisua: %s direktorioa ezin ireki\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: %s(e)tik deskonektatzen" - -msgid "fish: Waiting for initial line..." -msgstr "fish: Hasierako lerroaren zain..." - -msgid "Sorry, we cannot do password authenticated connections for now." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -"Barkatu, oraingoz ezin dugu pasahitz bidez autentikatutako konexiorik egin." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: %s(a)rentzako pasahitza behar da" - -msgid "fish: Sending password..." -msgstr "fish: Pasahitza bidaltzen..." - -msgid "fish: Sending initial line..." -msgstr "fish: Hasierako lerroa bidaltzen..." - -msgid "fish: Handshaking version..." -msgstr "fish: bertsioak egiaztatzen (Handshaking)..." - -msgid "fish: Getting host info..." -msgstr "fish: Ostalariaren info eskuratzen..." -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: %s direktorioa irakurtzen..." - -#, c-format -msgid "%s: done." -msgstr "%s: eginda." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" -#, c-format -msgid "%s: failure" -msgstr "%s: hutsegitea" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: %s biltegiratu: komandoa bidaltzen..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: Irakurtze lokalak huts egin du, zeroak bidaltzen" - -msgid "fish: storing file" -msgstr "fish: fitxategia biltegiratzen" - -msgid "Aborting transfer..." -msgstr "Transferentzia galarazten..." - -msgid "Error reported after abort." -msgstr "Akatsaren berri eman da galarazi ondoren." - -msgid "Aborted transfer would be successful." -msgstr "Galarazitako transferentzia arrakastatsua izango zen." +msgid "Warning: cannot open %s directory\n" +msgstr "Abisua: %s direktorioa ezin ireki\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4302,6 +4240,14 @@ msgstr "(aurrena chdir)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: huts egin du; ez dauka nora itzuli" +#, c-format +msgid "%s: failure" +msgstr "%s: hutsegitea" + +#, c-format +msgid "%s: done." +msgstr "%s: eginda." + msgid "ftpfs: storing file" msgstr "ftpfs: fitxategia biltegiratzen" @@ -4441,6 +4387,53 @@ msgstr "sftp: (Ktrl-G eteteko) Zerrendatzen... %s" msgid "sftp: Listing done." msgstr "sftp: Zerrenda osatuta." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" +"Barkatu, oraingoz ezin dugu pasahitz bidez autentikatutako konexiorik egin." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "Transferentzia galarazten..." + +msgid "Error reported after abort." +msgstr "Akatsaren berri eman da galarazi ondoren." + +msgid "Aborted transfer would be successful." +msgstr "Galarazitako transferentzia arrakastatsua izango zen." + msgid "Inconsistent tar archive" msgstr "tar artxibo inkoherentea" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Arya Hadi <arya.hadi97@gmail.com>, 2017\n" "Language-Team: Persian (http://app.transifex.com/mc/mc/language/fa/)\n" @@ -708,7 +708,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1544,7 +1545,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3905,66 +3906,24 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "اخطار: پوشه‌ی %s را نمی‌توان باز کرد\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "" - -msgid "fish: Sending password..." -msgstr "" - -msgid "fish: Sending initial line..." -msgstr "" - -msgid "fish: Handshaking version..." -msgstr "" - -msgid "fish: Getting host info..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#, c-format -msgid "fish: Reading directory %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "%s: done." -msgstr "%s: انجام شد." - -#, c-format -msgid "%s: failure" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "" - -msgid "fish: Local read failed, sending zeros" -msgstr "" - -msgid "fish: storing file" -msgstr "" - -msgid "Aborting transfer..." -msgstr "" - -msgid "Error reported after abort." -msgstr "" - -msgid "Aborted transfer would be successful." -msgstr "" +msgid "Warning: cannot open %s directory\n" +msgstr "اخطار: پوشه‌ی %s را نمی‌توان باز کرد\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4076,6 +4035,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "" + +#, c-format +msgid "%s: done." +msgstr "%s: انجام شد." + msgid "ftpfs: storing file" msgstr "" @@ -4209,6 +4176,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "" + +msgid "Error reported after abort." +msgstr "" + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "" @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Kimmo Kujansuu <mrkujansuu@gmail.com>, 2021\n" "Language-Team: Finnish (http://app.transifex.com/mc/mc/language/fi/)\n" @@ -737,7 +737,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1594,7 +1595,7 @@ msgstr "" "Midnight Commanderille kirjoitettu\n" "käyttäjäystävällinen tekstieditori." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -4007,67 +4008,24 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Varoitus: Kansion %s avaaminen ei onnistu\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: Katkaistaan yhteys kohteesta %s" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -"Sori, mutta emme voi tehdä salasanan authenkaatiota yhteyksille juuri nyt." -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: Salasana pakollinen kohteelle %s" - -msgid "fish: Sending password..." -msgstr "fish: Lähetetään salasana..." - -msgid "fish: Sending initial line..." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -msgid "fish: Handshaking version..." +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" -msgid "fish: Getting host info..." -msgstr "fish: Haetaan palveluntarjoajan tietoja..." - #, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: Luetaan kansiota %s..." - -#, c-format -msgid "%s: done." -msgstr "%s: valmis." - -#, c-format -msgid "%s: failure" -msgstr "%s: nyt tuli jokin moka" - -#, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: Säilytä %s: lähettämällä komento ..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: Paikallisen tiedoston luku epäonnistui, lähetetään nollia" - -msgid "fish: storing file" -msgstr "" - -msgid "Aborting transfer..." -msgstr "Keskeytetään transferrointi..." - -msgid "Error reported after abort." -msgstr "Virhe raportoitu keskeyttämisen jälkeen." - -msgid "Aborted transfer would be successful." -msgstr "Keskeytetty siirto olisi onnistunut." +msgid "Warning: cannot open %s directory\n" +msgstr "Varoitus: Kansion %s avaaminen ei onnistu\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4179,6 +4137,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "%s: nyt tuli jokin moka" + +#, c-format +msgid "%s: done." +msgstr "%s: valmis." + msgid "ftpfs: storing file" msgstr "" @@ -4316,6 +4282,53 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" +"Sori, mutta emme voi tehdä salasanan authenkaatiota yhteyksille juuri nyt." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "Keskeytetään transferrointi..." + +msgid "Error reported after abort." +msgstr "Virhe raportoitu keskeyttämisen jälkeen." + +msgid "Aborted transfer would be successful." +msgstr "Keskeytetty siirto olisi onnistunut." + msgid "Inconsistent tar archive" msgstr "" @@ -12,15 +12,15 @@ # Slava Zanko <slavazanko@gmail.com>, 2011 # 4a14a73d523224463300dea5e0502458_3dab472, 2012 # Towinet, 2017 -# Wallon Wallon, 2022-2023 +# Wallon Wallon, 2022-2024 # Yury V. Zaytsev <yury@shurup.com>, 2016 msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" -"Last-Translator: Wallon Wallon, 2022-2023\n" +"Last-Translator: Wallon Wallon, 2022-2024\n" "Language-Team: French (http://app.transifex.com/mc/mc/language/fr/)\n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -751,29 +751,33 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" "--colors KEYWORD={FORE},{BACK},{ATTR}:KEYWORD2=...\n" -"{FORE}, {BACK} et {ATTR} peuvent être omis, et la valeur par défaut sera " -"utilisée\n" -"Mot clés :\n" -"Global : errors, disabled, reverse, gauge, header\n" -"input, inputmark, inputunchanged, commandlinemark\n" -"bbarhotkey, bbarbutton, statusbar\n" -"Affichage fichier: normal, selected, marked, markselect\n" -"Boîtes de dialogue : dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" -"errdhotfocus\n" -"Menus : menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -"Menus popup : pmenunormal, pmenusel, pmenutitle\n" -"Éditeur : editnormal, editbold, editmarked, editwhitespace,\n" -"editlinestate, editbg, editframe, editframeactive\n" -"editframedrag\n" -"Visionneuse : viewnormal,viewbold, viewunderline, viewselected\n" -"Aide : helpnormal, helpitalic, helpbold, helplink, helpslink\n" +"\n" +"{FORE}, {BACK} et {ATTR} peuvent être omis. La valeur par défaut sera " +"utilisée.\n" +"\n" +" Mots-clés:\n" +" Global: errors, disabled, reverse, gauge, header\n" +" input, inputmark, inputunchanged, commandlinemark\n" +" bbarhotkey, bbarbutton, statusbar\n" +" File display: normal, selected, marked, markselect\n" +" Dialog boxes: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" +" errdhotfocus\n" +" Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" +" Popup menus: pmenunormal, pmenusel, pmenutitle\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" +" editlinestate, editbg, editframe, editframeactive\n" +" editframedrag\n" +" Viewer: viewnormal,viewbold, viewunderline, viewselected\n" +" Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1641,8 +1645,8 @@ msgstr "" "Un éditeur de text facile d’utilisation.\n" "écrit pour Midnight Commander." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" -msgstr "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" +msgstr "Copyright (C) 1996-2024 the Free Software Foundation" msgid "About" msgstr "À propos" @@ -4189,68 +4193,30 @@ msgstr "" "Système de fichiers virtuel EXTFS :\n" "%s" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Avertissement : impossible d’ouvrir le répertoire %s\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish : Déconnexion de %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish : attente de la première ligne..." - -msgid "Sorry, we cannot do password authenticated connections for now." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -"Désolé, nous ne pouvons pas faire de connexion authentifiée par mot de passe " -"pour l’instant." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish : mot de passe requis pour %s" - -msgid "fish: Sending password..." -msgstr "fish : envoi du mot de passe..." - -msgid "fish: Sending initial line..." -msgstr "fish : envoi de la ligne initiale..." +"Système de fichier virtuel EXTFS :\n" +"nom de fichier erroné" -msgid "fish: Handshaking version..." -msgstr "fish : vérification des numéros de version..." - -msgid "fish: Getting host info..." -msgstr "fish : récupère les informations de l’hôte..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish : lecture du répertoire %s..." - -#, c-format -msgid "%s: done." -msgstr "%s : fait." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" +"Système de fichier virtuel EXTFS :\n" +"mauvais nom d’archive" -#, c-format -msgid "%s: failure" -msgstr "%s : échec" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" +"Système de fichier virtuel EXTFS :\n" +"impossible de construire la commande" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish : sauve %s : envoi de la commande..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish : échec de lecture locale, envoie de zéros" - -msgid "fish: storing file" -msgstr "fish: enregistrement du fichier" - -msgid "Aborting transfer..." -msgstr "Abandon du transfert..." - -msgid "Error reported after abort." -msgstr "Erreur rapportée après l’abandon." - -msgid "Aborted transfer would be successful." -msgstr "Le transfert abandonné devrait avoir réussi." +msgid "Warning: cannot open %s directory\n" +msgstr "Avertissement : impossible d’ouvrir le répertoire %s\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4362,6 +4328,14 @@ msgstr "(chdir d’abord)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs : échec ; nulle part où retomber" +#, c-format +msgid "%s: failure" +msgstr "%s : échec" + +#, c-format +msgid "%s: done." +msgstr "%s : fait." + msgid "ftpfs: storing file" msgstr "ftpfs : enregistrement du fichier" @@ -4525,6 +4499,54 @@ msgstr "sftp : (Ctrl-G break) Listing... %s" msgid "sftp: Listing done." msgstr "sftp : listing effectué." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "shell : Déconnexion de %s" + +msgid "shell: Waiting for initial line..." +msgstr "shell : En attente de la ligne initiale..." + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" +"Désolé, nous ne pouvons pas faire de connexion authentifiée par mot de passe " +"pour l’instant." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "shell : Le mot de passe est nécessaire pour %s" + +msgid "shell: Sending password..." +msgstr "shell : Envoi du mot de passe..." + +msgid "shell: Sending initial line..." +msgstr "shell : Envoi de la ligne initiale..." + +msgid "shell: Getting host info..." +msgstr "shell : Obtention d’informations sur l’hôte..." + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "shell : Lecture du répertoire %s..." + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "shell : stocker %s : envoi de la commande..." + +msgid "shell: Local read failed, sending zeros" +msgstr "shell : Échec de la lecture locale, envoi de zéros" + +msgid "shell: storing file" +msgstr "shell : stockage du fichier" + +msgid "Aborting transfer..." +msgstr "Abandon du transfert..." + +msgid "Error reported after abort." +msgstr "Erreur rapportée après l’abandon." + +msgid "Aborted transfer would be successful." +msgstr "Le transfert abandonné devrait avoir réussi." + msgid "Inconsistent tar archive" msgstr "Archive tar incohérente" diff --git a/po/fr_CA.po b/po/fr_CA.po index c701992..c29262f 100644 --- a/po/fr_CA.po +++ b/po/fr_CA.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2015-02-26 09:48+0000\n" "Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/mc/" @@ -704,7 +704,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1540,7 +1541,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3901,65 +3902,23 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "" - -msgid "fish: Sending password..." -msgstr "" - -msgid "fish: Sending initial line..." -msgstr "" - -msgid "fish: Handshaking version..." -msgstr "" - -msgid "fish: Getting host info..." -msgstr "" - -#, c-format -msgid "fish: Reading directory %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#, c-format -msgid "%s: done." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "%s: failure" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "" - -msgid "fish: Local read failed, sending zeros" -msgstr "" - -msgid "fish: storing file" -msgstr "" - -msgid "Aborting transfer..." -msgstr "" - -msgid "Error reported after abort." -msgstr "" - -msgid "Aborted transfer would be successful." +msgid "Warning: cannot open %s directory\n" msgstr "" #, c-format @@ -4072,6 +4031,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "" + +#, c-format +msgid "%s: done." +msgstr "" + msgid "ftpfs: storing file" msgstr "" @@ -4205,6 +4172,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "" + +msgid "Error reported after abort." +msgstr "" + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Irish (http://app.transifex.com/mc/mc/language/ga/)\n" @@ -704,7 +704,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1540,7 +1541,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3913,65 +3914,23 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "" - -msgid "fish: Sending password..." -msgstr "" - -msgid "fish: Sending initial line..." -msgstr "" - -msgid "fish: Handshaking version..." -msgstr "" - -msgid "fish: Getting host info..." -msgstr "" - -#, c-format -msgid "fish: Reading directory %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#, c-format -msgid "%s: done." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "%s: failure" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "" - -msgid "fish: Local read failed, sending zeros" -msgstr "" - -msgid "fish: storing file" -msgstr "" - -msgid "Aborting transfer..." -msgstr "" - -msgid "Error reported after abort." -msgstr "" - -msgid "Aborted transfer would be successful." +msgid "Warning: cannot open %s directory\n" msgstr "" #, c-format @@ -4084,6 +4043,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "" + +#, c-format +msgid "%s: done." +msgstr "" + msgid "ftpfs: storing file" msgstr "" @@ -4217,6 +4184,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "" + +msgid "Error reported after abort." +msgstr "" + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>, " "2012,2014-2015,2019\n" @@ -737,34 +737,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors CONTEXTO={FRENTE},{FONDO},{ATRIBUTOS}:CONTEXTO2=...\n" -"\n" -"{FRENTE}, {FONDO} e {ATRIBUTOS}poden omitirse, empregarase o valor " -"predeterminado\n" -"\n" -" Contextos:\n" -" Globais: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -" Visor de ficheiros: normal, selected, marked, markselect\n" -" Diálogos: dnormal, dfocus, dhotnormal, dhotfocus, " -"errdhotnormal,\n" -" errdhotfocus\n" -" Menús: menunormal, menuhot, menusel, menuhotsel, " -"menuinactive\n" -" Menús emerxentes: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -" Visor: viewnormal,viewbold, viewunderline, viewselected\n" -" Axuda: helpnormal, helpitalic, helpbold, helplink, " -"helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1631,7 +1610,7 @@ msgstr "" "Un editor de texto de uso amigábel\n" "escrito para o Midnight Commander." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -4136,66 +4115,24 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Aviso: non é posÃbel abrir o directorio %s\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: desconectando de %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: esperando liña de inicio..." - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "SÃntoo, as conexións con contrasinal aÃnda non son posÃbeis." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: precisase contrasinal para %s" - -msgid "fish: Sending password..." -msgstr "fish: enviando contrasinal de usuario..." - -msgid "fish: Sending initial line..." -msgstr "fish: enviando liña de inicio..." - -msgid "fish: Handshaking version..." -msgstr "fish: negociando versión..." - -msgid "fish: Getting host info..." -msgstr "fish: obtendo información do servidor..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: lendo o directorio %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" +msgstr "" -#, c-format -msgid "%s: done." -msgstr "%s: feito." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" -#, c-format -msgid "%s: failure" -msgstr "%s: fallo" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: gardar %s: enviando orde..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: fallo local de lectura, enviando ceros" - -msgid "fish: storing file" -msgstr "fish: gardando ficheiro" - -msgid "Aborting transfer..." -msgstr "Interrompendo transferencia..." - -msgid "Error reported after abort." -msgstr "Informouse dun erro despois de interromper." - -msgid "Aborted transfer would be successful." -msgstr "Transferencia interrompida satisfactoriamente." +msgid "Warning: cannot open %s directory\n" +msgstr "Aviso: non é posÃbel abrir o directorio %s\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4307,6 +4244,14 @@ msgstr "(primeiro chdir)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: produciuse un fallo; non hai onde repregarse" +#, c-format +msgid "%s: failure" +msgstr "%s: fallo" + +#, c-format +msgid "%s: done." +msgstr "%s: feito." + msgid "ftpfs: storing file" msgstr "ftpfs: gardando ficheiro" @@ -4446,6 +4391,52 @@ msgstr "sftp: (Ctrl-G interrompe) Listado... %s" msgid "sftp: Listing done." msgstr "sftp: Feito o listado." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "SÃntoo, as conexións con contrasinal aÃnda non son posÃbeis." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "Interrompendo transferencia..." + +msgid "Error reported after abort." +msgstr "Informouse dun erro despois de interromper." + +msgid "Aborted transfer would be successful." +msgstr "Transferencia interrompida satisfactoriamente." + msgid "Inconsistent tar archive" msgstr "Arquivo de tipo tar inconsistente" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Hebrew (http://app.transifex.com/mc/mc/language/he/)\n" @@ -704,7 +704,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1540,7 +1541,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3909,65 +3910,23 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "" - -msgid "fish: Sending password..." -msgstr "" - -msgid "fish: Sending initial line..." -msgstr "" - -msgid "fish: Handshaking version..." -msgstr "" - -msgid "fish: Getting host info..." -msgstr "" - -#, c-format -msgid "fish: Reading directory %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#, c-format -msgid "%s: done." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "%s: failure" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "" - -msgid "fish: Local read failed, sending zeros" -msgstr "" - -msgid "fish: storing file" -msgstr "" - -msgid "Aborting transfer..." -msgstr "" - -msgid "Error reported after abort." -msgstr "" - -msgid "Aborted transfer would be successful." +msgid "Warning: cannot open %s directory\n" msgstr "" #, c-format @@ -4080,6 +4039,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "" + +#, c-format +msgid "%s: done." +msgstr "" + msgid "ftpfs: storing file" msgstr "" @@ -4213,6 +4180,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "" + +msgid "Error reported after abort." +msgstr "" + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Croatian (http://app.transifex.com/mc/mc/language/hr/)\n" @@ -704,7 +704,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1540,7 +1541,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3905,65 +3906,23 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "" - -msgid "fish: Sending password..." -msgstr "" - -msgid "fish: Sending initial line..." -msgstr "" - -msgid "fish: Handshaking version..." -msgstr "" - -msgid "fish: Getting host info..." -msgstr "" - -#, c-format -msgid "fish: Reading directory %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#, c-format -msgid "%s: done." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "%s: failure" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "" - -msgid "fish: Local read failed, sending zeros" -msgstr "" - -msgid "fish: storing file" -msgstr "" - -msgid "Aborting transfer..." -msgstr "" - -msgid "Error reported after abort." -msgstr "" - -msgid "Aborted transfer would be successful." +msgid "Warning: cannot open %s directory\n" msgstr "" #, c-format @@ -4076,6 +4035,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "" + +#, c-format +msgid "%s: done." +msgstr "" + msgid "ftpfs: storing file" msgstr "" @@ -4209,6 +4176,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "" + +msgid "Error reported after abort." +msgstr "" + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "" @@ -3,7 +3,7 @@ # This file is distributed under the same license as the mc package. # # Translators: -# András TÅ‘rös <toros.andras04@gmail.com>, 2020 +# 6bdcf737f9bcb6037ecba892a70fb951_e9eeb40 <b76b5e2faba6aa74d4498ee4c87ab010_661337>, 2020 # Mátyás Demeter <mathias.demeter@gmail.com>, 2014 # RezsÅ‘ Páder <rezso@rezso.net>, 2012-2017,2019 # Slava Zanko <slavazanko@gmail.com>, 2011 @@ -12,9 +12,10 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" -"Last-Translator: András TÅ‘rös <toros.andras04@gmail.com>, 2020\n" +"Last-Translator: 6bdcf737f9bcb6037ecba892a70fb951_e9eeb40 " +"<b76b5e2faba6aa74d4498ee4c87ab010_661337>, 2020\n" "Language-Team: Hungarian (http://app.transifex.com/mc/mc/language/hu/)\n" "Language: hu\n" "MIME-Version: 1.0\n" @@ -722,30 +723,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors KEYWORD={FORE},{BACK},{ATTR}:KEYWORD2=...\n" -"\n" -"{FORE}, {BACK} és {ATTR} elhagyható, akkor az alapértelmezett lesz " -"használva\n" -" Keywords:\n" -" Ãltalános: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -" Fájl megjelenÃtés: normal, selected, marked, markselect\n" -" Dialógus dobozok: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" -" errdhotfocus\n" -" Menük: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" Popup menük: pmenunormal, pmenusel, pmenutitle\n" -" SzerkesztÅ‘: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -" MegjelenÃtÅ‘: viewnormal,viewbold, viewunderline, viewselected\n" -" Súgó: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1612,7 +1596,7 @@ msgstr "" "Felhasználóbarát szövegszerkesztÅ‘\n" "a Midnight Commander-hez készÃtve" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -4112,66 +4096,24 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Figyelem: A(z) %s könyvtár nem megnyitható\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "Fish: lekapcsolódás a kiszolgálóról: %s" - -msgid "fish: Waiting for initial line..." -msgstr "Fish: várakozás kezdÅ‘sorra..." - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "Jelszavas azonosÃtás egyelÅ‘re nem lehetséges." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "Fish: Jelszó kell %s azonosÃtásához" - -msgid "fish: Sending password..." -msgstr "Fish: jelszó küldése..." - -msgid "fish: Sending initial line..." -msgstr "Fish: kezdÅ‘sor küldése..." - -msgid "fish: Handshaking version..." -msgstr "Fish: verzióegyeztetés..." - -msgid "fish: Getting host info..." -msgstr "Fish: Gép info lekérdezés..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "Fish: könyvtár olvasása: %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" +msgstr "" -#, c-format -msgid "%s: done." -msgstr "%s: kész" +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" -#, c-format -msgid "%s: failure" -msgstr "%s: hiba" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "Fish: \"%s\" tárolása: parancs küldése..." - -msgid "fish: Local read failed, sending zeros" -msgstr "Fish: nem sikerült a helyi olvasás; nullák küldése..." - -msgid "fish: storing file" -msgstr "fish: fájl tárolása" - -msgid "Aborting transfer..." -msgstr "Ãtvitel megszakÃtása..." - -msgid "Error reported after abort." -msgstr "MegszakÃtás után hibajelzés érkezett." - -msgid "Aborted transfer would be successful." -msgstr "Ãtvitel megszakÃtva; hibajelzés nem érkezett." +msgid "Warning: cannot open %s directory\n" +msgstr "Figyelem: A(z) %s könyvtár nem megnyitható\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4283,6 +4225,14 @@ msgstr "(elÅ‘ször könyvtárváltás végzendÅ‘)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "Ftpfs: hiba; minden lehetÅ‘ség kimerÃtve" +#, c-format +msgid "%s: failure" +msgstr "%s: hiba" + +#, c-format +msgid "%s: done." +msgstr "%s: kész" + msgid "ftpfs: storing file" msgstr "ftpfs: fájl tárolása" @@ -4422,6 +4372,52 @@ msgstr "sftp: %s listázása... (megszakÃtás: Ctrl-G)" msgid "sftp: Listing done." msgstr "sftp: A listázás kész." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "Jelszavas azonosÃtás egyelÅ‘re nem lehetséges." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "Ãtvitel megszakÃtása..." + +msgid "Error reported after abort." +msgstr "MegszakÃtás után hibajelzés érkezett." + +msgid "Aborted transfer would be successful." +msgstr "Ãtvitel megszakÃtva; hibajelzés nem érkezett." + msgid "Inconsistent tar archive" msgstr "Inkonzisztens tar-archÃvum." @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Martijn Dekker <mcdutchie@hotmail.com>, 2012,2017\n" "Language-Team: Interlingua (http://app.transifex.com/mc/mc/language/ia/)\n" @@ -715,7 +715,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1560,7 +1561,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3933,68 +3934,24 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Attention: impossibile aperir directorio %s\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: Disconnecte de %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: Attende le linea initial..." - -msgid "Sorry, we cannot do password authenticated connections for now." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -"Pro le momento il es impossibile establir connexiones authenticate con " -"contrasigno." -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: Un contrasigno es necessari pro %s" - -msgid "fish: Sending password..." -msgstr "fish: Invia contrasigno..." - -msgid "fish: Sending initial line..." -msgstr "fish: Invia linea initial..." - -msgid "fish: Handshaking version..." -msgstr "fish: Negotia version..." - -msgid "fish: Getting host info..." -msgstr "fish: Obtene info sur host..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: Lege directorio %s..." - -#, c-format -msgid "%s: done." -msgstr "%s: finite." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" -#, c-format -msgid "%s: failure" -msgstr "%s: fallimento" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: immagazina %s: invia commando..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: Lectura local fallite, invia zeros" - -msgid "fish: storing file" -msgstr "fish: immagazina file" - -msgid "Aborting transfer..." -msgstr "Aborta transferentia..." - -msgid "Error reported after abort." -msgstr "Error reportate post abortamento." - -msgid "Aborted transfer would be successful." -msgstr "Le transferentia abortate haberea succedite." +msgid "Warning: cannot open %s directory\n" +msgstr "Attention: impossibile aperir directorio %s\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4106,6 +4063,14 @@ msgstr "(chdir primo)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: fallite; nulle parte a que revenir" +#, c-format +msgid "%s: failure" +msgstr "%s: fallimento" + +#, c-format +msgid "%s: done." +msgstr "%s: finite." + msgid "ftpfs: storing file" msgstr "ftpfs: immagazina file" @@ -4245,6 +4210,54 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" +"Pro le momento il es impossibile establir connexiones authenticate con " +"contrasigno." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "Aborta transferentia..." + +msgid "Error reported after abort." +msgstr "Error reportate post abortamento." + +msgid "Aborted transfer would be successful." +msgstr "Le transferentia abortate haberea succedite." + msgid "Inconsistent tar archive" msgstr "Archivo tar inconsistente" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Ferriandy Chianiago <gpl4all@gmail.com>, 2015\n" "Language-Team: Indonesian (http://app.transifex.com/mc/mc/language/id/)\n" @@ -723,7 +723,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1577,7 +1578,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3938,65 +3939,23 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "" - -msgid "fish: Sending password..." -msgstr "" - -msgid "fish: Sending initial line..." -msgstr "" - -msgid "fish: Handshaking version..." -msgstr "" - -msgid "fish: Getting host info..." -msgstr "" - -#, c-format -msgid "fish: Reading directory %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#, c-format -msgid "%s: done." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "%s: failure" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "" - -msgid "fish: Local read failed, sending zeros" -msgstr "" - -msgid "fish: storing file" -msgstr "" - -msgid "Aborting transfer..." -msgstr "" - -msgid "Error reported after abort." -msgstr "" - -msgid "Aborted transfer would be successful." +msgid "Warning: cannot open %s directory\n" msgstr "" #, c-format @@ -4109,6 +4068,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "" + +#, c-format +msgid "%s: done." +msgstr "" + msgid "ftpfs: storing file" msgstr "" @@ -4242,6 +4209,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "" + +msgid "Error reported after abort." +msgstr "" + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Interlingue (http://app.transifex.com/mc/mc/language/ie/)\n" @@ -703,7 +703,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1539,7 +1540,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3906,65 +3907,23 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: Un contrasigne es besonat por %s" - -msgid "fish: Sending password..." -msgstr "" - -msgid "fish: Sending initial line..." -msgstr "" - -msgid "fish: Handshaking version..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -msgid "fish: Getting host info..." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "fish: Reading directory %s..." +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "%s: done." -msgstr "%s: finit." - -#, c-format -msgid "%s: failure" -msgstr "%s: ne successat" - -#, c-format -msgid "fish: store %s: sending command..." -msgstr "" - -msgid "fish: Local read failed, sending zeros" -msgstr "" - -msgid "fish: storing file" -msgstr "" - -msgid "Aborting transfer..." -msgstr "" - -msgid "Error reported after abort." -msgstr "" - -msgid "Aborted transfer would be successful." +msgid "Warning: cannot open %s directory\n" msgstr "" #, c-format @@ -4077,6 +4036,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "%s: ne successat" + +#, c-format +msgid "%s: done." +msgstr "%s: finit." + msgid "ftpfs: storing file" msgstr "" @@ -4210,6 +4177,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "" + +msgid "Error reported after abort." +msgstr "" + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "" @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Marco Ciampa <ciampix@posteo.net>, 2023\n" "Language-Team: Italian (http://app.transifex.com/mc/mc/language/it/)\n" @@ -741,31 +741,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors PAROLACHIAVE={PRIMOP},{SFONDO},{ATTR}:PAROLACHIAVE2=...\n" -"\n" -"{PRIMOP}, {SFONDO} e {ATTR} si possono omettere, in tal caso mc usa\n" -"valore il predefinito\n" -"\n" -" Parole chiave:\n" -" Globali: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -" Fines. file: normal, selected, marked, markselect\n" -" Fin. dialog.: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" -" errdhotfocus\n" -" Menu: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" Menu scomp.: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -" Visualiz.: viewnormal, viewbold, viewunderline, viewselected\n" -" Aiuto: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1632,8 +1614,8 @@ msgstr "" "Un semplice editor di testi\n" "scritto per il Midnight Commander." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" -msgstr "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" +msgstr "" msgid "About" msgstr "Informazioni" @@ -4159,66 +4141,24 @@ msgstr "" "File system virtuale EXTFS:\n" "%s" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Attenzione: impossibile aprire la directory %s\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: disconnessione da %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: attesa riga iniziale..." - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "Spiacente, non posso fare connessioni autenticate per adesso." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: password richiesta per %s" - -msgid "fish: Sending password..." -msgstr "fish: spedizione password..." - -msgid "fish: Sending initial line..." -msgstr "fish: spedizione riga iniziale..." - -msgid "fish: Handshaking version..." -msgstr "fish: versione handshaking..." - -msgid "fish: Getting host info..." -msgstr "fish: ricezione info host..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: lettura directory FTP %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" +msgstr "" -#, c-format -msgid "%s: done." -msgstr "%s: fatto." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" -#, c-format -msgid "%s: failure" -msgstr "%s: errore" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: memorizza %s: spedizione comando..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: lettura locale fallita, spedizione zeri" - -msgid "fish: storing file" -msgstr "fish: memorizzazione file" - -msgid "Aborting transfer..." -msgstr "Interruzione trasferimento..." - -msgid "Error reported after abort." -msgstr "Errori dopo l'interruzione." - -msgid "Aborted transfer would be successful." -msgstr "L'interruzione trasferimento sarebbe riuscita." +msgid "Warning: cannot open %s directory\n" +msgstr "Attenzione: impossibile aprire la directory %s\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4330,6 +4270,14 @@ msgstr "(antepone chdir)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: fallito; non so dove rileggere" +#, c-format +msgid "%s: failure" +msgstr "%s: errore" + +#, c-format +msgid "%s: done." +msgstr "%s: fatto." + msgid "ftpfs: storing file" msgstr "ftpfs: memorizzazione file" @@ -4485,6 +4433,52 @@ msgstr "sftp: (Ctrl-G break) listato... %s" msgid "sftp: Listing done." msgstr "sftp: listato eseguito." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "Spiacente, non posso fare connessioni autenticate per adesso." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "Interruzione trasferimento..." + +msgid "Error reported after abort." +msgstr "Errori dopo l'interruzione." + +msgid "Aborted transfer would be successful." +msgstr "L'interruzione trasferimento sarebbe riuscita." + msgid "Inconsistent tar archive" msgstr "Archivio tar inconsistente" @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Takuro Onoue <kusanaginoturugi@gmail.com>, 2021\n" "Language-Team: Japanese (http://app.transifex.com/mc/mc/language/ja/)\n" @@ -718,7 +718,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1554,7 +1555,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3942,66 +3943,24 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "è¦å‘Š: ディレクトリ %s を閲覧ã§ãã¾ã›ã‚“\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: %s ã‹ã‚‰åˆ‡æ–ã—ã¦ã„ã¾ã™" - -msgid "fish: Waiting for initial line..." -msgstr "fish: 最åˆã®è¡Œã‚’å¾…ã£ã¦ã„ã¾ã™..." - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "ã™ã„ã¾ã›ã‚“ãŒï¼Œä»Šã®ã¨ã“ã‚パスワードを証明ã™ã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã›ã‚“" - -#, c-format -msgid "fish: Password is required for %s" +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -msgid "fish: Sending password..." -msgstr "fish: パスワードé€ä¿¡ä¸..." - -msgid "fish: Sending initial line..." -msgstr "fish: 最åˆã®è¡Œã‚’é€ä¿¡..." - -msgid "fish: Handshaking version..." -msgstr "fish: ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒãƒ³ãƒ‰ã‚·ã‚§ã‚¤ã‚¯..." - -msgid "fish: Getting host info..." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: ディレクトリ%sã‚’èªã¿è¾¼ã¿ä¸... " - -#, c-format -msgid "%s: done." -msgstr "%s: 完了" - -#, c-format -msgid "%s: failure" -msgstr "%s: 失敗" - -#, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: store %s: コマンドをé€ä¿¡ä¸..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: 局部èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸã€‚zeroã‚’é€ä¿¡ã—ã¾ã™" - -msgid "fish: storing file" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" -msgid "Aborting transfer..." -msgstr "転é€ã‚’ä¸æ–ã—ã¾ã™..." - -msgid "Error reported after abort." -msgstr "ä¸æ–後ã«ã‚¨ãƒ©ãƒ¼ãŒå ±å‘Šã•ã‚Œã¾ã—ãŸ" - -msgid "Aborted transfer would be successful." -msgstr "転é€ä¸æ–ã«æˆåŠŸã—ã¾ã—ãŸ" +#, c-format +msgid "Warning: cannot open %s directory\n" +msgstr "è¦å‘Š: ディレクトリ %s を閲覧ã§ãã¾ã›ã‚“\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4113,6 +4072,14 @@ msgstr "(åˆã‚ã« chdir)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: 失敗ã—ã¾ã—ãŸã€‚フォールãƒãƒƒã‚¯ã§ãã¾ã›ã‚“" +#, c-format +msgid "%s: failure" +msgstr "%s: 失敗" + +#, c-format +msgid "%s: done." +msgstr "%s: 完了" + msgid "ftpfs: storing file" msgstr "" @@ -4250,6 +4217,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "ã™ã„ã¾ã›ã‚“ãŒï¼Œä»Šã®ã¨ã“ã‚パスワードを証明ã™ã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã›ã‚“" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "転é€ã‚’ä¸æ–ã—ã¾ã™..." + +msgid "Error reported after abort." +msgstr "ä¸æ–後ã«ã‚¨ãƒ©ãƒ¼ãŒå ±å‘Šã•ã‚Œã¾ã—ãŸ" + +msgid "Aborted transfer would be successful." +msgstr "転é€ä¸æ–ã«æˆåŠŸã—ã¾ã—ãŸ" + msgid "Inconsistent tar archive" msgstr "tar アーカイブã«ä¸æ•´åˆ" @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>, 2022\n" "Language-Team: Georgian (http://app.transifex.com/mc/mc/language/ka/)\n" @@ -711,31 +711,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors KEYWORD={FORE},{BACK},{ATTR}:KEYWORD2=...\n" -"\n" -"{FORE}, {BACK} დრ{ATTR} შეგიძლიáƒáƒ— გáƒáƒ›áƒáƒ¢áƒáƒ•áƒáƒ—.გáƒáƒ›áƒáƒ§áƒ”ნებული იქნებრ" -"ნáƒáƒ’ულისხმები მნიშვნელáƒáƒ‘ები\n" -"\n" -" სáƒáƒ™áƒ•áƒáƒœáƒ«áƒ სიტყვები:\n" -" გლáƒáƒ‘áƒáƒšáƒ£áƒ ი: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -" ფáƒáƒ˜áƒšáƒ˜áƒ¡ ჩვენებáƒ: normal, selected, marked, markselect\n" -" ფáƒáƒœáƒ¯áƒ ები: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" -" errdhotfocus\n" -" მენიუები: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" მხტუნáƒáƒ რმენიუები: pmenunormal, pmenusel, pmenutitle\n" -" რედáƒáƒ¥áƒ¢áƒáƒ ი: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -" მნáƒáƒ®áƒ•áƒ”ლი: viewnormal,viewbold, viewunderline, viewselected\n" -" დáƒáƒ®áƒ›áƒáƒ ებáƒ: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1566,7 +1548,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3936,65 +3918,23 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#, c-format -msgid "fish: Password is required for %s" +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -msgid "fish: Sending password..." -msgstr "fish: პáƒáƒ áƒáƒšáƒ˜áƒ¡ გáƒáƒ’ზáƒáƒ•áƒœáƒ..." - -msgid "fish: Sending initial line..." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -msgid "fish: Handshaking version..." +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" -msgid "fish: Getting host info..." -msgstr "fish: ჰáƒáƒ¡áƒ¢áƒ˜áƒ¡ ინფáƒáƒ მáƒáƒªáƒ˜áƒ˜áƒ¡ მიღებáƒ..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: იკითხებრ%s სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ე..." - -#, c-format -msgid "%s: done." -msgstr "%s: დáƒáƒ¡áƒ ულებულიáƒ." - -#, c-format -msgid "%s: failure" -msgstr "%s: შეცდáƒáƒ›áƒ" - #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: სáƒáƒªáƒáƒ•áƒ˜ %s: ბრძáƒáƒœáƒ”ბის გáƒáƒ’ზáƒáƒ•áƒœáƒ..." - -msgid "fish: Local read failed, sending zeros" -msgstr "" - -msgid "fish: storing file" -msgstr "fish: ფáƒáƒ˜áƒšáƒ˜áƒ¡ ჩáƒáƒ¬áƒ”რáƒ" - -msgid "Aborting transfer..." -msgstr "" - -msgid "Error reported after abort." -msgstr "" - -msgid "Aborted transfer would be successful." +msgid "Warning: cannot open %s directory\n" msgstr "" #, c-format @@ -4107,6 +4047,14 @@ msgstr "(ჯერchdir)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "%s: შეცდáƒáƒ›áƒ" + +#, c-format +msgid "%s: done." +msgstr "%s: დáƒáƒ¡áƒ ულებულიáƒ." + msgid "ftpfs: storing file" msgstr "ftpfs: ფáƒáƒ˜áƒšáƒ˜áƒ¡ შენáƒáƒ®áƒ•áƒ" @@ -4240,6 +4188,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "" + +msgid "Error reported after abort." +msgstr "" + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Aidos Kakimzhanov <aidos.kakimzhan@gmail.com>, 2016\n" "Language-Team: Kazakh (http://app.transifex.com/mc/mc/language/kk/)\n" @@ -704,7 +704,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1540,7 +1541,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3901,65 +3902,23 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "" - -msgid "fish: Sending password..." -msgstr "" - -msgid "fish: Sending initial line..." -msgstr "" - -msgid "fish: Handshaking version..." -msgstr "" - -msgid "fish: Getting host info..." -msgstr "" - -#, c-format -msgid "fish: Reading directory %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#, c-format -msgid "%s: done." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "%s: failure" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "" - -msgid "fish: Local read failed, sending zeros" -msgstr "" - -msgid "fish: storing file" -msgstr "" - -msgid "Aborting transfer..." -msgstr "" - -msgid "Error reported after abort." -msgstr "" - -msgid "Aborted transfer would be successful." +msgid "Warning: cannot open %s directory\n" msgstr "" #, c-format @@ -4072,6 +4031,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "" + +#, c-format +msgid "%s: done." +msgstr "" + msgid "ftpfs: storing file" msgstr "" @@ -4205,6 +4172,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "" + +msgid "Error reported after abort." +msgstr "" + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "" @@ -8,15 +8,16 @@ # JinYeong Bak <dongdm@gmail.com>, 2016 # Junghee Lee <daemul72@gmail.com>, 2022-2023 # Junghee Lee <daemul72@gmail.com>, 2022 -# Junghee Lee <daemul72@gmail.com>, 2019-2021 +# Junghee Lee <daemul72@gmail.com>, 2019-2021,2023 +# Seong-ho Cho <darkcircle.0426@gmail.com>, 2023 # Slava Zanko <slavazanko@gmail.com>, 2011 msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" -"Last-Translator: Junghee Lee <daemul72@gmail.com>, 2022-2023\n" +"Last-Translator: Seong-ho Cho <darkcircle.0426@gmail.com>, 2023\n" "Language-Team: Korean (http://app.transifex.com/mc/mc/language/ko/)\n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -26,14 +27,14 @@ msgstr "" # "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" msgid "Warning: cannot load codepages list" -msgstr "ê²½ê³ : 코드 페ì´ì§€ 목ë¡ì„ 불러올 수 없습니다" +msgstr "ê²½ê³ : 코드 페ì´ì§€ 목ë¡ì„ 불러올 수 ì—†ìŒ" msgid "7-bit ASCII" -msgstr "7-bit ASCII" +msgstr "7비트 아스키" #, c-format msgid "Cannot translate from %s to %s" -msgstr "%sì—ì„œ %së¡œ ë³€í™˜í• ìˆ˜ 없습니다" +msgstr "%sì—ì„œ %së¡œ ë³€í™˜í• ìˆ˜ ì—†ìŒ" msgid "Event system already initialized" msgstr "ì´ë²¤íŠ¸ ì‹œìŠ¤í…œì´ ì´ë¯¸ 초기화ë˜ì—ˆìŠµë‹ˆë‹¤" @@ -76,7 +77,7 @@ msgstr "ìž ê¸ˆ 무시(&I)" #, c-format msgid "Cannot create %s directory" -msgstr "%s ë””ë ‰í„°ë¦¬ì„ ë§Œë“¤ 수 없습니다" +msgstr "%s ë””ë ‰í„°ë¦¬ë¥¼ 만들 수 ì—†ìŒ" msgid "FATAL: not a directory:" msgstr "치명ì ì¸ ì˜¤ë¥˜: ë””ë ‰í„°ë¦¬ê°€ 아님:" @@ -97,11 +98,11 @@ msgid "" "Hex pattern error at position %d:\n" "%s." msgstr "" -"%d ì—ì„œ 16진수 형ì‹ì˜ 오류 발견ë¨:\n" +"%dì—ì„œ 16진수 형ì‹ì˜ 오류 발견:\n" "%s." msgid "Search string not found" -msgstr "검색 문ìžì—´ì„ ì°¾ì„ ìˆ˜ 없습니다" +msgstr "검색 문ìžì—´ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ" msgid "Not implemented yet" msgstr "ì•„ì§ êµ¬í˜„ë˜ì§€ ì•ŠìŒ" @@ -134,15 +135,15 @@ msgid "" "Default skin has been loaded" msgstr "" "'%s' ìŠ¤í‚¨ì„ ë¶ˆëŸ¬ì˜¬ 수 없습니다.\n" -"기본 ìŠ¤í‚¨ì´ ë¶ˆëŸ¬ì˜¤ê¸° ë˜ì—ˆìŠµë‹ˆë‹¤" +"기본 ìŠ¤í‚¨ì„ ë¶ˆëŸ¬ì™”ìŠµë‹ˆë‹¤" #, c-format msgid "" "Unable to parse '%s' skin.\n" "Default skin has been loaded" msgstr "" -"'%s' ìŠ¤í‚¨ì„ êµ¬ë¬¸ 분ì„í• ìˆ˜ 없습니다.\n" -"기본 ìŠ¤í‚¨ì´ ë¶ˆëŸ¬ì˜¤ê¸° ë˜ì—ˆìŠµë‹ˆë‹¤" +"'%s' ìŠ¤í‚¨ì„ ë¶„ì„í• ìˆ˜ 없습니다.\n" +"기본 ìŠ¤í‚¨ì„ ë¶ˆëŸ¬ì™”ìŠµë‹ˆë‹¤" #, c-format msgid "" @@ -150,9 +151,9 @@ msgid "" "%s\n" "Default skin has been loaded" msgstr "" -"트루컬러를 지ì›í•˜ëŠ” '%s' ìŠ¤í‚¨ì„ ì‚¬ìš©í• ìˆ˜ 없습니다:\n" +"트루컬러를 지ì›í•˜ëŠ” '%s' ìŠ¤í‚¨ì„ ì‚¬ìš©í• ìˆ˜ ì—†ìŒ:\n" "%s\n" -"기본 ìŠ¤í‚¨ì´ ë¶ˆëŸ¬ì˜¤ê¸° ë˜ì—ˆìŠµë‹ˆë‹¤" +"기본 ìŠ¤í‚¨ì„ ë¶ˆëŸ¬ì™”ìŠµë‹ˆë‹¤" #, c-format msgid "" @@ -162,10 +163,10 @@ msgid "" msgstr "" "256ìƒ‰ì´ ì•„ë‹Œ 터미ë„ì—ì„œ 256ìƒ‰ì„ ì§€ì›í•˜ëŠ”\n" "'%s' ìŠ¤í‚¨ì„ ì‚¬ìš©í• ìˆ˜ 없습니다.\n" -"기본 ìŠ¤í‚¨ì´ ë¶ˆëŸ¬ì˜¤ê¸° ë˜ì—ˆìŠµë‹ˆë‹¤" +"기본 ìŠ¤í‚¨ì„ ë¶ˆëŸ¬ì™”ìŠµë‹ˆë‹¤" msgid "True color not supported with ncurses." -msgstr "트루 컬러는 ncursesì—ì„œ ì§€ì› ë˜ì§€ 않습니다." +msgstr "트루 컬러는 ncursesì—ì„œ 지ì›í•˜ì§€ 않습니다." msgid "Your terminal doesn't even seem to support 256 colors." msgstr "터미ë„ì´ 256색ìƒì„ 지ì›í•˜ì§€ 않는 것 같습니다." @@ -180,64 +181,64 @@ msgid "Escape" msgstr "Esc" msgid "Function key 1" -msgstr "기능 키 1" +msgstr "F1" msgid "Function key 2" -msgstr "기능 키 2" +msgstr "F2" msgid "Function key 3" -msgstr "기능 키 3" +msgstr "F3" msgid "Function key 4" -msgstr "기능 키 4" +msgstr "F4" msgid "Function key 5" -msgstr "기능 키 5" +msgstr "F5" msgid "Function key 6" -msgstr "기능 키 6" +msgstr "F6" msgid "Function key 7" -msgstr "기능 키 7" +msgstr "F7" msgid "Function key 8" -msgstr "기능 키 8" +msgstr "F8" msgid "Function key 9" -msgstr "기능 키 9" +msgstr "F9" msgid "Function key 10" -msgstr "기능 키 10" +msgstr "F10" msgid "Function key 11" -msgstr "기능 키 11" +msgstr "F11" msgid "Function key 12" -msgstr "기능 키 12" +msgstr "F12" msgid "Function key 13" -msgstr "기능 키 13" +msgstr "F13" msgid "Function key 14" -msgstr "기능 키 14" +msgstr "F14" msgid "Function key 15" -msgstr "기능 키 15" +msgstr "F15" msgid "Function key 16" -msgstr "기능 키 16" +msgstr "F16" msgid "Function key 17" -msgstr "기능 키 17" +msgstr "F17" msgid "Function key 18" -msgstr "기능 키 18" +msgstr "F18" msgid "Function key 19" -msgstr "기능 키 19" +msgstr "F19" msgid "Function key 20" -msgstr "기능 키 20" +msgstr "F20" msgid "Completion/M-tab" msgstr "완성/M-tab" @@ -246,7 +247,7 @@ msgid "BackTab/S-tab" msgstr "뒤로 íƒ/S-tab" msgid "Backspace" -msgstr "백스페ì´ìŠ¤" +msgstr "Backspace" msgid "Up arrow" msgstr "위쪽 방향키" @@ -261,22 +262,22 @@ msgid "Right arrow" msgstr "오른쪽 방향키" msgid "Insert" -msgstr "삽입 키" +msgstr "Insert" msgid "Delete" -msgstr "ì‚ì œ 키" +msgstr "Delete" msgid "Home" -msgstr "홈 키" +msgstr "Home" msgid "End key" -msgstr "End 키" +msgstr "End" msgid "Page Up" -msgstr "페ì´ì§€ 위로 키" +msgstr "Page Up" msgid "Page Down" -msgstr "페ì´ì§€ 아래로 키" +msgstr "Page Down" msgid "/ on keypad" msgstr "키패드 /" @@ -324,16 +325,16 @@ msgid "Enter on keypad" msgstr "키패드 Enter" msgid "Function key 21" -msgstr "기능 키 21" +msgstr "F21" msgid "Function key 22" -msgstr "기능 키 22" +msgstr "F22" msgid "Function key 23" -msgstr "기능 키 23" +msgstr "F23" msgid "Function key 24" -msgstr "기능 키 24" +msgstr "F24" msgid "A1 key" msgstr "A1 키" @@ -432,10 +433,10 @@ msgid "Enter" msgstr "↵" msgid "Tab key" -msgstr "íƒ í‚¤" +msgstr "Tab" msgid "Space key" -msgstr "스페ì´ìŠ¤í‚¤" +msgstr "Space" msgid "Slash key" msgstr "/" @@ -463,7 +464,7 @@ msgid "The TERM environment variable is unset!\n" msgstr "TERM 환경변수가 ì„¤ì •ë˜ì–´ìžˆì§€ 않습니다!\n" msgid "Cannot check SIGWINCH pipe" -msgstr "SIGWINCH 파ì´í”„를 확ì¸í• 수 없습니다" +msgstr "SIGWINCH 파ì´í”„를 확ì¸í• 수 ì—†ìŒ" #, c-format msgid "" @@ -471,7 +472,7 @@ msgid "" "Cannot create pipe for SIGWINCH: %s (%d)\n" msgstr "" "\n" -"SIGWINCHìš© 파ì´í”„를 ìž‘ì„±í• ìˆ˜ 없습니다: %s (%d)\n" +"SIGWINCHìš© 파ì´í”„를 ìž‘ì„±í• ìˆ˜ ì—†ìŒ: %s (%d)\n" #, c-format msgid "" @@ -479,7 +480,7 @@ msgid "" "Cannot configure write end of SIGWINCH pipe: %s (%d)\n" msgstr "" "\n" -"SIGWINCH 파ì´í”„ì˜ ì“°ê¸° ëì„ êµ¬ì„±í• ìˆ˜ 없습니다: %s (%d)\n" +"SIGWINCH 파ì´í”„ì˜ ì“°ê¸° ëì„ êµ¬ì„±í• ìˆ˜ ì—†ìŒ: %s (%d)\n" #, c-format msgid "" @@ -487,7 +488,7 @@ msgid "" "Cannot configure read end of SIGWINCH pipe: %s (%d)\n" msgstr "" "\n" -"SIGWINCH 파ì´í”„ì˜ ì½ê¸° ëì„ êµ¬ì„±í• ìˆ˜ 없습니다: %s (%d)\n" +"SIGWINCH 파ì´í”„ì˜ ì½ê¸° ëì„ êµ¬ì„±í• ìˆ˜ ì—†ìŒ: %s (%d)\n" #, c-format msgid "" @@ -498,42 +499,42 @@ msgstr "" "TERM 환경변수를 확ì¸í•´ 보세요.\n" msgid "B" -msgstr "ë°”ì´íŠ¸" +msgstr "B" msgid "kB" -msgstr "킬로바ì´íŠ¸" +msgstr "kB" msgid "KiB" -msgstr "키비바ì´íŠ¸" +msgstr "KiB" msgid "MB" -msgstr "메가바ì´íŠ¸" +msgstr "MB" msgid "MiB" -msgstr "메비바ì´íŠ¸" +msgstr "MiB" msgid "GB" -msgstr "기가바ì´íŠ¸" +msgstr "GB" msgid "GiB" -msgstr "기비바ì´íŠ¸" +msgstr "GiB" msgid "Cannot create pipe descriptor" -msgstr "파ì´í”„ 설명ë„구를 ìž‘ì„±í• ìˆ˜ 없습니다" +msgstr "파ì´í”„ 디스í¬ë¦½í„°ë¥¼ ìƒì„±í• 수 ì—†ìŒ" msgid "Cannot create pipe streams" -msgstr "파ì´í”„ ë°ì´í„° ìŠ¤íŠ¸ë¦¼ì„ ìƒì„±í• 수 없습니다" +msgstr "파ì´í”„ ë°ì´í„° ìŠ¤íŠ¸ë¦¼ì„ ìƒì„±í• 수 ì—†ìŒ" #, c-format msgid "" "Unexpected error in select() reading data from a child process:\n" "%s" msgstr "" -"Select()ì—ì„œ 하위 í”„ë¡œì„¸ìŠ¤ì˜ ë°ì´í„°ë¥¼ ì½ëŠ” ë„중 예ìƒì¹˜ 못한 오류 ë°œìƒ:\n" +"select()ì—ì„œ 하위 í”„ë¡œì„¸ìŠ¤ì˜ ë°ì´í„°ë¥¼ ì½ëŠ” 중 예ìƒì¹˜ 못한 오류 ë°œìƒ:\n" "%s" msgid "Cannot close pipe descriptor (p == NULL)" -msgstr "파ì´í”„ 설명ìžë¥¼ ë‹«ì„ ìˆ˜ 없습니다(p == NULL)" +msgstr "파ì´í”„ 디스í¬ë¦½í„°ë¥¼ ë‹«ì„ ìˆ˜ ì—†ìŒ (p == NULL)" #, c-format msgid "" @@ -574,11 +575,11 @@ msgstr "%s ë””ë ‰í„°ë¦¬ê°€ 사용ìžì˜ ì†Œìœ ê°€ 아님\n" #, c-format msgid "Cannot set correct permissions for directory %s\n" -msgstr "%s ë””ë ‰í„°ë¦¬ì— ëŒ€í•œ 올바른 사용 ê¶Œí•œì„ ì„¤ì •í• ìˆ˜ 없습니다\n" +msgstr "%s ë””ë ‰í„°ë¦¬ì— ëŒ€í•œ 올바른 사용 ê¶Œí•œì„ ì„¤ì •í• ìˆ˜ ì—†ìŒ\n" #, c-format msgid "Cannot create temporary directory %s: %s\n" -msgstr "%s ìž„ì‹œ ë””ë ‰í„°ë¦¬ë¥¼ ìƒì„±í• 수 없습니다: %s\n" +msgstr "%s ìž„ì‹œ ë””ë ‰í„°ë¦¬ë¥¼ ìƒì„±í• 수 ì—†ìŒ: %s\n" #, c-format msgid "Temporary files will be created in %s\n" @@ -592,7 +593,7 @@ msgid "Press any key to continue..." msgstr "계ì†í•˜ë ¤ë©´ 아무 키나 누르ì‹ì‹œì˜¤..." msgid "Cannot parse:" -msgstr "구문 분ì„í• ìˆ˜ 없습니다:" +msgstr "분ì„í• ìˆ˜ ì—†ìŒ:" msgid "More parsing errors will be ignored." msgstr "ë” ë§Žì€ êµ¬ë¬¸ ë¶„ì„ ì˜¤ë¥˜ê°€ 무시ë©ë‹ˆë‹¤." @@ -601,26 +602,26 @@ msgid "Internal error:" msgstr "내부 오류:" msgid "Password:" -msgstr "비밀번호:" +msgstr "암호:" msgid "Screens" msgstr "화면" msgid "History" -msgstr "ížˆìŠ¤í† ë¦¬" +msgstr "기ë¡" #. TRANSLATORS: no need to translate 'DialogTitle', it's just a context prefix msgid "DialogTitle|History cleanup" -msgstr "ížˆìŠ¤í† ë¦¬ ì •ë¦¬" +msgstr "ê¸°ë¡ ì •ë¦¬" msgid "Do you want clean this history?" -msgstr "ì´ ížˆìŠ¤í† ë¦¬ë¥¼ ì§€ìš°ì‹œê² ìŠµë‹ˆê¹Œ?" +msgstr "ì´ ê¸°ë¡ì„ ì§€ìš°ì‹œê² ìŠµë‹ˆê¹Œ?" msgid "&Yes" msgstr "예(&Y)" msgid "&No" -msgstr "아니오(&N)" +msgstr "아니요(&N)" msgid "&OK" msgstr "확ì¸(&O)" @@ -648,13 +649,13 @@ msgid "Print data directory" msgstr "ë°ì´í„° ë””ë ‰í„°ë¦¬ ì¸ì‡„" msgid "Print extended info about used data directories" -msgstr "ì‚¬ìš©ëœ ë°ì´í„° ë””ë ‰í„°ë¦¬ì— ëŒ€í•œ 확장 ì •ë³´ ì¸ì‡„" +msgstr "사용 ë°ì´í„° ë””ë ‰í„°ë¦¬ì˜ í™•ìž¥ ì •ë³´ ì¶œë ¥" msgid "Print configure options" -msgstr "ì„¤ì • 옵션 ì¸ì‡„" +msgstr "ì„¤ì • 옵션 ì¶œë ¥" msgid "Print last working directory to specified file" -msgstr "마지막 ìž‘ì—… ë””ë ‰í„°ë¦¬ë¥¼ ì§€ì •ëœ íŒŒì¼ë¡œ ì¸ì‡„" +msgstr "마지막 ìž‘ì—… ë””ë ‰í„°ë¦¬ë¥¼ ì§€ì •ëœ íŒŒì¼ë¡œ ì¶œë ¥" msgid "<file>" msgstr "<file>" @@ -708,7 +709,7 @@ msgid "Don't load definitions of key bindings from file, use defaults" msgstr "파ì¼ì—ì„œ 키 ë°”ì¸ë”© ì •ì˜ ë¶ˆëŸ¬ì˜¤ê¸° 안함, 기본값 사용" msgid "Requests to run in black and white" -msgstr "í‘백모드로 실행 ìš”ì²" +msgstr "í‘ë°± 모드로 실행 ìš”ì²" msgid "Request to run in color mode" msgstr "컬러 모드로 실행 ìš”ì²" @@ -737,30 +738,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors KEYWORD={FORE},{BACK},{ATTR}:KEYWORD2=...\n" -"\n" -"{FORE}, {BACK} ë° {ATTR}ì„(를) ìƒëžµí• 수 있으며 ê¸°ë³¸ê°’ì´ ì‚¬ìš©ë¨\n" -"\n" -"키워드:\n" -" ì „ì—: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -" íŒŒì¼ í‘œì‹œ: normal, selected, marked, markselect\n" -" 대화 ìƒìž: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" -" errdhotfocus\n" -" 메뉴: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" íŒì—… 메뉴: pmenunormal, pmenusel, pmenutitle\n" -" 편집기: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -" ë·°ì–´: viewnormal,viewbold, viewunderline, viewselected\n" -" ë„움ë§: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -815,19 +799,19 @@ msgid "GNU Midnight Commander %s\n" msgstr "GNU 미드나잇 ì»¤ë§¨ë” %s\n" msgid "Main options" -msgstr "기본 옵션" +msgstr "주요 옵션" msgid "Terminal options" msgstr "í„°ë¯¸ë„ ì˜µì…˜" msgid "Arguments parse error!" -msgstr "ì¸ìˆ˜ 구문 ë¶„ì„ ì˜¤ë¥˜!" +msgstr "ì¸ìˆ˜ ë¶„ì„ ì˜¤ë¥˜!" msgid "No arguments given to the viewer." -msgstr "ë·°ì–´ì— ì§€ì •ëœ ì¸ìˆ˜ê°€ 없습니다." +msgstr "ë·°ì–´ì— ì§€ì •í•œ ì¸ìžê°€ 없습니다." msgid "Two files are required to invoke the diffviewer." -msgstr "Diffviewer를 í˜¸ì¶œí•˜ë ¤ë©´ ë‘ ê°œì˜ íŒŒì¼ì´ 필요합니다." +msgstr "diffviewer를 í˜¸ì¶œí•˜ë ¤ë©´ íŒŒì¼ ë‘ ê°œê°€ 필요합니다." msgid "Background protocol error" msgstr "백그ë¼ìš´ë“œ í”„ë¡œí† ì½œ 오류" @@ -839,10 +823,10 @@ msgid "Background process error" msgstr "백그ë¼ìš´ë“œ 프로세스 오류" msgid "Unknown error in child" -msgstr "하위ì—ì„œ ì•Œ 수 없는 오류 ë°œìƒ" +msgstr "하위 프로세스ì—ì„œ ì•Œ 수 없는 오류 ë°œìƒ" msgid "Child died unexpectedly" -msgstr "하위가 예기치 않게 죽ìŒ" +msgstr "하위 프로세스가 예기치 않게 죽ìŒ" msgid "" "Background process sent us a request for more arguments\n" @@ -881,7 +865,7 @@ msgid "" "%s" msgstr "" "%s\n" -"ìž„ì‹œ Diff 파ì¼ì„ ìƒì„±í• 수 없습니다" +"ìž„ì‹œ Diff 파ì¼ì„ ìƒì„±í• 수 ì—†ìŒ" #, c-format msgid "" @@ -891,7 +875,7 @@ msgid "" msgstr "" "%s%s\n" "%s\n" -" 백업 파ì¼ì„ ìƒì„±í• 수 없습니다" +" 백업 파ì¼ì„ ìƒì„±í• 수 ì—†ìŒ" #, c-format msgid "" @@ -899,7 +883,7 @@ msgid "" "%s" msgstr "" "%s\n" -"ìž„ì‹œ 병합 파ì¼ì„ ìƒì„±í• 수 없습니다" +"ìž„ì‹œ 병합 파ì¼ì„ ìƒì„±í• 수 ì—†ìŒ" msgid "&Fastest (Assume large files)" msgstr "가장 ë¹ ë¦„ (대용량 íŒŒì¼ ì¶”ì •)(&F)" @@ -971,14 +955,14 @@ msgid "Quit" msgstr "종료" msgid "File(s) was modified. Save with exit?" -msgstr "íŒŒì¼ ìˆ˜ì •ë¨. 종료로 ì €ìž¥í•˜ì‹œê² ìŠµë‹ˆê¹Œ?" +msgstr "파ì¼ì„ ìˆ˜ì •í–ˆìŠµë‹ˆë‹¤. ì €ìž¥ 후 ë‚˜ê°€ì‹œê² ìŠµë‹ˆê¹Œ?" msgid "" "Midnight Commander is being shut down.\n" "Save modified file(s)?" msgstr "" -"미드나잇 커맨ë”ê°€ 종료ë©ë‹ˆë‹¤.\n" -"ìˆ˜ì •ëœ íŒŒì¼ì„ ì €ìž¥í•˜ì‹œê² ìŠµë‹ˆê¹Œ?" +"미드나잇 커맨ë”를 ë냅니다.\n" +"ìˆ˜ì •í•œ 파ì¼ì„ ì €ìž¥í•˜ì‹œê² ìŠµë‹ˆê¹Œ?" msgid "Diff:" msgstr "비êµ:" @@ -1010,7 +994,7 @@ msgstr "불러오는 중..." #, c-format msgid "Cannot open %s for reading" -msgstr "%sì„(를) ì—´ 수 없습니다" +msgstr "%sì„(를) ì—´ 수 ì—†ìŒ" msgid "Load file" msgstr "íŒŒì¼ ë¶ˆëŸ¬ì˜¤ê¸°" @@ -1021,7 +1005,7 @@ msgstr "%sì„(를) ì½ëŠ” 중 오류 ë°œìƒ" #, c-format msgid "Cannot get size/permissions for %s" -msgstr "%sì— ëŒ€í•œ í¬ê¸°/사용 ê¶Œí•œì„ ê°€ì ¸ì˜¬ 수 없습니다" +msgstr "%sì— ëŒ€í•œ í¬ê¸°/사용 ê¶Œí•œì„ ê°€ì ¸ì˜¬ 수 ì—†ìŒ" #, c-format msgid "\"%s\" is not a regular file" @@ -1044,7 +1028,7 @@ msgstr "파ì´í”„ì—ì„œ ì½ëŠ” 중 오류 ë°œìƒ: %s" #, c-format msgid "Cannot open pipe for reading: %s" -msgstr "ì½ì„ 파ì´í”„를 ì—´ 수 없습니다: %s" +msgstr "ì½ì„ 파ì´í”„를 ì—´ 수 ì—†ìŒ: %s" msgid "File has hard-links. Detach before saving?" msgstr "파ì¼ì— 하드-ë§í¬ê°€ 있습니다. ì €ìž¥í•˜ê¸° ì „ì— ë¶„ë¦¬ í•˜ì‹œê² ìŠµë‹ˆê¹Œ?" @@ -1058,11 +1042,11 @@ msgstr "파ì´í”„ì— ì“°ëŠ” 중 오류 ë°œìƒ: %s" #, c-format msgid "Cannot open pipe for writing: %s" -msgstr "쓰기 위해 파ì´í”„를 ì—´ 수 없습니다: %s" +msgstr "쓰기 위해 파ì´í”„를 ì—´ 수 ì—†ìŒ: %s" #, c-format msgid "Cannot open file for writing: %s" -msgstr "쓰기 위해 파ì¼ì„ ì—´ 수 없습니다: %s" +msgstr "쓰기 위해 파ì¼ì„ ì—´ 수 ì—†ìŒ: %s" msgid "The file you are saving does not end with a newline." msgstr "ì €ìž¥ì¤‘ì¸ íŒŒì¼ì€ 개행 문ìžë¡œ ë나지 ì•ŠìŒ." @@ -1110,7 +1094,7 @@ msgid "Save as" msgstr "다른 ì´ë¦„으로 ì €ìž¥" msgid "Cannot save: destination is not a regular file" -msgstr "ì €ìž¥í• ìˆ˜ 없습니다: 대ìƒì´ ì¼ë°˜ 파ì¼ì´ 아님" +msgstr "ì €ìž¥í• ìˆ˜ ì—†ìŒ: 대ìƒì´ ì¼ë°˜ 파ì¼ì´ 아님" msgid "A file already exists with this name" msgstr "ì´ ì´ë¦„ì˜ íŒŒì¼ì´ ì´ë¯¸ 있ìŒ" @@ -1119,7 +1103,7 @@ msgid "&Overwrite" msgstr "ë®ì–´ì“°ê¸°(&O)" msgid "Cannot save file" -msgstr "파ì¼ì„ ì €ìž¥í• ìˆ˜ 없습니다" +msgstr "파ì¼ì„ ì €ìž¥í• ìˆ˜ ì—†ìŒ" #, c-format msgid "Confirm save file: \"%s\"" @@ -1156,7 +1140,7 @@ msgid "&Local" msgstr "로컬(&L)" msgid "[NoName]" -msgstr "[ì´ë¦„ 없습니다]" +msgstr "[ì´ë¦„ ì—†ìŒ]" #, c-format msgid "" @@ -1184,7 +1168,7 @@ msgid "Copy to clipboard" msgstr "í´ë¦½ë³´ë“œë¡œ 복사하기" msgid "Unable to save to file" -msgstr "파ì¼ì— ì €ìž¥í• ìˆ˜ 없습니다" +msgstr "파ì¼ì— ì €ìž¥í• ìˆ˜ ì—†ìŒ" msgid "Cut to clipboard" msgstr "í´ë¦½ë³´ë“œë¡œ 잘ë¼ë‚´ê¸°" @@ -1199,7 +1183,7 @@ msgid "Insert file" msgstr "íŒŒì¼ ì‚½ìž…" msgid "Cannot insert file" -msgstr "파ì¼ì„ ì‚½ìž…í• ìˆ˜ 없습니다" +msgstr "파ì¼ì„ ì‚½ìž…í• ìˆ˜ ì—†ìŒ" msgid "Sort block" msgstr "ë¸”ë¡ ì •ë ¬" @@ -1217,7 +1201,7 @@ msgid "Sort" msgstr "ì •ë ¬" msgid "Cannot execute sort command" -msgstr "ì •ë ¬ ëª…ë ¹ì„ ì‹¤í–‰í• ìˆ˜ 없습니다" +msgstr "ì •ë ¬ ëª…ë ¹ì„ ì‹¤í–‰í• ìˆ˜ ì—†ìŒ" #, c-format msgid "Sort returned non-zero: %s" @@ -1233,7 +1217,7 @@ msgid "External command" msgstr "확장 ëª…ë ¹ì–´" msgid "Cannot execute command" -msgstr "ëª…ë ¹ì„ ì‹¤í–‰í• ìˆ˜ 없습니다" +msgstr "ëª…ë ¹ì„ ì‹¤í–‰í• ìˆ˜ ì—†ìŒ" msgid "mail -s <subject> -c <cc> <to>" msgstr "mail -s <subject> -c <cc> <to>" @@ -1251,7 +1235,7 @@ msgid "Mail" msgstr "ë©”ì¼" msgid "Insert literal" -msgstr "í…스트 삽입" +msgstr "ë¬¸ìž ì‚½ìž…" msgid "Press any key:" msgstr "아무 키나 누르기:" @@ -1270,7 +1254,7 @@ msgid "Collect completions" msgstr "완성 ì •ë³´ 수집" msgid "NoName" -msgstr "ì´ë¦„없습니다" +msgstr "ì´ë¦„ì—†ìŒ" msgid "Save macro" msgstr "매í¬ë¡œ ì €ìž¥" @@ -1438,7 +1422,7 @@ msgid "&Mail..." msgstr "ë©”ì¼(&M)..." msgid "Insert &literal..." -msgstr "í…스트 삽입(&L)..." +msgstr "ë¬¸ìž ì‚½ìž…(&L)..." msgid "Insert &date/time" msgstr "ë‚ ì§œ/시간 삽입(&D)" @@ -1516,7 +1500,7 @@ msgid "&Options" msgstr "옵션(&O)" msgid "&None" -msgstr "없습니다(&N)" +msgstr "ì—†ìŒ(&N)" msgid "&Dynamic paragraphing" msgstr "ë™ì ë¶„í• (&D)" @@ -1627,8 +1611,8 @@ msgstr "" "ì‚¬ìš©ìž ì¹œí™”ì ì¸ í…스트 편집기\n" "미드나잇 커맨ë”를 위해 작성ë¨." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" -msgstr "Copyright (C) 1996-2023 ìžìœ 소프트웨어 재단" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" +msgstr "" msgid "About" msgstr "소개" @@ -1764,7 +1748,7 @@ msgid "" "Cannot open file %s\n" "%s" msgstr "" -"%s 파ì¼ì„ ì—´ 수 없습니다\n" +"%s 파ì¼ì„ ì—´ 수 ì—†ìŒ\n" "%s" #, c-format @@ -1783,7 +1767,7 @@ msgstr "" #, c-format msgid "Cannot fetch a local copy of %s" -msgstr "%sì˜ ë¡œì»¬ ë³µì‚¬ë³¸ì„ ê°€ì ¸ì˜¬ 수 없습니다" +msgstr "%sì˜ ë¡œì»¬ ë³µì‚¬ë³¸ì„ ê°€ì ¸ì˜¬ 수 ì—†ìŒ" msgid "The shell is already running a command" msgstr "ì…¸ì´ ì´ë¯¸ ëª…ë ¹ì„ ì‹¤í–‰í•˜ê³ ìžˆìŒ" @@ -1831,7 +1815,7 @@ msgid "" "Cannot chmod \"%s\"\n" "%s" msgstr "" -"\"%s\"ì„(를) chmodí• ìˆ˜ 없습니다\n" +"\"%s\"ì„(를) chmodí• ìˆ˜ ì—†ìŒ\n" "%s" msgid "&Ignore" @@ -1848,7 +1832,7 @@ msgid "" "Cannot chown \"%s\"\n" "%s" msgstr "" -"\"%s\"ì„(를) ì„ íƒí• 수 없습니다\n" +"\"%s\"ì„(를) ì„ íƒí• 수 ì—†ìŒ\n" "%s" msgid "< Default >" @@ -2104,10 +2088,10 @@ msgid "Display bits" msgstr "ë””ìŠ¤í”Œë ˆì´ ë¹„íŠ¸" msgid "Input / display codepage:" -msgstr "코드 페ì´ì§€ ìž…ë ¥/표시:" +msgstr "ìž…ë ¥ / ë””ìŠ¤í”Œë ˆì´ ì½”ë“œíŽ˜ì´ì§€:" msgid "Directory tree" -msgstr "ë””ë ‰í„°ë¦¬ 트리구조" +msgstr "ë””ë ‰í„°ë¦¬ 트리" msgid "Timeout for freeing VFSs (sec):" msgstr "VFS를 í•´ì œí•˜ê¸° 위한 타임아웃(ì´ˆ):" @@ -2134,10 +2118,10 @@ msgid "Virtual File System Setting" msgstr "ê°€ìƒ íŒŒì¼ ì‹œìŠ¤í…œ ì„¤ì •" msgid "cd" -msgstr "ë””ë ‰í„°ë¦¬ 변경" +msgstr "cd" msgid "Quick cd" -msgstr "ë¹ ë¥¸ ë””ë ‰í„°ë¦¬ 변경" +msgstr "ë¹ ë¥¸ cd" msgid "Existing filename (filename symlink will point to):" msgstr "ëŒ€ìƒ íŒŒì¼ ì´ë¦„ (심볼ë¦ë§í¬ 파ì¼ì´ 가리킬 파ì¼):" @@ -2166,18 +2150,21 @@ msgid "" "%s\n" "%s" msgstr "" +"ë””ë ‰í„°ë¦¬ë¥¼ 다ìŒìœ¼ë¡œ ë³€ê²½í• ìˆ˜ ì—†ìŒ\n" +"%s\n" +"%s" msgid "Secure deletion" -msgstr "ì•ˆì „í•œ ì‚ì œ" +msgstr "보안 ì‚ì œ" msgid "Undelete" msgstr "ì‚ì œì·¨ì†Œ" msgid "Synchronous updates" -msgstr "ë™ê¸° ì—…ë°ì´íŠ¸" +msgstr "실시간 ì—…ë°ì´íŠ¸" msgid "Synchronous directory updates" -msgstr "ë™ê¸° ë””ë ‰í„°ë¦¬ ì—…ë°ì´íŠ¸" +msgstr "실시간 ë””ë ‰í„°ë¦¬ ì—…ë°ì´íŠ¸" msgid "Immutable" msgstr "불변" @@ -2186,10 +2173,10 @@ msgid "Append only" msgstr "첨부 만" msgid "No dump" -msgstr "ë¤í”„ 없습니다" +msgstr "ë¤í”„ ì—†ìŒ" msgid "No update atime" -msgstr "í•œ ë²ˆì— ì—…ë°ì´íŠ¸ 없습니다" +msgstr "atime ì—…ë°ì´íŠ¸ 안함" msgid "Compress" msgstr "압축" @@ -2213,7 +2200,7 @@ msgid "Indexed directory" msgstr "색ì¸ëœ ë””ë ‰í„°ë¦¬" msgid "No tail merging" -msgstr "꼬리 병합 없습니다" +msgstr "꼬리 병합 ì—†ìŒ" msgid "Top of directory hierarchies" msgstr "최ìƒìœ„ ë””ë ‰í„°ë¦¬ 계층" @@ -2225,7 +2212,7 @@ msgid "Huge_file" msgstr "대용량_파ì¼" msgid "No COW" -msgstr "COW 없습니다" +msgstr "COW ì—†ìŒ" msgid "Direct access for files" msgstr "파ì¼ì— 대한 ì§ì ‘ 액세스" @@ -2259,7 +2246,7 @@ msgid "" "Cannot chattr \"%s\"\n" "%s" msgstr "" -"\"%s\" ì†ì„± ë³€ê²½ì„ í• ìˆ˜ 없습니다\n" +"\"%s\" ì†ì„± ë³€ê²½ì„ í• ìˆ˜ ì—†ìŒ\n" "%s" #, c-format @@ -2267,7 +2254,7 @@ msgid "" "Cannot get flags of \"%s\"\n" "%s" msgstr "" -"\"%s\" 플래그를 ê°€ì ¸ì˜¬ 수 없습니다\n" +"\"%s\" 플래그를 ê°€ì ¸ì˜¬ 수 ì—†ìŒ\n" "%s" msgid "set &user ID on execution" @@ -2449,7 +2436,7 @@ msgstr "심볼ë¦ë§í¬ 편집" #, c-format msgid "edit symlink, unable to remove %s: %s" -msgstr "심볼ë¦ë§í¬ 편집, %sì„(를) ì œê±°í• ìˆ˜ 없습니다: %s" +msgstr "심볼ë¦ë§í¬ 편집, %sì„(를) ì œê±°í• ìˆ˜ ì—†ìŒ: %s" #, c-format msgid "edit symlink: %s" @@ -2486,10 +2473,10 @@ msgstr "%sì— ì €ìž¥ëœ ì„¤ì •" #, c-format msgid "Unable to save setup to %s" -msgstr "%sì— ì„¤ì •ì„ ì €ìž¥í• ìˆ˜ 없습니다" +msgstr "%sì— ì„¤ì •ì„ ì €ìž¥í• ìˆ˜ ì—†ìŒ" msgid "Cannot execute commands on non-local filesystems" -msgstr "ë¡œì»¬ì´ ì•„ë‹Œ íŒŒì¼ ì‹œìŠ¤í…œì—ì„œ ëª…ë ¹ì„ ì‹¤í–‰í• ìˆ˜ 없습니다" +msgstr "ë¡œì»¬ì´ ì•„ë‹Œ íŒŒì¼ ì‹œìŠ¤í…œì—ì„œ ëª…ë ¹ì„ ì‹¤í–‰í• ìˆ˜ ì—†ìŒ" msgid "Parameter" msgstr "매개변수" @@ -2499,7 +2486,7 @@ msgid "" "Cannot create temporary command file\n" "%s" msgstr "" -"ìž„ì‹œ ëª…ë ¹ 파ì¼ì„ ìƒì„±í• 수 없습니다\n" +"ìž„ì‹œ ëª…ë ¹ 파ì¼ì„ ìƒì„±í• 수 ì—†ìŒ\n" "%s" msgid "Pipe failed" @@ -2590,7 +2577,7 @@ msgid "" "Cannot stat hardlink source file \"%s\"\n" "%s" msgstr "" -"\"%s\" 하드ë§í¬ 소스 파ì¼ì„ í†µê³„í• ìˆ˜ 없습니다\n" +"\"%s\" 하드ë§í¬ 소스 파ì¼ì„ í†µê³„í• ìˆ˜ ì—†ìŒ\n" "%s" #, c-format @@ -2598,19 +2585,19 @@ msgid "" "Cannot create target hardlink \"%s\"\n" "%s" msgstr "" -"\"%s\" ëŒ€ìƒ í•˜ë“œë§í¬ë¥¼ 만들 수 없습니다\n" +"\"%s\" ëŒ€ìƒ í•˜ë“œë§í¬ë¥¼ 만들 수 ì—†ìŒ\n" "%s" #, c-format msgid "Cannot create target hardlink \"%s\"" -msgstr "\"%s\" ëŒ€ìƒ í•˜ë“œë§í¬ë¥¼ 만들 수 없습니다" +msgstr "\"%s\" ëŒ€ìƒ í•˜ë“œë§í¬ë¥¼ 만들 수 ì—†ìŒ" #, c-format msgid "" "Cannot read source link \"%s\"\n" "%s" msgstr "" -"\"%s\" 소스 ë§í¬ë¥¼ ì½ì„ 수 없습니다\n" +"\"%s\" 소스 ë§í¬ë¥¼ ì½ì„ 수 ì—†ìŒ\n" "%s" msgid "" @@ -2618,7 +2605,7 @@ msgid "" "\n" "Option Stable Symlinks will be disabled" msgstr "" -"ë¡œì»¬ì´ ì•„ë‹Œ íŒŒì¼ ì‹œìŠ¤í…œ ê°„ì— ì•ˆì •ì ì¸ ì‹¬ë³¼ë¦ë§í¬ë¥¼ 만들 수 없습니다:\n" +"ë¡œì»¬ì´ ì•„ë‹Œ íŒŒì¼ ì‹œìŠ¤í…œ ê°„ì— ì•ˆì •ì ì¸ ì‹¬ë³¼ë¦ë§í¬ë¥¼ 만들 수 ì—†ìŒ:\n" "\n" "옵션 ì•ˆì • 심볼ë¦ë§í¬ê°€ 비활성화 ë©ë‹ˆë‹¤" @@ -2627,7 +2614,7 @@ msgid "" "Cannot create target symlink \"%s\"\n" "%s" msgstr "" -"\"%s\" ëŒ€ìƒ ì‹¬ë³¼ë¦ë§í¬ë¥¼ 만들 수 없습니다\n" +"\"%s\" ëŒ€ìƒ ì‹¬ë³¼ë¦ë§í¬ë¥¼ 만들 수 ì—†ìŒ\n" "%s" #, c-format @@ -2676,14 +2663,14 @@ msgstr "" "다시 ì‚ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ?" msgid "Non&e" -msgstr "없습니다(&E)" +msgstr "ì—†ìŒ(&E)" #, c-format msgid "" "Cannot remove file \"%s\"\n" "%s" msgstr "" -"%s 파ì¼ì„ ì œê±°í• ìˆ˜ 없습니다\n" +"%s 파ì¼ì„ ì œê±°í• ìˆ˜ ì—†ìŒ\n" "%s" #, c-format @@ -2691,19 +2678,19 @@ msgid "" "Cannot stat file \"%s\"\n" "%s" msgstr "" -"%s 파ì¼ì„ statí• ìˆ˜ 없습니다\n" +"%s 파ì¼ì„ statí• ìˆ˜ ì—†ìŒ\n" "%s" #, c-format msgid "Cannot overwrite directory \"%s\"" -msgstr "%s ë””ë ‰í„°ë¦¬ë¥¼ ë®ì–´ì“¸ 수 없습니다" +msgstr "%s ë””ë ‰í„°ë¦¬ë¥¼ ë®ì–´ì“¸ 수 ì—†ìŒ" #, c-format msgid "" "Cannot move file \"%s\" to \"%s\"\n" "%s" msgstr "" -"%s 파ì¼ì„ \"%s\"ë¡œ ì´ë™í• 수 없습니다\n" +"%s 파ì¼ì„ \"%s\"ë¡œ ì´ë™í• 수 ì—†ìŒ\n" "\n" "%s" @@ -2712,7 +2699,7 @@ msgid "" "Cannot remove directory \"%s\"\n" "%s" msgstr "" -"%s ë””ë ‰í„°ë¦¬ë¥¼ ì œê±°í• ìˆ˜ 없습니다\n" +"%s ë””ë ‰í„°ë¦¬ë¥¼ ì œê±°í• ìˆ˜ ì—†ìŒ\n" "%s" #, c-format @@ -2720,7 +2707,7 @@ msgid "" "Cannot overwrite directory \"%s\"\n" "%s" msgstr "" -"%s ë””ë ‰í„°ë¦¬ë¥¼ ë®ì–´ì“¸ 수 없습니다\n" +"%s ë””ë ‰í„°ë¦¬ë¥¼ ë®ì–´ì“¸ 수 ì—†ìŒ\n" "%s" #, c-format @@ -2728,7 +2715,7 @@ msgid "" "Cannot overwrite file \"%s\"\n" "%s" msgstr "" -"%s 파ì¼ì„ ë®ì–´ì“¸ 수 없습니다\n" +"%s 파ì¼ì„ ë®ì–´ì“¸ 수 ì—†ìŒ\n" "%s" #, c-format @@ -2736,7 +2723,7 @@ msgid "" "Cannot move directory \"%s\" to \"%s\"\n" "%s" msgstr "" -"\"%s\" ë””ë ‰í„°ë¦¬ë¥¼ \"%s\"ë¡œ ì´ë™í• 수 없습니다\n" +"\"%s\" ë””ë ‰í„°ë¦¬ë¥¼ \"%s\"ë¡œ ì´ë™í• 수 ì—†ìŒ\n" "%s" msgid "Cannot operate on \"..\"!" @@ -2747,7 +2734,7 @@ msgid "" "Cannot stat source file \"%s\"\n" "%s" msgstr "" -"\"%s\" ì›ë³¸ 파ì¼ì„ í†µê³„í• ìˆ˜ 없습니다\n" +"\"%s\" ì›ë³¸ 파ì¼ì„ í†µê³„í• ìˆ˜ ì—†ìŒ\n" "%s" #, c-format @@ -2755,7 +2742,7 @@ msgid "" "Cannot create special file \"%s\"\n" "%s" msgstr "" -"\"%s\" 특수 파ì¼ì„ 만들 수 없습니다\n" +"\"%s\" 특수 파ì¼ì„ 만들 수 ì—†ìŒ\n" "%s" #, c-format @@ -2763,7 +2750,7 @@ msgid "" "Cannot chown target file \"%s\"\n" "%s" msgstr "" -"\"%s\" ëŒ€ìƒ íŒŒì¼ì„ chown í• ìˆ˜ 없습니다\n" +"\"%s\" ëŒ€ìƒ íŒŒì¼ì„ chown í• ìˆ˜ ì—†ìŒ\n" "%s" #, c-format @@ -2771,7 +2758,7 @@ msgid "" "Cannot chmod target file \"%s\"\n" "%s" msgstr "" -"\"%s\" ëŒ€ìƒ íŒŒì¼ì„ chmodí• ìˆ˜ 없습니다\n" +"\"%s\" ëŒ€ìƒ íŒŒì¼ì„ chmodí• ìˆ˜ ì—†ìŒ\n" "%s" #, c-format @@ -2779,7 +2766,7 @@ msgid "" "Cannot open source file \"%s\"\n" "%s" msgstr "" -"\"%s\" ì›ë³¸ 파ì¼ì„ ì—´ 수 없습니다\n" +"\"%s\" ì›ë³¸ 파ì¼ì„ ì—´ 수 ì—†ìŒ\n" "%s" msgid "Reget failed, about to overwrite file" @@ -2790,7 +2777,7 @@ msgid "" "Cannot fstat source file \"%s\"\n" "%s" msgstr "" -"\"%s\" 소스 파ì¼ì„ fstatí• ìˆ˜ 없습니다\n" +"\"%s\" 소스 파ì¼ì„ fstatí• ìˆ˜ ì—†ìŒ\n" "%s" #, c-format @@ -2798,7 +2785,7 @@ msgid "" "Cannot create target file \"%s\"\n" "%s" msgstr "" -"\"%s\" ëŒ€ìƒ íŒŒì¼ì„ ìƒì„±í• 수 없습니다\n" +"\"%s\" ëŒ€ìƒ íŒŒì¼ì„ ìƒì„±í• 수 ì—†ìŒ\n" "%s" #, c-format @@ -2806,7 +2793,7 @@ msgid "" "Cannot fstat target file \"%s\"\n" "%s" msgstr "" -"\"%s\" ëŒ€ìƒ íŒŒì¼ì„ fstatí• ìˆ˜ 없습니다\n" +"\"%s\" ëŒ€ìƒ íŒŒì¼ì„ fstatí• ìˆ˜ ì—†ìŒ\n" "%s" #, c-format @@ -2814,7 +2801,7 @@ msgid "" "Cannot preallocate space for target file \"%s\"\n" "%s" msgstr "" -"\"%s\" ëŒ€ìƒ íŒŒì¼ì— 대한 ê³µê°„ì„ ì‚¬ì „ í• ë‹¹í• ìˆ˜ 없습니다\n" +"\"%s\" ëŒ€ìƒ íŒŒì¼ì— 대한 ê³µê°„ì„ ì‚¬ì „ í• ë‹¹í• ìˆ˜ ì—†ìŒ\n" "%s" #, c-format @@ -2822,7 +2809,7 @@ msgid "" "Cannot read source file \"%s\"\n" "%s" msgstr "" -"\"%s\" 소스 파ì¼ë¥¼ ì½ì„ 수 없습니다\n" +"\"%s\" 소스 파ì¼ë¥¼ ì½ì„ 수 ì—†ìŒ\n" "%s" #, c-format @@ -2830,7 +2817,7 @@ msgid "" "Cannot write target file \"%s\"\n" "%s" msgstr "" -"\"%s\" ëŒ€ìƒ íŒŒì¼ì„ 쓸 수 없습니다\n" +"\"%s\" ëŒ€ìƒ íŒŒì¼ì„ 쓸 수 ì—†ìŒ\n" "%s" msgid "(stalled)" @@ -2850,7 +2837,7 @@ msgid "" "Cannot close source file \"%s\"\n" "%s" msgstr "" -"\"%s\" ì›ë³¸ 파ì¼ì„ ë‹«ì„ ìˆ˜ 없습니다\n" +"\"%s\" ì›ë³¸ 파ì¼ì„ ë‹«ì„ ìˆ˜ ì—†ìŒ\n" "%s" #, c-format @@ -2858,7 +2845,7 @@ msgid "" "Cannot close target file \"%s\"\n" "%s" msgstr "" -"\"%s\" ëŒ€ìƒ íŒŒì¼ì„ ë‹«ì„ ìˆ˜ 없습니다\n" +"\"%s\" ëŒ€ìƒ íŒŒì¼ì„ ë‹«ì„ ìˆ˜ ì—†ìŒ\n" "%s" #, c-format @@ -2866,7 +2853,7 @@ msgid "" "Cannot stat source directory \"%s\"\n" "%s" msgstr "" -"\"%s\" 소스 ë””ë ‰í„°ë¦¬ë¥¼ statí• ìˆ˜ 없습니다\n" +"\"%s\" 소스 ë””ë ‰í„°ë¦¬ë¥¼ statí• ìˆ˜ ì—†ìŒ\n" "%s" #, c-format @@ -2882,7 +2869,7 @@ msgid "" "Cannot copy cyclic symbolic link\n" "\"%s\"" msgstr "" -"순환 ì‹¬ë³¼ë¦ ë§í¬ë¥¼ ë³µì‚¬í• ìˆ˜ 없습니다\n" +"순환 ì‹¬ë³¼ë¦ ë§í¬ë¥¼ ë³µì‚¬í• ìˆ˜ ì—†ìŒ\n" "\"%s\"" #, c-format @@ -2898,7 +2885,7 @@ msgid "" "Cannot create target directory \"%s\"\n" "%s" msgstr "" -"\"%s\" ëŒ€ìƒ ë””ë ‰í„°ë¦¬ë¥¼ ìƒì„±í• 수 없습니다\n" +"\"%s\" ëŒ€ìƒ ë””ë ‰í„°ë¦¬ë¥¼ ìƒì„±í• 수 ì—†ìŒ\n" "%s" #, c-format @@ -2906,7 +2893,7 @@ msgid "" "Cannot chown target directory \"%s\"\n" "%s" msgstr "" -"\"%s\" ëŒ€ìƒ ë””ë ‰í„°ë¦¬ë¥¼ ì„ íƒí• 수 없습니다\n" +"\"%s\" ëŒ€ìƒ ë””ë ‰í„°ë¦¬ë¥¼ ì„ íƒí• 수 ì—†ìŒ\n" "%s" #, c-format @@ -2914,7 +2901,7 @@ msgid "Directories: %zu, total size: %s" msgstr "ë””ë ‰í„°ë¦¬: %zu, ì „ì²´ í¬ê¸°: %s" msgid "Sorry, I could not put the job in background" -msgstr "죄송합니다, 백그ë¼ìš´ë“œì—ì„œ ìž‘ì—…ì„ ë„£ì„ ìˆ˜ 없습니다" +msgstr "죄송합니다, 백그ë¼ìš´ë“œì—ì„œ ìž‘ì—…ì„ ë„£ì„ ìˆ˜ ì—†ìŒ" msgid "S&uspend" msgstr "ì¼ì‹œ 중단(&U)" @@ -3096,7 +3083,7 @@ msgid "&Copy" msgstr "복사(&C)" msgid "C&hmod" -msgstr "파ì¼/ë””ë ‰í„°ë¦¬ 권한 변경(&H)" +msgstr "í¼ë¯¸ì…˜(chmod)(&H)" msgid "&Link" msgstr "ë§í¬(&L)" @@ -3126,7 +3113,7 @@ msgid "&Mkdir" msgstr "&ë””ë ‰ìƒì„±" msgid "&Quick cd" -msgstr "ë¹ ë¥¸ ë””ë ‰í„°ë¦¬ 변경(&Q)" +msgstr "ë¹ ë¥¸cd(&Q)" msgid "Select &group" msgstr "그룹 ì„ íƒ(&G)" @@ -3144,7 +3131,7 @@ msgid "&User menu" msgstr "ì‚¬ìš©ìž ë©”ë‰´(&U)" msgid "&Directory tree" -msgstr "ë””ë ‰í„°ë¦¬ 트리구조(&D)" +msgstr "ë””ë ‰í„°ë¦¬ 트리(&D)" msgid "&Find file" msgstr "íŒŒì¼ ì°¾ê¸°(&F)" @@ -3216,7 +3203,7 @@ msgid "&Appearance..." msgstr "외형(&A)..." msgid "&Display bits..." -msgstr "비트 표시(&D)..." +msgstr "ë””ìŠ¤í”Œë ˆì´ ë¹„íŠ¸(&D)..." msgid "&Virtual FS..." msgstr "ê°€ìƒ íŒŒì¼ì‹œìŠ¤í…œ(&V)..." @@ -3260,7 +3247,7 @@ msgid "ButtonBar|Mkdir" msgstr "ë””ë ‰ìƒì„±" msgid "&Chdir" -msgstr "ë””ë ‰í„°ë¦¬ ì´ë™(&C)" +msgstr "Chdir(&C)" msgid "&Again" msgstr "다시(&A)" @@ -3427,7 +3414,7 @@ msgid "" "MC was unable to write %s file,\n" "your old hotlist entries were not deleted" msgstr "" -"MCê°€ %s 파ì¼ì„ 쓸 수 없습니다,\n" +"MCê°€ %s 파ì¼ì„ 쓸 수 ì—†ìŒ,\n" "ì´ì „ ë‹¨ì¶•ëª©ë¡ í•ëª©ì´ ì‚ì œë˜ì§€ ì•ŠìŒ" #, c-format @@ -3446,13 +3433,13 @@ msgid "File: %s" msgstr "파ì¼: %s" msgid "No node information" -msgstr "노드 ì •ë³´ 없습니다" +msgstr "노드 ì •ë³´ ì—†ìŒ" msgid "Free nodes:" msgstr "사용 가능한 노드:" msgid "No space information" -msgstr "공간 ì •ë³´ 없습니다" +msgstr "공간 ì •ë³´ ì—†ìŒ" #, c-format msgid "Free space: %s / %s (%d%%)" @@ -3512,7 +3499,7 @@ msgid "Attributes: %s" msgstr "ì†ì„±: %s" msgid "Attributes: unavailable" -msgstr "ì†ì„±: ì‚¬ìš©í• ìˆ˜ 없습니다" +msgstr "ì†ì„±: ì‚¬ìš©í• ìˆ˜ ì—†ìŒ" #, c-format msgid "Mode: %s (%04o)" @@ -3661,13 +3648,13 @@ msgid "[dev]" msgstr "[dev]" msgid "UP--DIR" -msgstr "ìƒìœ„ ë””ë ‰í„°ë¦¬" +msgstr "ìƒìœ„--DIR" msgid "SYMLINK" msgstr "심볼ë¦ë§í¬" msgid "SUB-DIR" -msgstr "하위 ë””ë ‰í„°ë¦¬" +msgstr "하위--DIR" msgid "<readlink failed>" msgstr "<readlink failed>" @@ -3681,7 +3668,7 @@ msgid "Panelize" msgstr "íŒ¨ë„ í¬ê¸°ì¡°ì •" msgid "Unknown tag on display format:" -msgstr "표시 형ì‹ì˜ ì•Œ 수 없는 태그:" +msgstr "ë””ìŠ¤í”Œë ˆì´ í˜•ì‹ì˜ ì•Œ 수 없는 태그:" msgid "&Files only" msgstr "파ì¼ë§Œ(&F)" @@ -3702,7 +3689,7 @@ msgid "Do you really want to execute?" msgstr "ì •ë§ë¡œ ì‹¤í–‰í•˜ì‹œê² ìŠµë‹ˆê¹Œ?" msgid "Cannot read directory contents" -msgstr "ë””ë ‰í„°ë¦¬ ë‚´ìš©ì„ ì½ì„ 수 없습니다" +msgstr "ë””ë ‰í„°ë¦¬ ë‚´ìš©ì„ ì½ì„ 수 ì—†ìŒ" msgid "User supplied format looks invalid, reverting to default." msgstr "사용ìžê°€ ì œê³µí•œ 형ì‹ì´ 잘못ë˜ì–´ 기본값으로 ë˜ëŒë¦½ë‹ˆë‹¤." @@ -3740,11 +3727,11 @@ msgid "" "%s" msgstr "" "확장 패ë„í¬ê¸°:\n" -"하위 í”„ë¡œì„¸ìŠ¤ì˜ stdoutì—ì„œ ​​ë°ì´í„°ë¥¼ ì½ì„ 수 없습니다:\n" +"하위 í”„ë¡œì„¸ìŠ¤ì˜ stdoutì—ì„œ ​​ë°ì´í„°ë¥¼ ì½ì„ 수 ì—†ìŒ:\n" "%s" msgid "Cannot run external panelize in a non-local directory" -msgstr "ë¡œì»¬ì´ ì•„ë‹Œ ë””ë ‰í„°ë¦¬ì—ì„œ 확장 패ë„í¬ê¸°ë¥¼ ì‹¤í–‰í• ìˆ˜ 없습니다" +msgstr "ë¡œì»¬ì´ ì•„ë‹Œ ë””ë ‰í„°ë¦¬ì—ì„œ 확장 패ë„í¬ê¸°ë¥¼ ì‹¤í–‰í• ìˆ˜ ì—†ìŒ" msgid "Modified git files" msgstr "ìˆ˜ì •ëœ git 파ì¼" @@ -3763,7 +3750,7 @@ msgid "" "Cannot open the %s file for writing:\n" "%s\n" msgstr "" -"쓰기 위한 íŒŒì¼ %sì„(를) ì—´ 수 없습니다:\n" +"쓰기 위한 íŒŒì¼ %sì„(를) ì—´ 수 ì—†ìŒ:\n" "%s\n" #, c-format @@ -3779,7 +3766,7 @@ msgid "" "Cannot stat the destination\n" "%s" msgstr "" -"ëŒ€ìƒ ì •ë³´ë¥¼ ë³¼ 수 없습니다\n" +"ëŒ€ìƒ ì •ë³´ë¥¼ ë³¼ 수 ì—†ìŒ\n" "%s" #, c-format @@ -3806,7 +3793,7 @@ msgid "" "Cannot write to the %s file:\n" "%s\n" msgstr "" -"%s 파ì¼ì— 쓸 수 없습니다:\n" +"%s 파ì¼ì— 쓸 수 ì—†ìŒ:\n" "%s\n" msgid "Help file format error\n" @@ -3817,7 +3804,7 @@ msgstr "내부 버그: ë§í¬ ì˜ì—ì´ ì–‘ë°©í–¥ìœ¼ë¡œ 시작ë¨" #, c-format msgid "Cannot find node %s in help file" -msgstr "ë„ì›€ë§ íŒŒì¼ì—ì„œ %s 노드를 ì°¾ì„ ìˆ˜ 없습니다" +msgstr "ë„ì›€ë§ íŒŒì¼ì—ì„œ %s 노드를 ì°¾ì„ ìˆ˜ ì—†ìŒ" msgid "Help" msgstr "ë„움ë§" @@ -3855,7 +3842,7 @@ msgstr "" "마찬가지로 기다리ì‹ì‹œì˜¤." msgid "Cannot accept this key" -msgstr "ì´ í‚¤ë¥¼ 수ë½í• 수 없습니다" +msgstr "ì´ í‚¤ë¥¼ 수ë½í• 수 ì—†ìŒ" #, c-format msgid "You have entered \"%s\"" @@ -3918,7 +3905,7 @@ msgid "" "%s\n" msgstr "" "\n" -"닫기 ì‹œ 실패함:\n" +"닫는 ë™ì•ˆ 실패:\n" "%s\n" msgid "Choose codepage" @@ -3938,12 +3925,12 @@ msgid "" "Cannot save file %s:\n" "%s" msgstr "" -"파ì¼ì„ ì €ìž¥í• ìˆ˜ 없습니다%s:\n" +"파ì¼ì„ ì €ìž¥í• ìˆ˜ ì—†ìŒ%s:\n" "%s" #, c-format msgid "Cannot open named pipe %s\n" -msgstr "ëª…ëª…ëœ %s 파ì´í”„를 ì—´ 수 없습니다\n" +msgstr "ëª…ëª…ëœ %s 파ì´í”„를 ì—´ 수 ì—†ìŒ\n" msgid "The shell is still active. Quit anyway?" msgstr "ì…¸ì´ ì•„ì§ í™œì„± ìƒíƒœìž…니다. ê·¸ëž˜ë„ ë낼까요?" @@ -4018,7 +4005,7 @@ msgid "Data types:" msgstr "ë°ì´í„° ìœ í˜•:" msgid "Home directory:" -msgstr "홈 ë””ë ‰í„°ë¦¬ :" +msgstr "홈 ë””ë ‰í„°ë¦¬:" msgid "Profile root directory:" msgstr "프로필 루트 ë””ë ‰í„°ë¦¬:" @@ -4075,15 +4062,15 @@ msgstr "íŒŒì¼ í™•ìž¥ìž íŒŒì¼ì˜ í˜•ì‹ ì˜¤ë¥˜" #, c-format msgid "The %%var macro has no default" -msgstr "%%var 매í¬ë¡œì— ê¸°ë³¸ê°’ì´ ì—†ìŠµë‹ˆë‹¤" +msgstr "%%var 매í¬ë¡œì— ê¸°ë³¸ê°’ì´ ì—†ìŒ" #, c-format msgid "The %%var macro has no variable" -msgstr "%%var 매í¬ë¡œì— 변수가 없습니다" +msgstr "%%var 매í¬ë¡œì— 변수가 ì—†ìŒ" #, c-format msgid "No suitable entries found in %s" -msgstr "%sì—ì„œ 해당 í•ëª©ì„ ì°¾ì„ ìˆ˜ 없습니다" +msgstr "%sì—ì„œ 해당 í•ëª©ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ" msgid "User menu" msgstr "ì‚¬ìš©ìž ë©”ë‰´" @@ -4134,7 +4121,7 @@ msgid "" "%s" msgstr "" "%s\n" -"파ì¼ì˜ 예기치 ì•Šì€ ë" +"예기치 ì•Šì€ íŒŒì¼ì˜ ë" msgid "Inconsistent archive" msgstr "ì¼ê´€ì„± 없는 압축파ì¼" @@ -4145,7 +4132,7 @@ msgid "" "%s:\n" "%s" msgstr "" -"%s 압축파ì¼ì„ ì—´ 수 없습니다\n" +"%s 압축파ì¼ì„ ì—´ 수 ì—†ìŒ\n" "%s:\n" "%s" @@ -4157,66 +4144,30 @@ msgstr "" "EXTFS ê°€ìƒ íŒŒì¼ ì‹œìŠ¤í…œ:\n" "%s" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "ê²½ê³ : %s ë””ë ‰í„°ë¦¬ë¥¼ ì—´ 수 없습니다\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish : %sì—ì„œ ì—°ê²° í•´ì œ 중" - -msgid "fish: Waiting for initial line..." -msgstr "fish: 초기화 ë¼ì¸ì„ 기다리는 중..." - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "죄송합니다. ì§€ê¸ˆì€ ë¹„ë°€ë²ˆí˜¸ ì¸ì¦ ì—°ê²°ì„ ì‚¬ìš©í• ìˆ˜ 없습니다." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: %sì— ëŒ€í•œ 비밀번호가 필요함" - -msgid "fish: Sending password..." -msgstr "fish: 비밀번호 보내기..." - -msgid "fish: Sending initial line..." -msgstr "fish: 초기화 ë¼ì¸ 보내기..." - -msgid "fish: Handshaking version..." -msgstr "fish: 핸드셰ì´í‚¹ ë²„ì „..." - -msgid "fish: Getting host info..." -msgstr "fish: 호스트 ì •ë³´ ê°€ì ¸ì˜¤ëŠ” 중..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: %s ë””ë ‰í„°ë¦¬ ì½ëŠ” 중..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" +msgstr "" +"EXTFS ê°€ìƒ íŒŒì¼ì‹œìŠ¤í…œ:\n" +"íŒŒì¼ ì´ë¦„ì´ ì˜¬ë°”ë¥´ì§€ 않습니다" -#, c-format -msgid "%s: done." -msgstr "%s: 완료." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" +"EXTFS ê°€ìƒ íŒŒì¼ì‹œìŠ¤í…œ:\n" +"압축 íŒŒì¼ ì´ë¦„ì´ ì˜¬ë°”ë¥´ì§€ 않습니다" -#, c-format -msgid "%s: failure" -msgstr "%s: 실패" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" +"EXTFS ê°€ìƒ íŒŒì¼ì‹œìŠ¤í…œ:\n" +"ëª…ë ¹ì„ êµ¬ì„±í• ìˆ˜ 없습니다" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: %s ì €ìž¥: ëª…ë ¹ 보내기..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: 로컬 ì½ê¸° 실패, 0 보내기" - -msgid "fish: storing file" -msgstr "fish: íŒŒì¼ ì €ìž¥ì¤‘" - -msgid "Aborting transfer..." -msgstr "ì „ì†¡ì„ ì¤‘ë‹¨í•˜ëŠ” 중..." - -msgid "Error reported after abort." -msgstr "중단 후 오류가 ë³´ê³ ë¨" - -msgid "Aborted transfer would be successful." -msgstr "ì¤‘ë‹¨ëœ ì „ì†¡ì´ ì„±ê³µì 으로 완료ë˜ì—ˆì„ 수 있ìŒ." +msgid "Warning: cannot open %s directory\n" +msgstr "ê²½ê³ : %s ë””ë ‰í„°ë¦¬ë¥¼ ì—´ 수 ì—†ìŒ\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4269,11 +4220,11 @@ msgstr "ftpfs: 서버 ì—°ê²° 실패: %s" #, c-format msgid "Waiting to retry... %d (Control-G to cancel)" -msgstr "ìž¬ì‹œë„ ëŒ€ê¸° 중... %d(Control-Gê°€ 취소ë¨)" +msgstr "ìž¬ì‹œë„ ëŒ€ê¸° 중... %d(ì·¨ì†Œí•˜ë ¤ë©´ Control-G)" #, c-format msgid "ftpfs: could not make address-to-name translation: %s" -msgstr "ftpfs: 주소를 ì´ë¦„으로 ë³€í™˜í• ìˆ˜ 없습니다: %s" +msgstr "ftpfs: 주소를 ì´ë¦„으로 ë³€í™˜í• ìˆ˜ ì—†ìŒ: %s" #, c-format msgid "ftpfs: try reconnect to server, attempt %u" @@ -4281,20 +4232,20 @@ msgstr "ftpfs: ì„œë²„ì— ë‹¤ì‹œ ì—°ê²° ì‹œë„, %u ì‹œë„" #, c-format msgid "ftpfs: could not get socket name: %s" -msgstr "ftpfs: 소켓 ì´ë¦„ì„ ê°€ì ¸ì˜¬ 수 없습니다: %s" +msgstr "ftpfs: 소켓 ì´ë¦„ì„ ê°€ì ¸ì˜¬ 수 ì—†ìŒ: %s" msgid "ftpfs: could not reconnect to server" -msgstr "ftpfs: ì„œë²„ì— ë‹¤ì‹œ ì—°ê²°í• ìˆ˜ 없습니다" +msgstr "ftpfs: ì„œë²„ì— ë‹¤ì‹œ ì—°ê²°í• ìˆ˜ ì—†ìŒ" msgid "ftpfs: invalid address family" -msgstr "ftpfs: ìž˜ëª»ëœ ì£¼ì†Œ 패밀리" +msgstr "ftpfs: ìž˜ëª»ëœ ì£¼ì†Œ 계열" #, c-format msgid "ftpfs: could not create socket: %s" -msgstr "ftpfs: ì†Œì¼“ì„ ë§Œë“¤ 수 없습니다: %s" +msgstr "ftpfs: ì†Œì¼“ì„ ë§Œë“¤ 수 ì—†ìŒ: %s" msgid "ftpfs: could not setup passive mode" -msgstr "ftpfs: 패시브 모드를 ì„¤ì •í• ìˆ˜ 없습니다" +msgstr "ftpfs: 패시브 모드를 ì„¤ì •í• ìˆ˜ ì—†ìŒ" msgid "ftpfs: aborting transfer." msgstr "ftpfs: ì „ì†¡ 중단." @@ -4310,10 +4261,10 @@ msgid "ftpfs: CWD failed." msgstr "ftpfs: CWD 실패." msgid "ftpfs: couldn't resolve symlink" -msgstr "ftpfs: 심볼ë¦ë§í¬ë¥¼ 확ì¸í• 수 없습니다" +msgstr "ftpfs: ì‹¬ë³¼ë¦ ë§í¬ë¥¼ 확ì¸í• 수 ì—†ìŒ" msgid "Resolving symlink..." -msgstr "심볼ë¦ë§í¬ í•´ê²° 중..." +msgstr "ì‹¬ë³¼ë¦ ë§í¬ í•´ê²° 중..." #, c-format msgid "ftpfs: Reading FTP directory %s... %s%s" @@ -4323,10 +4274,18 @@ msgid "(strict rfc959)" msgstr "(엄격하게 rfc959를 따름)" msgid "(chdir first)" -msgstr "(ë¨¼ì € ë””ë ‰í„°ë¦¬ 변경)" +msgstr "(chdir ë¨¼ì €)" msgid "ftpfs: failed; nowhere to fallback to" -msgstr "ftpfs: 실패함, ì–´ë””ì—ì„œë„ fallbackí• ìˆ˜ 없습니다" +msgstr "ftpfs: 실패함, ì–´ë””ì—ì„œë„ fallbackí• ìˆ˜ ì—†ìŒ" + +#, c-format +msgid "%s: failure" +msgstr "%s: 실패" + +#, c-format +msgid "%s: done." +msgstr "%s: 완료." msgid "ftpfs: storing file" msgstr "ftpfs: íŒŒì¼ ì €ìž¥ì¤‘" @@ -4348,7 +4307,7 @@ msgstr "" #, c-format msgid "%s: Warning: file %s not found\n" -msgstr "%s: ê²½ê³ : %s 파ì¼ì„ ì°¾ì„ ìˆ˜ 없습니다\n" +msgstr "%s: ê²½ê³ : %s 파ì¼ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ\n" #, c-format msgid "" @@ -4388,7 +4347,7 @@ msgid "sftp: making connection to %s" msgstr "sftp: %sì— ì—°ê²°" msgid "sftp: connection interrupted by user" -msgstr "sftp: 사용ìžì— ì˜í•´ ì—°ê²°ì´ ì¤‘ë‹¨ë¨" +msgstr "sftp: 사용ìžê°€ ì—°ê²°ì„ ì¤‘ë‹¨í•¨" #, c-format msgid "sftp: connection to server failed: %s" @@ -4398,7 +4357,7 @@ msgid "sftp: found host key of unsupported type: RSA1" msgstr "sftp: 지ì›ë˜ì§€ 않는 ìœ í˜•ì˜ í˜¸ìŠ¤íŠ¸ 키를 찾았습니다: RSA1" msgid "sftp: unknown host key type:" -msgstr "sftp: 호스트 키 ìœ í˜•ì„ ì•Œ 수 없습니다:" +msgstr "sftp: 호스트 키 ìœ í˜•ì„ ì•Œ 수 ì—†ìŒ:" #, c-format msgid "" @@ -4411,13 +4370,13 @@ msgstr "" "ì˜êµ¬ì 으로 추가ë˜ì—ˆìŠµë‹ˆë‹¤." msgid "sftp: cannot get the remote host key" -msgstr "sftp: ì›ê²© 호스트 키를 ê°€ì ¸ì˜¬ 수 없습니다" +msgstr "sftp: ì›ê²© 호스트 키를 ê°€ì ¸ì˜¬ 수 ì—†ìŒ" msgid "sftp: unsupported key type, can't check remote host key" -msgstr "sftp: 지ì›ë˜ì§€ 않는 키 ìœ í˜•, ì›ê²© 호스트 키를 확ì¸í• 수 없습니다" +msgstr "sftp: 지ì›ë˜ì§€ 않는 키 ìœ í˜•, ì›ê²© 호스트 키를 확ì¸í• 수 ì—†ìŒ" msgid "sftp: can't compute host key fingerprint hash" -msgstr "sftp: 호스트 키 지문 해시를 ê³„ì‚°í• ìˆ˜ 없습니다" +msgstr "sftp: 호스트 키 지문 해시를 ê³„ì‚°í• ìˆ˜ ì—†ìŒ" #, c-format msgid "" @@ -4468,7 +4427,7 @@ msgid "sftp: failure establishing SSH session" msgstr "sftp: SSH ì„¸ì…˜ì„ ì„¤ì •í•˜ì§€ 못했습니다" msgid "sftp: No file handler data present for reading file" -msgstr "sftp: 파ì¼ì„ ì½ê¸° 위한 íŒŒì¼ ì²˜ë¦¬ê¸° ë°ì´í„°ê°€ 없습니다" +msgstr "sftp: 파ì¼ì„ ì½ê¸° 위한 íŒŒì¼ ì²˜ë¦¬ê¸° ë°ì´í„°ê°€ ì—†ìŒ" #, c-format msgid "sftp: socket error: %s" @@ -4481,8 +4440,54 @@ msgstr "sftp: (Ctrl-G break) 목ë¡... %s" msgid "sftp: Listing done." msgstr "sftp: ëª©ë¡ ìž‘ì„± 완료." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "ì…¸: %s ì—°ê²° ëŠëŠ” 중" + +msgid "shell: Waiting for initial line..." +msgstr "ì…¸: 초기 í–‰ 기다리는 중..." + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "죄송합니다. ì§€ê¸ˆì€ ë¹„ë°€ë²ˆí˜¸ ì¸ì¦ ì—°ê²°ì„ ì‚¬ìš©í• ìˆ˜ 없습니다." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "ì…¸: %s 암호가 필요합니다" + +msgid "shell: Sending password..." +msgstr "ì…¸: 암호 보내는 중..." + +msgid "shell: Sending initial line..." +msgstr "ì…¸: 초기 í–‰ 보내는 중..." + +msgid "shell: Getting host info..." +msgstr "ì…¸: 호스트 ì •ë³´ ê°€ì ¸ì˜¤ëŠ” 중..." + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "ì…¸: %s ë””ë ‰í„°ë¦¬ ì½ëŠ” 중..." + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "ì…¸: %s ì €ìž¥: ëª…ë ¹ 보내는 중..." + +msgid "shell: Local read failed, sending zeros" +msgstr "ì…¸: 로컬 ì½ê¸°ë¥¼ 실패했습니다. 0ê°’ 보내는 중" + +msgid "shell: storing file" +msgstr "ì…¸: íŒŒì¼ ì €ìž¥ 중" + +msgid "Aborting transfer..." +msgstr "ì „ì†¡ì„ ì¤‘ë‹¨í•˜ëŠ” 중..." + +msgid "Error reported after abort." +msgstr "중단 후 오류가 ë³´ê³ ë¨" + +msgid "Aborted transfer would be successful." +msgstr "ì¤‘ë‹¨ëœ ì „ì†¡ì´ ì„±ê³µì 으로 완료ë˜ì—ˆì„ 수 있ìŒ." + msgid "Inconsistent tar archive" -msgstr "ìž˜ëª»ëœ tar 압축파ì¼" +msgstr "ìž˜ëª»ëœ tar 압축 파ì¼" msgid "Unexpected EOF on archive file" msgstr "압축 파ì¼ì— 예기치 ì•Šì€ EOFê°€ 있ìŒ" @@ -4492,7 +4497,7 @@ msgid "" "Cannot open tar archive\n" "%s" msgstr "" -"tar 압축파ì¼ì„ ì—´ 수 없습니다\n" +"tar 압축 파ì¼ì„ ì—´ 수 ì—†ìŒ\n" "%s" #, c-format @@ -4500,9 +4505,11 @@ msgid "" "%s\n" "doesn't look like a tar archive" msgstr "" +"%s\n" +"tar 압축 파ì¼ì²˜ëŸ¼ ë³´ì´ì§€ 않습니다" msgid "tar: mc_lseek not stopped at a record boundary" -msgstr "" +msgstr "tar: mc_lseekê°€ ë ˆì½”ë“œ 경계ì—ì„œ 멈추지 않았습니다" msgid "undelfs: error" msgstr "unelfs: 오류" @@ -4530,7 +4537,7 @@ msgid "while calling ext2_block_iterate %d" msgstr "ext2_block_iterate %dì„(를) 호출하는 중" msgid "no more memory while reallocating array" -msgstr "ë°°ì—´ì„ ìž¬í• ë‹¹í•˜ëŠ” ë™ì•ˆ 메모리가 ë” ì´ìƒ 없습니다" +msgstr "ë°°ì—´ì„ ìž¬í• ë‹¹í•˜ëŠ” ë™ì•ˆ 메모리가 ë” ì´ìƒ ì—†ìŒ" #, c-format msgid "while doing inode scan %d" @@ -4538,7 +4545,7 @@ msgstr "inode 스캔 %d를 수행하는 ë™ì•ˆ" #, c-format msgid "Cannot open file %s" -msgstr "%s 파ì¼ì„ ì—´ 수 없습니다" +msgstr "%s 파ì¼ì„ ì—´ 수 ì—†ìŒ" msgid "undelfs: reading inode bitmap..." msgstr "unelfs: inode 비트맵 ì½ëŠ” 중..." @@ -4548,7 +4555,7 @@ msgid "" "Cannot load inode bitmap from:\n" "%s" msgstr "" -"ë‹¤ìŒ ìœ„ì¹˜ì—ì„œ inode ë¹„íŠ¸ë§µì„ ë¡œë“œí• ìˆ˜ 없습니다:\n" +"ë‹¤ìŒ ìœ„ì¹˜ì—ì„œ inode ë¹„íŠ¸ë§µì„ ë¡œë“œí• ìˆ˜ ì—†ìŒ:\n" "%s" msgid "undelfs: reading block bitmap..." @@ -4559,7 +4566,7 @@ msgid "" "Cannot load block bitmap from:\n" "%s" msgstr "" -"ë¸”ë¡ ë¹„íŠ¸ë§µì„ ë¡œë“œí• ìˆ˜ 없습니다:\n" +"ë¸”ë¡ ë¹„íŠ¸ë§µì„ ë¡œë“œí• ìˆ˜ ì—†ìŒ:\n" "%s" msgid "vfs_info is not fs!" @@ -4573,7 +4580,7 @@ msgstr "블ë¡ì„ 반복하는 ë™ì•ˆ" #, c-format msgid "Cannot open file \"%s\"" -msgstr "%s 파ì¼ì„ ì—´ 수 없습니다" +msgstr "\"%s\" 파ì¼ì„ ì—´ 수 ì—†ìŒ" msgid "Ext2lib error" msgstr "Ext2lib 오류" @@ -4582,7 +4589,7 @@ msgid "Invalid value" msgstr "ìž˜ëª»ëœ ê°’" msgid "File was modified. Save with exit?" -msgstr "파ì¼ì´ ìˆ˜ì •ë˜ì—ˆìŠµë‹ˆë‹¤. 종료와 함께 ì €ìž¥í•˜ì‹œê² ìŠµë‹ˆê¹Œ?" +msgstr "파ì¼ì´ ìˆ˜ì •ë˜ì—ˆìŠµë‹ˆë‹¤. ì €ìž¥ 후 ë‚˜ê°€ì‹œê² ìŠµë‹ˆê¹Œ?" msgid "&Cancel quit" msgstr "ë내기 취소(&C)" @@ -4595,13 +4602,13 @@ msgstr "" "ìˆ˜ì •ëœ íŒŒì¼ì„ ì €ìž¥í•˜ì‹œê² ìŠµë‹ˆê¹Œ?" msgid "&Line number" -msgstr "줄 번호(&L)" +msgstr "í–‰ 번호(&L)" msgid "Pe&rcents" msgstr "í¼ì„¼íŠ¸(&R)" msgid "&Decimal offset" -msgstr "10 진수 오프셋(&D)" +msgstr "10진수 오프셋(&D)" msgid "He&xadecimal offset" msgstr "16진수 오프셋(&X)" @@ -4610,7 +4617,7 @@ msgid "Goto" msgstr "건너뛰기" msgid "ButtonBar|Ascii" -msgstr "Ascii" +msgstr "아스키" msgid "ButtonBar|HxSrch" msgstr "16비트 검색" @@ -4622,16 +4629,16 @@ msgid "ButtonBar|Wrap" msgstr "줄바꿈" msgid "ButtonBar|Hex" -msgstr " 16비트" +msgstr "16비트" msgid "ButtonBar|Goto" -msgstr " Goto" +msgstr "건너뛰기" msgid "ButtonBar|Raw" -msgstr " ì›ë³¸ 형ì‹" +msgstr "ì›ë³¸ 형ì‹" msgid "ButtonBar|Parse" -msgstr " 구문 분ì„" +msgstr "분ì„" msgid "ButtonBar|Unform" msgstr " 형ì‹í™”ë˜ì§€ ì•ŠìŒ" @@ -4644,7 +4651,7 @@ msgid "" "Failed to read data from child stdout:\n" "%s" msgstr "" -"하위 í”„ë¡œì„¸ìŠ¤ì˜ stdoutì—ì„œ ​​ë°ì´í„°ë¥¼ ì½ì„ 수 없습니다:\n" +"하위 í”„ë¡œì„¸ìŠ¤ì˜ stdoutì—ì„œ ​​ë°ì´í„°ë¥¼ ì½ì„ 수 ì—†ìŒ:\n" "%s" #, c-format @@ -4662,7 +4669,7 @@ msgid "" "Cannot save file:\n" "%s" msgstr "" -"파ì¼ì„ ì €ìž¥í• ìˆ˜ 없습니다:\n" +"파ì¼ì„ ì €ìž¥í• ìˆ˜ ì—†ìŒ:\n" "%s" msgid "View: " @@ -4673,18 +4680,18 @@ msgid "" "Cannot open \"%s\"\n" "%s" msgstr "" -"%sì„(를) ì—´ 수 없습니다\n" +"\"%s\"ì„(를) ì—´ 수 ì—†ìŒ\n" "%s" msgid "Cannot view: not a regular file" -msgstr "ë³¼ 수 없습니다: ì¼ë°˜ 파ì¼ì´ 아님" +msgstr "ë³¼ 수 ì—†ìŒ: ì¼ë°˜ 파ì¼ì´ 아님" #, c-format msgid "" "Cannot open \"%s\" in parse mode\n" "%s" msgstr "" -"%sì„(를) 구문 모드ì—ì„œ ì—´ 수 없습니다\n" +"\"%s\"ì„(를) ë¶„ì„ ëª¨ë“œì—ì„œ ì—´ 수 ì—†ìŒ\n" "%s" msgid "Search done" @@ -4694,4 +4701,4 @@ msgid "Continue from beginning?" msgstr "처ìŒë¶€í„° 계ì†í•˜ì‹œê² 습니까?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" -msgstr "/ftp://some.host/editme.txtì˜ ë¡œì»¬ ë³µì‚¬ë³¸ì„ ê°€ì ¸ì˜¬ 수 없습니다" +msgstr "/ftp://some.host/editme.txtì˜ ë¡œì»¬ ë³µì‚¬ë³¸ì„ ê°€ì ¸ì˜¬ 수 ì—†ìŒ" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Cornish (http://app.transifex.com/mc/mc/language/kw/)\n" @@ -709,7 +709,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1545,7 +1546,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3922,65 +3923,23 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "" - -msgid "fish: Sending password..." -msgstr "" - -msgid "fish: Sending initial line..." -msgstr "" - -msgid "fish: Handshaking version..." -msgstr "" - -msgid "fish: Getting host info..." -msgstr "" - -#, c-format -msgid "fish: Reading directory %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#, c-format -msgid "%s: done." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "%s: failure" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "" - -msgid "fish: Local read failed, sending zeros" -msgstr "" - -msgid "fish: storing file" -msgstr "" - -msgid "Aborting transfer..." -msgstr "" - -msgid "Error reported after abort." -msgstr "" - -msgid "Aborted transfer would be successful." +msgid "Warning: cannot open %s directory\n" msgstr "" #, c-format @@ -4093,6 +4052,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "" + +#, c-format +msgid "%s: done." +msgstr "" + msgid "ftpfs: storing file" msgstr "" @@ -4226,6 +4193,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "" + +msgid "Error reported after abort." +msgstr "" + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "" @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Mantas KriauÄiÅ«nas Baltix <mantas@akl.lt>, 2020\n" "Language-Team: Lithuanian (http://app.transifex.com/mc/mc/language/lt/)\n" @@ -734,7 +734,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1589,7 +1590,7 @@ msgstr "" "Lengvas vartoti teksto redaktorius\n" "sukurtas Midnight Commander aplinkai." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -4030,66 +4031,24 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Ä®spÄ—jimas: nepavyko pereiti į aplankÄ… %s\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: atsijungiama nuo %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: laukiama pradinÄ—s eilutÄ—s..." - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "Å iuo metu slaptažodžių apsaugotų prisijungimų atlikti negalima." - -#, c-format -msgid "fish: Password is required for %s" +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -msgid "fish: Sending password..." -msgstr "fish: siunÄiamas slaptažodis..." - -msgid "fish: Sending initial line..." -msgstr "fish: siunÄiama pradinÄ— linija..." - -msgid "fish: Handshaking version..." -msgstr "fish: derinamos versijos..." - -msgid "fish: Getting host info..." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: atveriamas aplankas %s..." - -#, c-format -msgid "%s: done." -msgstr "%s: atlikta." - -#, c-format -msgid "%s: failure" -msgstr "%s: nepavyko" - -#, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: „%s“ siuntimas: siunÄiamas slaptažodis..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: vietinis skaitymas nepavyko, siunÄiami nuliai" - -msgid "fish: storing file" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" -msgid "Aborting transfer..." -msgstr "Nutraukiamas siuntimas..." - -msgid "Error reported after abort." -msgstr "Po nutraukties praneÅ¡ta klaida." - -msgid "Aborted transfer would be successful." -msgstr "Nutrauktas siuntimas bÅ«tų sÄ—kmingas." +#, c-format +msgid "Warning: cannot open %s directory\n" +msgstr "Ä®spÄ—jimas: nepavyko pereiti į aplankÄ… %s\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4201,6 +4160,14 @@ msgstr "(keiÄiamas katalogas)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: nepavyko; nÄ—ra kur grįžti" +#, c-format +msgid "%s: failure" +msgstr "%s: nepavyko" + +#, c-format +msgid "%s: done." +msgstr "%s: atlikta." + msgid "ftpfs: storing file" msgstr "" @@ -4338,6 +4305,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "Å iuo metu slaptažodžių apsaugotų prisijungimų atlikti negalima." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "Nutraukiamas siuntimas..." + +msgid "Error reported after abort." +msgstr "Po nutraukties praneÅ¡ta klaida." + +msgid "Aborted transfer would be successful." +msgstr "Nutrauktas siuntimas bÅ«tų sÄ—kmingas." + msgid "Inconsistent tar archive" msgstr "Nevientisas tar archyvas" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Slava Zanko <slavazanko@gmail.com>, 2011\n" "Language-Team: Latvian (http://app.transifex.com/mc/mc/language/lv/)\n" @@ -707,7 +707,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1543,7 +1544,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3940,68 +3941,25 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: Atvienojamies no %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: GaidÄm sÄkotnÄ“jo lÄ«niju..." - -msgid "Sorry, we cannot do password authenticated connections for now." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -"Piedodiet, mÄ“s patreiz nevaram veikt ar paroli autorizÄ“tus savienojumus." -#, c-format -msgid "fish: Password is required for %s" +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -msgid "fish: Sending password..." -msgstr "fish: SÅ«tam paroli..." - -msgid "fish: Sending initial line..." -msgstr "fish: SÅ«tam sÄkotnÄ“jo lÄ«niju..." - -msgid "fish: Handshaking version..." -msgstr "fish: RokspieÅ¡anas versija..." - -msgid "fish: Getting host info..." +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: LasÄm direktoriju %s..." - -#, c-format -msgid "%s: done." -msgstr "%s: izdarÄ«ts." - -#, c-format -msgid "%s: failure" -msgstr "%s: neveiksme" - -#, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: glabÄjam %s: sutÄm komandu..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: LokÄlÄ lasÄ«Å¡ana kļūdaina, sÅ«tam nulles" - -msgid "fish: storing file" +msgid "Warning: cannot open %s directory\n" msgstr "" -msgid "Aborting transfer..." -msgstr "PÄtraucam pÄrraidÄ«Å¡anu..." - -msgid "Error reported after abort." -msgstr "Kļūda paziņota pÄ“c pÄtraukÅ¡anas." - -msgid "Aborted transfer would be successful." -msgstr "PÄtraukÄ pÄrraidÄ«Å¡ana varÄ“tu bÅ«t veiksmÄ«ga" - #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: AtvienoÅ¡anÄs no %s" @@ -4112,6 +4070,14 @@ msgstr "(chdir vispirms)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: neizdevÄs; nav kur atkrist" +#, c-format +msgid "%s: failure" +msgstr "%s: neveiksme" + +#, c-format +msgid "%s: done." +msgstr "%s: izdarÄ«ts." + msgid "ftpfs: storing file" msgstr "" @@ -4249,6 +4215,53 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" +"Piedodiet, mÄ“s patreiz nevaram veikt ar paroli autorizÄ“tus savienojumus." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "PÄtraucam pÄrraidÄ«Å¡anu..." + +msgid "Error reported after abort." +msgstr "Kļūda paziņota pÄ“c pÄtraukÅ¡anas." + +msgid "Aborted transfer would be successful." +msgstr "PÄtraukÄ pÄrraidÄ«Å¡ana varÄ“tu bÅ«t veiksmÄ«ga" + msgid "Inconsistent tar archive" msgstr "NeatbilstÄ«gs tar arhÄ«vs" @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: mc 4.8.30\n" +"Project-Id-Version: mc 4.8.31\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,15 +17,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" # "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: lib/charsets.c:219 +#: lib/charsets.c:220 msgid "Warning: cannot load codepages list" msgstr "" -#: lib/charsets.c:222 src/filemanager/boxes.c:387 +#: lib/charsets.c:223 src/filemanager/boxes.c:387 msgid "7-bit ASCII" msgstr "" -#: lib/charsets.c:317 lib/charsets.c:328 +#: lib/charsets.c:318 lib/charsets.c:329 #, c-format msgid "Cannot translate from %s to %s" msgstr "" @@ -123,11 +123,11 @@ msgstr "" msgid "Invalid token number %d" msgstr "" -#: lib/search/regex.c:340 lib/search/regex.c:839 src/filemanager/ext.c:758 +#: lib/search/regex.c:340 lib/search/regex.c:838 src/filemanager/ext.c:775 msgid "Regular expression error" msgstr "" -#: lib/search/search.c:55 src/diffviewer/ydiff.c:2423 +#: lib/search/search.c:55 src/diffviewer/ydiff.c:2347 msgid "No&rmal" msgstr "" @@ -143,21 +143,21 @@ msgstr "" msgid "Wil&dcard search" msgstr "" -#: lib/skin/common.c:133 +#: lib/skin/common.c:134 #, c-format msgid "" "Unable to load '%s' skin.\n" "Default skin has been loaded" msgstr "" -#: lib/skin/common.c:143 +#: lib/skin/common.c:144 #, c-format msgid "" "Unable to parse '%s' skin.\n" "Default skin has been loaded" msgstr "" -#: lib/skin/common.c:155 +#: lib/skin/common.c:156 #, c-format msgid "" "Unable to use '%s' skin with true colors support:\n" @@ -165,7 +165,7 @@ msgid "" "Default skin has been loaded" msgstr "" -#: lib/skin/common.c:167 +#: lib/skin/common.c:168 #, c-format msgid "" "Unable to use '%s' skin with 256 colors support\n" @@ -602,31 +602,31 @@ msgid "" "Check the TERM environment variable.\n" msgstr "" -#: lib/util.c:351 +#: lib/util.c:355 msgid "B" msgstr "" -#: lib/util.c:356 +#: lib/util.c:360 msgid "kB" msgstr "" -#: lib/util.c:356 +#: lib/util.c:360 msgid "KiB" msgstr "" -#: lib/util.c:361 +#: lib/util.c:365 msgid "MB" msgstr "" -#: lib/util.c:361 +#: lib/util.c:365 msgid "MiB" msgstr "" -#: lib/util.c:366 +#: lib/util.c:370 msgid "GB" msgstr "" -#: lib/util.c:366 +#: lib/util.c:370 msgid "GiB" msgstr "" @@ -750,44 +750,44 @@ msgstr "" msgid "Do you want clean this history?" msgstr "" -#: lib/widget/listbox.c:325 src/diffviewer/ydiff.c:3090 src/editor/edit.c:369 -#: src/editor/editcmd.c:180 src/editor/editcmd.c:203 src/editor/editcmd.c:1522 -#: src/editor/editcmd.c:1528 src/filemanager/cmd.c:145 +#: lib/widget/listbox.c:325 src/diffviewer/ydiff.c:3021 src/editor/edit.c:375 +#: src/editor/editcmd.c:180 src/editor/editcmd.c:203 src/editor/editcmd.c:1473 +#: src/editor/editcmd.c:1479 src/filemanager/cmd.c:145 #: src/filemanager/file.c:1014 src/filemanager/file.c:2022 #: src/filemanager/filegui.c:482 src/filemanager/filemanager.c:1056 #: src/filemanager/filemanager.c:1064 src/filemanager/hotlist.c:1164 #: src/filemanager/hotlist.c:1181 src/filemanager/panel.c:2961 #: src/filemanager/tree.c:826 src/subshell/common.c:1653 -#: src/vfs/sftpfs/connection.c:521 src/vfs/sftpfs/connection.c:533 -#: src/viewer/actions_cmd.c:644 src/viewer/actions_cmd.c:650 +#: src/vfs/sftpfs/connection.c:562 src/vfs/sftpfs/connection.c:574 +#: src/viewer/actions_cmd.c:634 src/viewer/actions_cmd.c:640 #: src/viewer/search.c:452 msgid "&Yes" msgstr "" -#: lib/widget/listbox.c:325 src/diffviewer/ydiff.c:3090 src/editor/edit.c:369 -#: src/editor/editcmd.c:180 src/editor/editcmd.c:1522 src/editor/editcmd.c:1528 +#: lib/widget/listbox.c:325 src/diffviewer/ydiff.c:3021 src/editor/edit.c:375 +#: src/editor/editcmd.c:180 src/editor/editcmd.c:1473 src/editor/editcmd.c:1479 #: src/filemanager/cmd.c:145 src/filemanager/file.c:1014 #: src/filemanager/file.c:2022 src/filemanager/filegui.c:484 #: src/filemanager/filemanager.c:1056 src/filemanager/filemanager.c:1064 #: src/filemanager/hotlist.c:1164 src/filemanager/hotlist.c:1181 #: src/filemanager/panel.c:2961 src/filemanager/tree.c:826 -#: src/subshell/common.c:1653 src/vfs/sftpfs/connection.c:521 -#: src/vfs/sftpfs/connection.c:533 src/viewer/actions_cmd.c:644 -#: src/viewer/actions_cmd.c:650 src/viewer/search.c:453 +#: src/subshell/common.c:1653 src/vfs/sftpfs/connection.c:562 +#: src/vfs/sftpfs/connection.c:574 src/viewer/actions_cmd.c:634 +#: src/viewer/actions_cmd.c:640 src/viewer/search.c:453 msgid "&No" msgstr "" #: lib/widget/quick.h:213 src/editor/editsearch.c:105 -#: src/editor/editsearch.c:1021 src/editor/editwidget.c:157 +#: src/editor/editsearch.c:1018 src/editor/editwidget.c:157 #: src/filemanager/boxes.c:1292 src/filemanager/filegui.c:1386 #: src/filemanager/find.c:605 src/filemanager/layout.c:511 src/main.c:414 msgid "&OK" msgstr "" #: lib/widget/quick.h:214 src/editor/editcmd.c:180 src/editor/editcmd.c:203 -#: src/editor/editcmd.c:375 src/editor/editcmd.c:519 src/editor/editcmd.c:939 -#: src/editor/editcmd.c:1016 src/editor/editcmd.c:1522 -#: src/editor/editcmd.c:2018 src/editor/editcmd.c:2047 +#: src/editor/editcmd.c:375 src/editor/editcmd.c:517 src/editor/editcmd.c:953 +#: src/editor/editcmd.c:1030 src/editor/editcmd.c:1473 +#: src/editor/editcmd.c:1969 src/editor/editcmd.c:1998 #: src/editor/editsearch.c:107 src/editor/editsearch.c:252 #: src/editor/etags.c:375 src/editor/spell.c:750 src/filemanager/achown.c:89 #: src/filemanager/achown.c:863 src/filemanager/achown.c:900 @@ -806,10 +806,10 @@ msgstr "" msgid "Background process:" msgstr "" -#: lib/widget/wtools.c:295 lib/widget/wtools.c:424 src/editor/edit.c:209 -#: src/editor/edit.c:230 src/editor/edit.c:381 src/editor/edit.c:1989 -#: src/editor/edit.c:1999 src/editor/editcmd.c:265 src/editor/editcmd.c:275 -#: src/editor/editcmd.c:318 src/editor/editcmd.c:1626 src/editor/spell.c:325 +#: lib/widget/wtools.c:295 lib/widget/wtools.c:424 src/editor/edit.c:210 +#: src/editor/edit.c:231 src/editor/edit.c:387 src/editor/edit.c:2022 +#: src/editor/edit.c:2032 src/editor/editcmd.c:265 src/editor/editcmd.c:275 +#: src/editor/editcmd.c:318 src/editor/editcmd.c:1577 src/editor/spell.c:325 #: src/editor/spell.c:545 src/editor/spell.c:553 #: tests/src/execute__common.c:150 #: tests/src/execute__execute_with_vfs_arg.c:152 @@ -823,7 +823,7 @@ msgstr "" #: lib/widget/wtools.c:704 src/filemanager/file.c:893 #: src/filemanager/file.c:967 src/filemanager/file.c:969 -#: src/filemanager/file.c:1015 src/filemanager/file.c:3174 +#: src/filemanager/file.c:1015 src/filemanager/file.c:3179 #: src/filemanager/filegui.c:257 src/filemanager/filegui.c:506 msgid "&Abort" msgstr "" @@ -952,7 +952,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1052,7 +1053,7 @@ msgid "" "than we can handle." msgstr "" -#: src/diffviewer/internal.h:15 src/diffviewer/search.c:235 +#: src/diffviewer/internal.h:15 src/diffviewer/search.c:236 #: src/editor/edit-impl.h:76 src/editor/edit-impl.h:77 src/viewer/search.c:484 #: src/viewer/search.c:486 msgid "&Dismiss" @@ -1063,52 +1064,52 @@ msgstr "" msgid "Enter search string:" msgstr "" -#: src/diffviewer/search.c:94 src/editor/editsearch.c:96 +#: src/diffviewer/search.c:95 src/editor/editsearch.c:96 #: src/editor/editsearch.c:179 src/filemanager/boxes.c:687 #: src/filemanager/boxes.c:894 src/filemanager/find.c:591 #: src/viewer/dialogs.c:89 msgid "Cas&e sensitive" msgstr "" -#: src/diffviewer/search.c:95 src/editor/editsearch.c:97 +#: src/diffviewer/search.c:96 src/editor/editsearch.c:97 #: src/editor/editsearch.c:180 src/viewer/dialogs.c:90 msgid "&Backwards" msgstr "" -#: src/diffviewer/search.c:96 src/editor/editsearch.c:99 +#: src/diffviewer/search.c:97 src/editor/editsearch.c:99 #: src/editor/editsearch.c:182 src/filemanager/find.c:602 #: src/viewer/dialogs.c:91 msgid "&Whole words" msgstr "" -#: src/diffviewer/search.c:98 src/editor/editsearch.c:101 +#: src/diffviewer/search.c:99 src/editor/editsearch.c:101 #: src/editor/editsearch.c:184 src/filemanager/find.c:589 #: src/viewer/dialogs.c:93 msgid "&All charsets" msgstr "" -#: src/diffviewer/search.c:109 src/diffviewer/search.c:235 -#: src/diffviewer/search.c:248 src/diffviewer/search.c:281 +#: src/diffviewer/search.c:110 src/diffviewer/search.c:236 +#: src/diffviewer/search.c:249 src/diffviewer/search.c:282 #: src/editor/editsearch.c:115 src/editor/editsearch.c:600 #: src/editor/editsearch.c:626 src/editor/editsearch.c:655 -#: src/editor/editsearch.c:905 src/editor/editsearch.c:916 +#: src/editor/editsearch.c:902 src/editor/editsearch.c:913 #: src/viewer/dialogs.c:104 src/viewer/search.c:404 src/viewer/search.c:464 #: src/viewer/search.c:484 src/viewer/search.c:486 msgid "Search" msgstr "" -#: src/diffviewer/search.c:248 src/diffviewer/search.c:281 +#: src/diffviewer/search.c:249 src/diffviewer/search.c:282 msgid "Search is disabled" msgstr "" -#: src/diffviewer/ydiff.c:181 +#: src/diffviewer/ydiff.c:185 #, c-format msgid "" "Cannot create temporary diff file\n" "%s" msgstr "" -#: src/diffviewer/ydiff.c:2213 +#: src/diffviewer/ydiff.c:2143 #, c-format msgid "" "Cannot create backup file\n" @@ -1116,134 +1117,134 @@ msgid "" "%s" msgstr "" -#: src/diffviewer/ydiff.c:2222 +#: src/diffviewer/ydiff.c:2152 #, c-format msgid "" "Cannot create temporary merge file\n" "%s" msgstr "" -#: src/diffviewer/ydiff.c:2424 +#: src/diffviewer/ydiff.c:2348 msgid "&Fastest (Assume large files)" msgstr "" -#: src/diffviewer/ydiff.c:2425 +#: src/diffviewer/ydiff.c:2349 msgid "&Minimal (Find a smaller set of change)" msgstr "" -#: src/diffviewer/ydiff.c:2430 +#: src/diffviewer/ydiff.c:2354 msgid "Diff algorithm" msgstr "" -#: src/diffviewer/ydiff.c:2433 +#: src/diffviewer/ydiff.c:2357 msgid "Diff extra options" msgstr "" -#: src/diffviewer/ydiff.c:2434 +#: src/diffviewer/ydiff.c:2358 msgid "&Ignore case" msgstr "" -#: src/diffviewer/ydiff.c:2435 +#: src/diffviewer/ydiff.c:2359 msgid "Ignore tab &expansion" msgstr "" -#: src/diffviewer/ydiff.c:2436 +#: src/diffviewer/ydiff.c:2360 msgid "Ignore &space change" msgstr "" -#: src/diffviewer/ydiff.c:2437 +#: src/diffviewer/ydiff.c:2361 msgid "Ignore all &whitespace" msgstr "" -#: src/diffviewer/ydiff.c:2438 +#: src/diffviewer/ydiff.c:2362 msgid "Strip &trailing carriage return" msgstr "" -#: src/diffviewer/ydiff.c:2449 +#: src/diffviewer/ydiff.c:2373 msgid "Diff Options" msgstr "" -#: src/diffviewer/ydiff.c:2953 +#: src/diffviewer/ydiff.c:2884 msgid "Edit" msgstr "" -#: src/diffviewer/ydiff.c:2953 +#: src/diffviewer/ydiff.c:2884 msgid "Edit is disabled" msgstr "" -#: src/diffviewer/ydiff.c:2987 +#: src/diffviewer/ydiff.c:2918 msgid "Goto line (left)" msgstr "" -#: src/diffviewer/ydiff.c:2988 +#: src/diffviewer/ydiff.c:2919 msgid "Goto line (right)" msgstr "" -#: src/diffviewer/ydiff.c:2996 src/editor/editcmd.c:1709 +#: src/diffviewer/ydiff.c:2927 src/editor/editcmd.c:1660 msgid "Enter line:" msgstr "" -#: src/diffviewer/ydiff.c:3035 src/editor/editwidget.c:677 -#: src/filemanager/filemanager.c:1634 src/filemanager/tree.c:1169 -#: src/help.c:1164 src/viewer/display.c:90 +#: src/diffviewer/ydiff.c:2966 src/editor/editwidget.c:677 +#: src/filemanager/filemanager.c:1634 src/filemanager/tree.c:1176 +#: src/help.c:1170 src/viewer/display.c:90 msgid "ButtonBar|Help" msgstr "" -#: src/diffviewer/ydiff.c:3036 src/editor/editwidget.c:678 +#: src/diffviewer/ydiff.c:2967 src/editor/editwidget.c:678 #: src/viewer/display.c:102 msgid "ButtonBar|Save" msgstr "" -#: src/diffviewer/ydiff.c:3037 src/filemanager/filemanager.c:1637 +#: src/diffviewer/ydiff.c:2968 src/filemanager/filemanager.c:1637 #: src/viewer/display.c:97 msgid "ButtonBar|Edit" msgstr "" -#: src/diffviewer/ydiff.c:3038 +#: src/diffviewer/ydiff.c:2969 msgid "ButtonBar|Merge" msgstr "" -#: src/diffviewer/ydiff.c:3039 src/editor/editwidget.c:683 +#: src/diffviewer/ydiff.c:2970 src/editor/editwidget.c:683 #: src/viewer/display.c:112 msgid "ButtonBar|Search" msgstr "" -#: src/diffviewer/ydiff.c:3040 +#: src/diffviewer/ydiff.c:2971 msgid "ButtonBar|Options" msgstr "" -#: src/diffviewer/ydiff.c:3041 src/editor/editwidget.c:686 -#: src/filemanager/filemanager.c:1643 src/help.c:1173 src/viewer/display.c:121 +#: src/diffviewer/ydiff.c:2972 src/editor/editwidget.c:686 +#: src/filemanager/filemanager.c:1643 src/help.c:1179 src/viewer/display.c:121 #: src/viewer/display.c:124 msgid "ButtonBar|Quit" msgstr "" -#: src/diffviewer/ydiff.c:3087 src/editor/editcmd.c:1528 -#: src/viewer/actions_cmd.c:642 src/viewer/actions_cmd.c:648 +#: src/diffviewer/ydiff.c:3018 src/editor/editcmd.c:1479 +#: src/viewer/actions_cmd.c:632 src/viewer/actions_cmd.c:638 msgid "Quit" msgstr "" -#: src/diffviewer/ydiff.c:3088 +#: src/diffviewer/ydiff.c:3019 msgid "File(s) was modified. Save with exit?" msgstr "" -#: src/diffviewer/ydiff.c:3089 +#: src/diffviewer/ydiff.c:3020 msgid "" "Midnight Commander is being shut down.\n" "Save modified file(s)?" msgstr "" -#: src/diffviewer/ydiff.c:3421 src/diffviewer/ydiff.c:3424 +#: src/diffviewer/ydiff.c:3352 src/diffviewer/ydiff.c:3355 msgid "Diff:" msgstr "" -#: src/diffviewer/ydiff.c:3545 src/diffviewer/ydiff.c:3555 -#: src/diffviewer/ydiff.c:3575 src/diffviewer/ydiff.c:3592 +#: src/diffviewer/ydiff.c:3475 src/diffviewer/ydiff.c:3485 +#: src/diffviewer/ydiff.c:3505 src/diffviewer/ydiff.c:3522 #, c-format msgid "\"%s\" is a directory" msgstr "" -#: src/diffviewer/ydiff.c:3581 src/diffviewer/ydiff.c:3598 +#: src/diffviewer/ydiff.c:3511 src/diffviewer/ydiff.c:3528 #: src/filemanager/file.c:1830 src/viewer/mcviewer.c:354 #, c-format msgid "" @@ -1251,70 +1252,70 @@ msgid "" "%s" msgstr "" -#: src/diffviewer/ydiff.c:3607 +#: src/diffviewer/ydiff.c:3537 msgid "Diff viewer: invalid mode" msgstr "" -#: src/diffviewer/ydiff.c:3636 +#: src/diffviewer/ydiff.c:3563 msgid "Two files are needed to compare" msgstr "" -#: src/editor/edit.c:165 +#: src/editor/edit.c:166 #, c-format msgid "Loading: %3d%%" msgstr "" -#: src/editor/edit.c:168 +#: src/editor/edit.c:169 msgid "Loading..." msgstr "" -#: src/editor/edit.c:208 src/editor/edit.c:321 +#: src/editor/edit.c:209 src/editor/edit.c:327 #, c-format msgid "Cannot open %s for reading" msgstr "" -#: src/editor/edit.c:218 +#: src/editor/edit.c:219 msgid "Load file" msgstr "" -#: src/editor/edit.c:229 +#: src/editor/edit.c:230 #, c-format msgid "Error reading %s" msgstr "" -#: src/editor/edit.c:333 +#: src/editor/edit.c:339 #, c-format msgid "Cannot get size/permissions for %s" msgstr "" -#: src/editor/edit.c:342 +#: src/editor/edit.c:348 #, c-format msgid "\"%s\" is not a regular file" msgstr "" -#: src/editor/edit.c:367 +#: src/editor/edit.c:373 #, c-format msgid "" "File \"%s\" is too large.\n" "Open it anyway?" msgstr "" -#: src/editor/edit.c:369 src/editor/editcmd.c:178 src/editor/editcmd.c:201 -#: src/editor/editcmd.c:373 src/editor/editcmd.c:517 src/editor/editcmd.c:938 -#: src/editor/editcmd.c:2015 src/editor/editcmd.c:2044 src/editor/etags.c:373 -#: src/execute.c:137 src/filemanager/ext.c:775 src/filemanager/file.c:2461 -#: src/filemanager/panel.c:4708 src/help.c:363 src/main.c:411 -#: src/subshell/common.c:1651 src/vfs/sftpfs/connection.c:521 -#: src/viewer/actions_cmd.c:444 +#: src/editor/edit.c:375 src/editor/editcmd.c:178 src/editor/editcmd.c:201 +#: src/editor/editcmd.c:373 src/editor/editcmd.c:515 src/editor/editcmd.c:952 +#: src/editor/editcmd.c:1966 src/editor/editcmd.c:1995 src/editor/etags.c:373 +#: src/execute.c:137 src/filemanager/ext.c:792 src/filemanager/file.c:2461 +#: src/filemanager/panel.c:4710 src/help.c:365 src/main.c:411 +#: src/subshell/common.c:1651 src/vfs/sftpfs/connection.c:562 +#: src/viewer/actions_cmd.c:434 msgid "Warning" msgstr "" -#: src/editor/edit.c:1988 +#: src/editor/edit.c:2021 #, c-format msgid "Error reading from pipe: %s" msgstr "" -#: src/editor/edit.c:1998 +#: src/editor/edit.c:2031 #, c-format msgid "Cannot open pipe for reading: %s" msgstr "" @@ -1346,8 +1347,8 @@ msgstr "" msgid "The file you are saving does not end with a newline." msgstr "" -#: src/editor/editcmd.c:375 src/editor/editcmd.c:519 src/editor/editcmd.c:2017 -#: src/editor/editcmd.c:2046 src/editor/etags.c:375 +#: src/editor/editcmd.c:375 src/editor/editcmd.c:517 src/editor/editcmd.c:1968 +#: src/editor/editcmd.c:1997 src/editor/etags.c:375 msgid "C&ontinue" msgstr "" @@ -1367,8 +1368,8 @@ msgstr "" msgid "&Macintosh format (CR)" msgstr "" -#: src/editor/editcmd.c:396 src/editor/editcmd.c:1038 src/editor/editcmd.c:1750 -#: src/editor/editcmd.c:1781 src/filemanager/cmd.c:735 +#: src/editor/editcmd.c:396 src/editor/editcmd.c:1052 src/editor/editcmd.c:1701 +#: src/editor/editcmd.c:1732 src/filemanager/cmd.c:735 msgid "Enter file name:" msgstr "" @@ -1380,228 +1381,228 @@ msgstr "" msgid "Save As" msgstr "" -#: src/editor/editcmd.c:837 +#: src/editor/editcmd.c:851 msgid "&Quick save" msgstr "" -#: src/editor/editcmd.c:838 +#: src/editor/editcmd.c:852 msgid "&Safe save" msgstr "" -#: src/editor/editcmd.c:839 +#: src/editor/editcmd.c:853 msgid "&Do backups with following extension:" msgstr "" -#: src/editor/editcmd.c:858 +#: src/editor/editcmd.c:872 msgid "Check &POSIX new line" msgstr "" -#: src/editor/editcmd.c:867 +#: src/editor/editcmd.c:881 msgid "Edit Save Mode" msgstr "" -#: src/editor/editcmd.c:921 src/editor/editcmd.c:980 +#: src/editor/editcmd.c:935 src/editor/editcmd.c:994 msgid "Save as" msgstr "" -#: src/editor/editcmd.c:923 +#: src/editor/editcmd.c:937 msgid "Cannot save: destination is not a regular file" msgstr "" -#: src/editor/editcmd.c:939 +#: src/editor/editcmd.c:953 msgid "A file already exists with this name" msgstr "" -#: src/editor/editcmd.c:939 +#: src/editor/editcmd.c:953 msgid "&Overwrite" msgstr "" -#: src/editor/editcmd.c:980 src/editor/editcmd.c:1760 +#: src/editor/editcmd.c:994 src/editor/editcmd.c:1711 msgid "Cannot save file" msgstr "" -#: src/editor/editcmd.c:1014 +#: src/editor/editcmd.c:1028 #, c-format msgid "Confirm save file: \"%s\"" msgstr "" -#: src/editor/editcmd.c:1016 src/viewer/hex.c:418 src/viewer/hex.c:430 +#: src/editor/editcmd.c:1030 src/viewer/hex.c:418 src/viewer/hex.c:430 msgid "Save file" msgstr "" -#: src/editor/editcmd.c:1016 src/editor/editmenu.c:80 src/learn.c:195 +#: src/editor/editcmd.c:1030 src/editor/editmenu.c:80 src/learn.c:195 #: src/learn.c:260 msgid "&Save" msgstr "" -#: src/editor/editcmd.c:1038 +#: src/editor/editcmd.c:1052 msgid "Load" msgstr "" -#: src/editor/editcmd.c:1121 +#: src/editor/editcmd.c:1135 msgid "Syntax file edit" msgstr "" -#: src/editor/editcmd.c:1122 +#: src/editor/editcmd.c:1136 msgid "Which syntax file you want to edit?" msgstr "" -#: src/editor/editcmd.c:1123 src/editor/editcmd.c:1169 +#: src/editor/editcmd.c:1137 src/editor/editcmd.c:1183 #: src/filemanager/cmd.c:834 src/filemanager/cmd.c:875 #: src/filemanager/cmd.c:933 msgid "&User" msgstr "" -#: src/editor/editcmd.c:1123 src/editor/editcmd.c:1169 +#: src/editor/editcmd.c:1137 src/editor/editcmd.c:1183 msgid "&System wide" msgstr "" -#: src/editor/editcmd.c:1167 src/filemanager/cmd.c:873 +#: src/editor/editcmd.c:1181 src/filemanager/cmd.c:873 msgid "Menu edit" msgstr "" -#: src/editor/editcmd.c:1168 src/filemanager/cmd.c:874 +#: src/editor/editcmd.c:1182 src/filemanager/cmd.c:874 msgid "Which menu file do you want to edit?" msgstr "" -#: src/editor/editcmd.c:1169 src/filemanager/cmd.c:875 +#: src/editor/editcmd.c:1183 src/filemanager/cmd.c:875 msgid "&Local" msgstr "" -#: src/editor/editcmd.c:1503 src/editor/editwidget.c:387 +#: src/editor/editcmd.c:1454 src/editor/editwidget.c:388 msgid "[NoName]" msgstr "" -#: src/editor/editcmd.c:1521 +#: src/editor/editcmd.c:1472 #, c-format msgid "" "File %s was modified.\n" "Save before close?" msgstr "" -#: src/editor/editcmd.c:1522 +#: src/editor/editcmd.c:1473 msgid "Close file" msgstr "" -#: src/editor/editcmd.c:1526 +#: src/editor/editcmd.c:1477 #, c-format msgid "" "Midnight Commander is being shut down.\n" "Save modified file %s?" msgstr "" -#: src/editor/editcmd.c:1626 +#: src/editor/editcmd.c:1577 msgid "This function is not implemented" msgstr "" -#: src/editor/editcmd.c:1641 +#: src/editor/editcmd.c:1592 msgid "Copy to clipboard" msgstr "" -#: src/editor/editcmd.c:1641 src/editor/editcmd.c:1665 +#: src/editor/editcmd.c:1592 src/editor/editcmd.c:1616 msgid "Unable to save to file" msgstr "" -#: src/editor/editcmd.c:1665 +#: src/editor/editcmd.c:1616 msgid "Cut to clipboard" msgstr "" -#: src/editor/editcmd.c:1709 +#: src/editor/editcmd.c:1660 msgid "Goto line" msgstr "" -#: src/editor/editcmd.c:1750 src/editor/editcmd.c:1760 +#: src/editor/editcmd.c:1701 src/editor/editcmd.c:1711 msgid "Save block" msgstr "" -#: src/editor/editcmd.c:1781 src/editor/editcmd.c:1796 +#: src/editor/editcmd.c:1732 src/editor/editcmd.c:1747 msgid "Insert file" msgstr "" -#: src/editor/editcmd.c:1796 +#: src/editor/editcmd.c:1747 msgid "Cannot insert file" msgstr "" -#: src/editor/editcmd.c:1817 +#: src/editor/editcmd.c:1768 msgid "Sort block" msgstr "" -#: src/editor/editcmd.c:1817 +#: src/editor/editcmd.c:1768 msgid "You must first highlight a block of text" msgstr "" -#: src/editor/editcmd.c:1825 +#: src/editor/editcmd.c:1776 msgid "Run sort" msgstr "" -#: src/editor/editcmd.c:1826 +#: src/editor/editcmd.c:1777 msgid "Enter sort options (see sort(1) manpage) separated by whitespace:" msgstr "" -#: src/editor/editcmd.c:1846 src/editor/editcmd.c:1853 +#: src/editor/editcmd.c:1797 src/editor/editcmd.c:1804 msgid "Sort" msgstr "" -#: src/editor/editcmd.c:1846 +#: src/editor/editcmd.c:1797 msgid "Cannot execute sort command" msgstr "" -#: src/editor/editcmd.c:1852 +#: src/editor/editcmd.c:1803 #, c-format msgid "Sort returned non-zero: %s" msgstr "" -#: src/editor/editcmd.c:1889 +#: src/editor/editcmd.c:1840 msgid "Paste output of external command" msgstr "" -#: src/editor/editcmd.c:1890 +#: src/editor/editcmd.c:1841 msgid "Enter shell command(s):" msgstr "" -#: src/editor/editcmd.c:1907 +#: src/editor/editcmd.c:1858 msgid "External command" msgstr "" -#: src/editor/editcmd.c:1907 +#: src/editor/editcmd.c:1858 msgid "Cannot execute command" msgstr "" -#: src/editor/editcmd.c:1952 +#: src/editor/editcmd.c:1903 msgid "mail -s <subject> -c <cc> <to>" msgstr "" -#: src/editor/editcmd.c:1953 +#: src/editor/editcmd.c:1904 msgid "To" msgstr "" -#: src/editor/editcmd.c:1956 +#: src/editor/editcmd.c:1907 msgid "Subject" msgstr "" -#: src/editor/editcmd.c:1959 +#: src/editor/editcmd.c:1910 msgid "Copies to" msgstr "" -#: src/editor/editcmd.c:1970 +#: src/editor/editcmd.c:1921 msgid "Mail" msgstr "" -#: src/editor/editcmd.c:2004 +#: src/editor/editcmd.c:1955 msgid "Insert literal" msgstr "" -#: src/editor/editcmd.c:2005 +#: src/editor/editcmd.c:1956 msgid "Press any key:" msgstr "" -#: src/editor/editcmd.c:2016 src/editor/editcmd.c:2045 src/editor/etags.c:374 +#: src/editor/editcmd.c:1967 src/editor/editcmd.c:1996 src/editor/etags.c:374 msgid "" "Current text was modified without a file save.\n" "Continue discards these changes." msgstr "" -#: src/editor/editcmd.c:2098 +#: src/editor/editcmd.c:2049 msgid "Cancel" msgstr "" @@ -1609,7 +1610,7 @@ msgstr "" msgid "Collect completions" msgstr "" -#: src/editor/editdraw.c:256 src/editor/editwidget.c:333 +#: src/editor/editdraw.c:256 src/editor/editwidget.c:334 msgid "NoName" msgstr "" @@ -2039,8 +2040,8 @@ msgstr "" msgid "Enter replacement string:" msgstr "" -#: src/editor/editsearch.c:195 src/editor/editsearch.c:981 -#: src/editor/editsearch.c:1021 src/editor/editsearch.c:1033 +#: src/editor/editsearch.c:195 src/editor/editsearch.c:978 +#: src/editor/editsearch.c:1018 src/editor/editsearch.c:1030 msgid "Replace" msgstr "" @@ -2059,7 +2060,7 @@ msgstr "" #: src/editor/editsearch.c:251 src/editor/spell.c:748 #: src/filemanager/file.c:893 src/filemanager/file.c:966 -#: src/filemanager/file.c:969 src/filemanager/file.c:3175 +#: src/filemanager/file.c:969 src/filemanager/file.c:3180 #: src/filemanager/filegui.c:254 msgid "&Skip" msgstr "" @@ -2079,7 +2080,7 @@ msgstr "" msgid "Searching %s" msgstr "" -#: src/editor/editsearch.c:1033 +#: src/editor/editsearch.c:1030 #, c-format msgid "%ld replacements made" msgstr "" @@ -2091,18 +2092,18 @@ msgid "" msgstr "" #: src/editor/editwidget.c:155 -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" #: src/editor/editwidget.c:165 msgid "About" msgstr "" -#: src/editor/editwidget.c:324 +#: src/editor/editwidget.c:325 msgid "Open files" msgstr "" -#: src/editor/editwidget.c:391 src/editor/editwidget.c:394 +#: src/editor/editwidget.c:392 src/editor/editwidget.c:395 msgid "Edit: " msgstr "" @@ -2115,7 +2116,7 @@ msgid "ButtonBar|Replac" msgstr "" #: src/editor/editwidget.c:681 src/filemanager/filemanager.c:1638 -#: src/filemanager/tree.c:1174 +#: src/filemanager/tree.c:1181 msgid "ButtonBar|Copy" msgstr "" @@ -2251,31 +2252,31 @@ msgstr "" msgid "Select language" msgstr "" -#: src/editor/syntax.c:1428 +#: src/editor/syntax.c:1440 msgid "Choose syntax highlighting" msgstr "" -#: src/editor/syntax.c:1429 +#: src/editor/syntax.c:1441 msgid "< Auto >" msgstr "" -#: src/editor/syntax.c:1430 +#: src/editor/syntax.c:1442 msgid "< Reload Current Syntax >" msgstr "" -#: src/editor/syntax.c:1531 src/editor/syntax.c:1537 +#: src/editor/syntax.c:1543 src/editor/syntax.c:1549 msgid "Load syntax file" msgstr "" -#: src/editor/syntax.c:1532 src/help.c:1098 src/usermenu.c:986 -#: src/usermenu.c:1026 +#: src/editor/syntax.c:1544 src/help.c:1105 src/usermenu.c:999 +#: src/usermenu.c:1039 #, c-format msgid "" "Cannot open file %s\n" "%s" msgstr "" -#: src/editor/syntax.c:1538 +#: src/editor/syntax.c:1550 #, c-format msgid "Error in file %s on line %d" msgstr "" @@ -2288,7 +2289,7 @@ msgid "" "extra access permissions with the \"su\" command?" msgstr "" -#: src/execute.c:198 src/filemanager/ext.c:669 +#: src/execute.c:198 src/filemanager/ext.c:686 #, c-format msgid "Cannot fetch a local copy of %s" msgstr "" @@ -2358,8 +2359,8 @@ msgstr "" #: src/filemanager/achown.c:862 src/filemanager/achown.c:899 #: src/filemanager/chattr.c:1123 src/filemanager/chmod.c:441 -#: src/filemanager/chown.c:313 src/vfs/sftpfs/connection.c:521 -#: src/vfs/sftpfs/connection.c:533 +#: src/filemanager/chown.c:313 src/vfs/sftpfs/connection.c:562 +#: src/vfs/sftpfs/connection.c:574 msgid "&Ignore" msgstr "" @@ -2609,7 +2610,7 @@ msgid "Panel options" msgstr "" #: src/filemanager/boxes.c:749 src/filemanager/info.c:86 -#: src/vfs/sftpfs/connection.c:380 +#: src/vfs/sftpfs/connection.c:421 msgid "Information" msgstr "" @@ -2718,7 +2719,7 @@ msgstr "" msgid "Input / display codepage:" msgstr "" -#: src/filemanager/boxes.c:1090 src/filemanager/tree.c:1124 +#: src/filemanager/boxes.c:1090 src/filemanager/tree.c:1131 msgid "Directory tree" msgstr "" @@ -3212,26 +3213,26 @@ msgstr "" msgid "Unable to save setup to %s" msgstr "" -#: src/filemanager/command.c:119 src/usermenu.c:975 +#: src/filemanager/command.c:119 src/usermenu.c:988 msgid "Cannot execute commands on non-local filesystems" msgstr "" -#: src/filemanager/ext.c:257 src/usermenu.c:486 +#: src/filemanager/ext.c:257 src/usermenu.c:490 msgid "Parameter" msgstr "" -#: src/filemanager/ext.c:469 src/usermenu.c:457 +#: src/filemanager/ext.c:473 src/usermenu.c:461 #, c-format msgid "" "Cannot create temporary command file\n" "%s" msgstr "" -#: src/filemanager/ext.c:740 +#: src/filemanager/ext.c:757 msgid "Pipe failed" msgstr "" -#: src/filemanager/ext.c:776 +#: src/filemanager/ext.c:793 #, c-format msgid "" "You have an outdated %s file.\n" @@ -3239,7 +3240,7 @@ msgid "" "Please copy your modifications of the old file to the new one." msgstr "" -#: src/filemanager/ext.c:827 +#: src/filemanager/ext.c:844 #, c-format msgid "" "The format of the\n" @@ -3249,7 +3250,7 @@ msgid "" "Please fetch a fresh copy from the Midnight Commander package." msgstr "" -#: src/filemanager/ext.c:842 +#: src/filemanager/ext.c:859 #, c-format msgid "" "The format of the\n" @@ -3470,14 +3471,14 @@ msgid "" "%s" msgstr "" -#: src/filemanager/file.c:2411 src/filemanager/file.c:2779 +#: src/filemanager/file.c:2411 src/filemanager/file.c:2782 #, c-format msgid "" "Cannot chown target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2426 src/filemanager/file.c:2795 +#: src/filemanager/file.c:2426 src/filemanager/file.c:2798 #, c-format msgid "" "Cannot chmod target file \"%s\"\n" @@ -3567,28 +3568,28 @@ msgid "" "%s" msgstr "" -#: src/filemanager/file.c:2860 +#: src/filemanager/file.c:2865 #, c-format msgid "" "Cannot stat source directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2904 +#: src/filemanager/file.c:2909 #, c-format msgid "" "Source \"%s\" is not a directory\n" "%s" msgstr "" -#: src/filemanager/file.c:2916 +#: src/filemanager/file.c:2921 #, c-format msgid "" "Cannot copy cyclic symbolic link\n" "\"%s\"" msgstr "" -#: src/filemanager/file.c:2955 src/filemanager/file.c:3447 +#: src/filemanager/file.c:2960 src/filemanager/file.c:3452 #: src/filemanager/tree.c:769 #, c-format msgid "" @@ -3596,26 +3597,26 @@ msgid "" "%s" msgstr "" -#: src/filemanager/file.c:2988 +#: src/filemanager/file.c:2993 #, c-format msgid "" "Cannot create target directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:3012 +#: src/filemanager/file.c:3017 #, c-format msgid "" "Cannot chown target directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:3219 +#: src/filemanager/file.c:3224 #, c-format msgid "Directories: %zu, total size: %s" msgstr "" -#: src/filemanager/file.c:3365 +#: src/filemanager/file.c:3370 msgid "Sorry, I could not put the job in background" msgstr "" @@ -3753,7 +3754,7 @@ msgid "Deleting" msgstr "" #: src/filemanager/filegui.c:1373 src/filemanager/find.c:587 -#: src/filemanager/panel.c:2618 +#: src/filemanager/panel.c:2617 msgid "&Using shell patterns" msgstr "" @@ -4066,11 +4067,11 @@ msgstr "" msgid "ButtonBar|View" msgstr "" -#: src/filemanager/filemanager.c:1639 src/filemanager/tree.c:1175 +#: src/filemanager/filemanager.c:1639 src/filemanager/tree.c:1182 msgid "ButtonBar|RenMov" msgstr "" -#: src/filemanager/filemanager.c:1640 src/filemanager/tree.c:1178 +#: src/filemanager/filemanager.c:1640 src/filemanager/tree.c:1185 msgid "ButtonBar|Mkdir" msgstr "" @@ -4100,7 +4101,7 @@ msgid "Found: %lu" msgstr "" #: src/filemanager/find.c:510 src/filemanager/find.c:521 -#: src/filemanager/panel.c:2656 +#: src/filemanager/panel.c:2655 msgid "Malformed regular expression" msgstr "" @@ -4622,23 +4623,23 @@ msgstr "" msgid "Unknown tag on display format:" msgstr "" -#: src/filemanager/panel.c:2617 +#: src/filemanager/panel.c:2616 msgid "&Files only" msgstr "" -#: src/filemanager/panel.c:2620 +#: src/filemanager/panel.c:2619 msgid "&Case sensitive" msgstr "" -#: src/filemanager/panel.c:2710 +#: src/filemanager/panel.c:2709 msgid "Select" msgstr "" -#: src/filemanager/panel.c:2719 +#: src/filemanager/panel.c:2718 msgid "Unselect" msgstr "" -#: src/filemanager/panel.c:2749 +#: src/filemanager/panel.c:2748 msgid "Filter" msgstr "" @@ -4646,12 +4647,12 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" -#: src/filemanager/panel.c:3430 src/filemanager/panel.c:4607 -#: src/filemanager/panel.c:4655 src/viewer/actions_cmd.c:314 +#: src/filemanager/panel.c:3432 src/filemanager/panel.c:4609 +#: src/filemanager/panel.c:4657 src/viewer/actions_cmd.c:310 msgid "Cannot read directory contents" msgstr "" -#: src/filemanager/panel.c:4709 +#: src/filemanager/panel.c:4711 msgid "User supplied format looks invalid, reverting to default." msgstr "" @@ -4744,23 +4745,23 @@ msgstr "" msgid "Delete %s?" msgstr "" -#: src/filemanager/tree.c:981 src/filemanager/tree.c:1172 +#: src/filemanager/tree.c:981 src/filemanager/tree.c:1179 msgid "ButtonBar|Static" msgstr "" -#: src/filemanager/tree.c:981 src/filemanager/tree.c:1173 +#: src/filemanager/tree.c:981 src/filemanager/tree.c:1180 msgid "ButtonBar|Dynamc" msgstr "" -#: src/filemanager/tree.c:1170 +#: src/filemanager/tree.c:1177 msgid "ButtonBar|Rescan" msgstr "" -#: src/filemanager/tree.c:1171 +#: src/filemanager/tree.c:1178 msgid "ButtonBar|Forget" msgstr "" -#: src/filemanager/tree.c:1182 +#: src/filemanager/tree.c:1189 msgid "ButtonBar|Rmdir" msgstr "" @@ -4771,28 +4772,28 @@ msgid "" "%s\n" msgstr "" -#: src/help.c:325 +#: src/help.c:327 msgid "Help file format error\n" msgstr "" -#: src/help.c:363 +#: src/help.c:365 msgid "Internal bug: Double start of link area" msgstr "" -#: src/help.c:635 src/help.c:1120 +#: src/help.c:642 src/help.c:1127 #, c-format msgid "Cannot find node %s in help file" msgstr "" -#: src/help.c:1135 +#: src/help.c:1142 msgid "Help" msgstr "" -#: src/help.c:1165 +#: src/help.c:1171 msgid "ButtonBar|Index" msgstr "" -#: src/help.c:1166 +#: src/help.c:1172 msgid "ButtonBar|Prev" msgstr "" @@ -4861,7 +4862,7 @@ msgid "" "%s\n" msgstr "" -#: src/main.c:287 +#: src/main.c:294 msgid "Home directory path is not absolute" msgstr "" @@ -5038,57 +5039,57 @@ msgstr "" msgid "Cache directory:" msgstr "" -#: src/usermenu.c:330 +#: src/usermenu.c:334 msgid "Debug" msgstr "" -#: src/usermenu.c:347 +#: src/usermenu.c:351 msgid "ERROR:" msgstr "" -#: src/usermenu.c:351 +#: src/usermenu.c:355 msgid "True:" msgstr "" -#: src/usermenu.c:353 +#: src/usermenu.c:357 msgid "False:" msgstr "" -#: src/usermenu.c:586 +#: src/usermenu.c:596 msgid "Error calling program" msgstr "" -#: src/usermenu.c:614 +#: src/usermenu.c:624 msgid "Warning -- ignoring file" msgstr "" -#: src/usermenu.c:615 +#: src/usermenu.c:625 #, c-format msgid "" "File %s is not owned by root or you or is world writable.\n" "Using it may compromise your security" msgstr "" -#: src/usermenu.c:727 +#: src/usermenu.c:737 msgid "Format error on file Extensions File" msgstr "" -#: src/usermenu.c:728 +#: src/usermenu.c:738 #, c-format msgid "The %%var macro has no default" msgstr "" -#: src/usermenu.c:729 +#: src/usermenu.c:739 #, c-format msgid "The %%var macro has no variable" msgstr "" -#: src/usermenu.c:1132 +#: src/usermenu.c:1145 #, c-format msgid "No suitable entries found in %s" msgstr "" -#: src/usermenu.c:1146 +#: src/usermenu.c:1159 msgid "User menu" msgstr "" @@ -5147,93 +5148,35 @@ msgid "" "%s" msgstr "" -#: src/vfs/extfs/extfs.c:753 src/vfs/extfs/extfs.c:951 -#: src/vfs/extfs/extfs.c:961 src/vfs/extfs/extfs.c:966 +#: src/vfs/extfs/extfs.c:753 src/vfs/extfs/extfs.c:979 +#: src/vfs/extfs/extfs.c:989 src/vfs/extfs/extfs.c:994 #, c-format msgid "" "EXTFS virtual file system:\n" "%s" msgstr "" -#: src/vfs/extfs/extfs.c:1549 -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#: src/vfs/fish/fish.c:384 -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "" - -#: src/vfs/fish/fish.c:569 -msgid "fish: Waiting for initial line..." -msgstr "" - -#: src/vfs/fish/fish.c:579 -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#: src/vfs/fish/fish.c:587 -#, c-format -msgid "fish: Password is required for %s" -msgstr "" - -#: src/vfs/fish/fish.c:595 -msgid "fish: Sending password..." -msgstr "" - -#: src/vfs/fish/fish.c:632 -msgid "fish: Sending initial line..." -msgstr "" - -#: src/vfs/fish/fish.c:643 -msgid "fish: Handshaking version..." -msgstr "" - -#: src/vfs/fish/fish.c:654 -msgid "fish: Getting host info..." -msgstr "" - -#: src/vfs/fish/fish.c:933 -#, c-format -msgid "fish: Reading directory %s..." +#: src/vfs/extfs/extfs.c:932 +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#: src/vfs/fish/fish.c:978 src/vfs/ftpfs/ftpfs.c:1914 -#: src/vfs/undelfs/undelfs.c:382 -#, c-format -msgid "%s: done." +#: src/vfs/extfs/extfs.c:945 +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#: src/vfs/fish/fish.c:985 src/vfs/ftpfs/ftpfs.c:1862 -#: src/vfs/undelfs/undelfs.c:385 -#, c-format -msgid "%s: failure" +#: src/vfs/extfs/extfs.c:969 +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" -#: src/vfs/fish/fish.c:1043 +#: src/vfs/extfs/extfs.c:1577 #, c-format -msgid "fish: store %s: sending command..." -msgstr "" - -#: src/vfs/fish/fish.c:1067 -msgid "fish: Local read failed, sending zeros" -msgstr "" - -#: src/vfs/fish/fish.c:1086 -msgid "fish: storing file" -msgstr "" - -#: src/vfs/fish/fish.c:1156 -msgid "Aborting transfer..." -msgstr "" - -#: src/vfs/fish/fish.c:1172 -msgid "Error reported after abort." -msgstr "" - -#: src/vfs/fish/fish.c:1174 -msgid "Aborted transfer would be successful." +msgid "Warning: cannot open %s directory\n" msgstr "" #: src/vfs/ftpfs/ftpfs.c:588 @@ -5378,6 +5321,18 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#: src/vfs/ftpfs/ftpfs.c:1862 src/vfs/shell/shell.c:979 +#: src/vfs/undelfs/undelfs.c:385 +#, c-format +msgid "%s: failure" +msgstr "" + +#: src/vfs/ftpfs/ftpfs.c:1914 src/vfs/shell/shell.c:972 +#: src/vfs/undelfs/undelfs.c:382 +#, c-format +msgid "%s: done." +msgstr "" + #: src/vfs/ftpfs/ftpfs.c:2004 msgid "ftpfs: storing file" msgstr "" @@ -5423,42 +5378,42 @@ msgstr "" msgid "sftp: Unable to get current user name." msgstr "" -#: src/vfs/sftpfs/connection.c:116 src/vfs/sftpfs/sftpfs.c:745 +#: src/vfs/sftpfs/connection.c:147 src/vfs/sftpfs/sftpfs.c:745 msgid "sftp: Invalid host name." msgstr "" -#: src/vfs/sftpfs/connection.c:148 src/vfs/sftpfs/connection.c:188 +#: src/vfs/sftpfs/connection.c:179 src/vfs/sftpfs/connection.c:219 #, c-format msgid "sftp: %s" msgstr "" -#: src/vfs/sftpfs/connection.c:176 +#: src/vfs/sftpfs/connection.c:207 msgid "sftp: failed to convert remote host IP address into text form" msgstr "" -#: src/vfs/sftpfs/connection.c:193 +#: src/vfs/sftpfs/connection.c:224 #, c-format msgid "sftp: making connection to %s" msgstr "" -#: src/vfs/sftpfs/connection.c:203 +#: src/vfs/sftpfs/connection.c:234 msgid "sftp: connection interrupted by user" msgstr "" -#: src/vfs/sftpfs/connection.c:205 +#: src/vfs/sftpfs/connection.c:236 #, c-format msgid "sftp: connection to server failed: %s" msgstr "" -#: src/vfs/sftpfs/connection.c:321 +#: src/vfs/sftpfs/connection.c:355 msgid "sftp: found host key of unsupported type: RSA1" msgstr "" -#: src/vfs/sftpfs/connection.c:324 +#: src/vfs/sftpfs/connection.c:358 msgid "sftp: unknown host key type:" msgstr "" -#: src/vfs/sftpfs/connection.c:381 +#: src/vfs/sftpfs/connection.c:422 #, c-format msgid "" "Permanently added\n" @@ -5466,19 +5421,19 @@ msgid "" "to the list of known hosts." msgstr "" -#: src/vfs/sftpfs/connection.c:445 +#: src/vfs/sftpfs/connection.c:486 msgid "sftp: cannot get the remote host key" msgstr "" -#: src/vfs/sftpfs/connection.c:485 +#: src/vfs/sftpfs/connection.c:526 msgid "sftp: unsupported key type, can't check remote host key" msgstr "" -#: src/vfs/sftpfs/connection.c:492 +#: src/vfs/sftpfs/connection.c:533 msgid "sftp: can't compute host key fingerprint hash" msgstr "" -#: src/vfs/sftpfs/connection.c:514 +#: src/vfs/sftpfs/connection.c:555 #, c-format msgid "" "The authenticity of host\n" @@ -5489,7 +5444,7 @@ msgid "" "Do you want to add it to the list of known hosts and continue connecting?" msgstr "" -#: src/vfs/sftpfs/connection.c:527 +#: src/vfs/sftpfs/connection.c:568 #, c-format msgid "" "%s (%s)\n" @@ -5499,29 +5454,29 @@ msgid "" "connecting?" msgstr "" -#: src/vfs/sftpfs/connection.c:554 +#: src/vfs/sftpfs/connection.c:595 msgid "sftp: host key verification failed" msgstr "" -#: src/vfs/sftpfs/connection.c:690 +#: src/vfs/sftpfs/connection.c:731 #, c-format msgid "sftp: Enter passphrase for %s " msgstr "" -#: src/vfs/sftpfs/connection.c:695 +#: src/vfs/sftpfs/connection.c:736 msgid "sftp: Passphrase is empty." msgstr "" -#: src/vfs/sftpfs/connection.c:800 +#: src/vfs/sftpfs/connection.c:841 #, c-format msgid "sftp: Enter password for %s " msgstr "" -#: src/vfs/sftpfs/connection.c:805 +#: src/vfs/sftpfs/connection.c:846 msgid "sftp: Password is empty." msgstr "" -#: src/vfs/sftpfs/connection.c:886 +#: src/vfs/sftpfs/connection.c:927 msgid "sftp: failure establishing SSH session" msgstr "" @@ -5543,30 +5498,90 @@ msgstr "" msgid "sftp: Listing done." msgstr "" -#: src/vfs/tar/tar.c:661 src/vfs/tar/tar.c:734 src/vfs/tar/tar.c:829 -#: src/vfs/tar/tar-internal.c:411 +#: src/vfs/shell/shell.c:385 +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +#: src/vfs/shell/shell.c:570 +msgid "shell: Waiting for initial line..." +msgstr "" + +#: src/vfs/shell/shell.c:580 +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#: src/vfs/shell/shell.c:588 +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +#: src/vfs/shell/shell.c:597 +msgid "shell: Sending password..." +msgstr "" + +#: src/vfs/shell/shell.c:634 +msgid "shell: Sending initial line..." +msgstr "" + +#: src/vfs/shell/shell.c:643 +msgid "shell: Getting host info..." +msgstr "" + +#: src/vfs/shell/shell.c:926 +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#: src/vfs/shell/shell.c:1037 +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +#: src/vfs/shell/shell.c:1061 +msgid "shell: Local read failed, sending zeros" +msgstr "" + +#: src/vfs/shell/shell.c:1080 +msgid "shell: storing file" +msgstr "" + +#: src/vfs/shell/shell.c:1150 +msgid "Aborting transfer..." +msgstr "" + +#: src/vfs/shell/shell.c:1166 +msgid "Error reported after abort." +msgstr "" + +#: src/vfs/shell/shell.c:1168 +msgid "Aborted transfer would be successful." +msgstr "" + +#: src/vfs/tar/tar.c:655 src/vfs/tar/tar.c:728 src/vfs/tar/tar.c:823 +#: src/vfs/tar/tar-internal.c:418 msgid "Inconsistent tar archive" msgstr "" -#: src/vfs/tar/tar.c:691 src/vfs/tar/tar.c:714 +#: src/vfs/tar/tar.c:685 src/vfs/tar/tar.c:708 msgid "Unexpected EOF on archive file" msgstr "" -#: src/vfs/tar/tar.c:916 src/vfs/tar/tar.c:938 +#: src/vfs/tar/tar.c:910 src/vfs/tar/tar.c:932 #, c-format msgid "" "Cannot open tar archive\n" "%s" msgstr "" -#: src/vfs/tar/tar.c:998 src/vfs/tar/tar.c:1023 +#: src/vfs/tar/tar.c:992 src/vfs/tar/tar.c:1017 #, c-format msgid "" "%s\n" "doesn't look like a tar archive" msgstr "" -#: src/vfs/tar/tar-internal.c:166 +#: src/vfs/tar/tar-internal.c:165 msgid "tar: mc_lseek not stopped at a record boundary" msgstr "" @@ -5659,19 +5674,19 @@ msgstr "" msgid "Ext2lib error" msgstr "" -#: src/viewer/actions_cmd.c:444 +#: src/viewer/actions_cmd.c:434 msgid "Invalid value" msgstr "" -#: src/viewer/actions_cmd.c:643 +#: src/viewer/actions_cmd.c:633 msgid "File was modified. Save with exit?" msgstr "" -#: src/viewer/actions_cmd.c:644 +#: src/viewer/actions_cmd.c:634 msgid "&Cancel quit" msgstr "" -#: src/viewer/actions_cmd.c:649 +#: src/viewer/actions_cmd.c:639 msgid "" "Midnight Commander is being shut down.\n" "Save modified file?" Binary files differ@@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Shuree Nyam-Oidov <99shuree@gmail.com>, 2020\n" "Language-Team: Mongolian (http://app.transifex.com/mc/mc/language/mn/)\n" @@ -707,7 +707,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1543,7 +1544,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3934,67 +3935,25 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: %s Ð°Ð°Ñ Ñалгагдаж байна" - -msgid "fish: Waiting for initial line..." -msgstr "fish: ÐхлÑл мөрийг хүлÑÑж байна..." - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "Уучлаарай, Бид ÑÐ½Ñ Ñ…Ð¾Ð»Ð±Ð¾Ð»Ñ‚Ð¾Ð´ нууц үг ашиглаж чадахгүй байна." - -#, c-format -msgid "fish: Password is required for %s" +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -msgid "fish: Sending password..." -msgstr "fish: Ðууц үгийг илгÑÑж байна..." - -msgid "fish: Sending initial line..." -msgstr "fish: ÑхлÑл мөрийг илгÑÑж байна..." - -msgid "fish: Handshaking version..." -msgstr "fish: Handshaking version..." - -msgid "fish: Getting host info..." +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: %s лавлахыг уншиж байна..." - -#, c-format -msgid "%s: done." -msgstr "%s: дууÑÑан." - -#, c-format -msgid "%s: failure" -msgstr "%s: алдаа" - -#, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: %s ÑÑргÑÑÑ…: командыг илгÑÑж байна..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: локал уншилт бүтÑÑнгүй, Ñ‚Ñгийг илгÑÑж байна" - -msgid "fish: storing file" +msgid "Warning: cannot open %s directory\n" msgstr "" -msgid "Aborting transfer..." -msgstr "Дамжуулалтыг таÑлаж байна..." - -msgid "Error reported after abort." -msgstr "ТаÑлалтын дараа алдаа илтгÑгдлÑÑ." - -msgid "Aborted transfer would be successful." -msgstr "ТаÑлагдÑан дамжуулалт дууÑÑан ч байж магадгүй." - #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: %s ÑÑÑ Ñалгагдаж байна" @@ -4105,6 +4064,14 @@ msgstr "(ÑхлÑл chdir)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: алдаа; оÑлын горимд хаашаа ч шилжих боломжгүй" +#, c-format +msgid "%s: failure" +msgstr "%s: алдаа" + +#, c-format +msgid "%s: done." +msgstr "%s: дууÑÑан." + msgid "ftpfs: storing file" msgstr "" @@ -4242,6 +4209,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "Уучлаарай, Бид ÑÐ½Ñ Ñ…Ð¾Ð»Ð±Ð¾Ð»Ñ‚Ð¾Ð´ нууц үг ашиглаж чадахгүй байна." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "Дамжуулалтыг таÑлаж байна..." + +msgid "Error reported after abort." +msgstr "ТаÑлалтын дараа алдаа илтгÑгдлÑÑ." + +msgid "Aborted transfer would be successful." +msgstr "ТаÑлагдÑан дамжуулалт дууÑÑан ч байж магадгүй." + msgid "Inconsistent tar archive" msgstr "Ðлдаатай архив tar" @@ -3,16 +3,17 @@ # This file is distributed under the same license as the mc package. # # Translators: -# heskjestad <cato@heskjestad.xyz>, 2021-2023 -# heskjestad <cato@heskjestad.xyz>, 2019-2021 +# heskjestad <kc.madderloss@gmail.com>, 2021-2023 +# heskjestad <kc.madderloss@gmail.com>, 2024 +# heskjestad <kc.madderloss@gmail.com>, 2019-2021 # Slava Zanko <slavazanko@gmail.com>, 2011 msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" -"Last-Translator: heskjestad <cato@heskjestad.xyz>, 2021-2023\n" +"Last-Translator: heskjestad <kc.madderloss@gmail.com>, 2024\n" "Language-Team: Norwegian BokmÃ¥l (http://app.transifex.com/mc/mc/language/" "nb/)\n" "Language: nb\n" @@ -740,30 +741,32 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors NØKKELORD={FORGR},{BAKGR},{ATTR}:NØKKELORD2=...\n" +"--colors NØKKELORD={FORAN},{BAK},{ATTR}:NØKKELORD2=...\n" "\n" -"{FORGR}, {BAKGR} og {ATTR} kan utelates for Ã¥ bruke forvalgte verdier\n" +"{FORAN}, {BAK} and {ATTR} kan utelates for Ã¥ ta i bruk standardverdier\n" "\n" " Nøkkelord:\n" -" Globale: errors, disabled, reverse, gauge, header\n" +" Globale: errors, disabled, reverse, gauge, header\n" " input, inputmark, inputunchanged, commandlinemark\n" " bbarhotkey, bbarbutton, statusbar\n" -" Filvisning: normal, selected, marked, markselect\n" -" Dialogbokser: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" +" Filvisning: normal, selected, marked, markselect\n" +" Dialogvinduer: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" " errdhotfocus\n" -" Menyer: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" Sprettoppmenyer: pmenunormal, pmenusel, pmenutitle\n" -" Tekstprogram: editnormal, editbold, editmarked, editwhitespace,\n" +" Menyer: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" +" Sprettoppmenyer: pmenunormal, pmenusel, pmenutitle\n" +" Redigering: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" -" Tekstviser: viewnormal,viewbold, viewunderline, viewselected\n" -" Hjelp: helpnormal, helpitalic, helpbold, helplink, helpslink\n" +" Visning: viewnormal,viewbold, viewunderline, viewselected\n" +" Hjelp: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1634,8 +1637,8 @@ msgstr "" "Et brukervennlig skriveprogram\n" "skrevet for Midnight Commander." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" -msgstr "Opphavsrett (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" +msgstr "Opphavsrett (C) 1996-2024 Free Software Foundation" msgid "About" msgstr "Om" @@ -4172,66 +4175,30 @@ msgstr "" "EXTFS virtuelt filsystem:\n" "%s" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Advarsel: Klarte ikke Ã¥pne mappa %s\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: Kobler fra %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: Venter pÃ¥ innledende linje ..." - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "Passordautentisering av tilkoblinger støttes ikke per i dag." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: Trenger passord for %s" - -msgid "fish: Sending password..." -msgstr "fish: Sender passord ..." - -msgid "fish: Sending initial line..." -msgstr "fish: Sender innledende linje ..." - -msgid "fish: Handshaking version..." -msgstr "fish: Avklarer versjon ..." - -msgid "fish: Getting host info..." -msgstr "fish: Henter vertsinformasjon ..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: Leser mappa %s ..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" +msgstr "" +"EXTFS virtuelt filsystem:\n" +"feil filnavn" -#, c-format -msgid "%s: done." -msgstr "%s: ferdig." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" +"EXTFS virtuelt filsystem:\n" +"feil arkivnavn" -#, c-format -msgid "%s: failure" -msgstr " %s: mislyktes" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" +"EXTFS virtuelt filsystem:\n" +"kan ikke kjøre kommando" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: lagre %s: sender kommando ..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: Lokal lesekommando mislyktes, sender nuller" - -msgid "fish: storing file" -msgstr "fish: lagrer fil" - -msgid "Aborting transfer..." -msgstr "Avbryter overføring ..." - -msgid "Error reported after abort." -msgstr "Feil rapportert etter avbrudd." - -msgid "Aborted transfer would be successful." -msgstr "Avbrutt overføring ville vært i orden." +msgid "Warning: cannot open %s directory\n" +msgstr "Advarsel: Klarte ikke Ã¥pne mappa %s\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4343,6 +4310,14 @@ msgstr "(chdir først)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: mislyktes; ingen retrettmuligheter" +#, c-format +msgid "%s: failure" +msgstr " %s: mislyktes" + +#, c-format +msgid "%s: done." +msgstr "%s: ferdig." + msgid "ftpfs: storing file" msgstr "ftpfs: lagrer fil" @@ -4501,6 +4476,52 @@ msgstr "sftp: (Ctrl + G avbryter) Lister ut ... %s" msgid "sftp: Listing done." msgstr "sftp: Utlisting ferdig." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "skall: Kobler fra %s" + +msgid "shell: Waiting for initial line..." +msgstr "skall: Venter pÃ¥ innledende linje ..." + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "Passordautentisering av tilkoblinger støttes ikke per i dag." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "skall: Trenger passord for %s" + +msgid "shell: Sending password..." +msgstr "skall: Sender passord ..." + +msgid "shell: Sending initial line..." +msgstr "skall: Sender innledende linje ..." + +msgid "shell: Getting host info..." +msgstr "skall: Henter vertsinformasjon ..." + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "skall: Leser mappa %s ..." + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "skall: lagre %s: sender kommando ..." + +msgid "shell: Local read failed, sending zeros" +msgstr "skall: Lokal lesekommando mislyktes, sender nuller" + +msgid "shell: storing file" +msgstr "skall: lagrer fil" + +msgid "Aborting transfer..." +msgstr "Avbryter overføring ..." + +msgid "Error reported after abort." +msgstr "Feil rapportert etter avbrudd." + +msgid "Aborted transfer would be successful." +msgstr "Avbrutt overføring ville vært i orden." + msgid "Inconsistent tar archive" msgstr "Inkonsistent tar-arkiv" @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Jaap Kramer <jaap-kramer@ziggo.nl>, 2023\n" "Language-Team: Dutch (http://app.transifex.com/mc/mc/language/nl/)\n" @@ -739,30 +739,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors KEYWORD={FORE},{BACK},{ATTR}:KEYWORD2=...\n" -"\n" -"{FORE}, {BACK} and {ATTR} can be omitted, and the default will be used\n" -"\n" -" Keywords:\n" -" Global: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -" File display: normal, selected, marked, markselect\n" -" Dialog boxes: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" -" errdhotfocus\n" -" Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -" Viewer: viewnormal,viewbold, viewunderline, viewselected\n" -" Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1627,7 +1610,7 @@ msgstr "" "Een gebruikersvriendelijke tekstbewerker\n" "geschreven voor de Midnight Commander" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -4157,67 +4140,24 @@ msgstr "" "EXTFS virtueel bestandssysteem:\n" "%s" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Waarschuwing: kan map %s niet openen\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: Verbinding verbreken met %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: Wachten op initiële lijn..." - -msgid "Sorry, we cannot do password authenticated connections for now." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -"Helaas, wachtwoord-beveiligde verbindingen zijn op dit moment niet mogelijk." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: Wachtwoord is verplicht voor %s" - -msgid "fish: Sending password..." -msgstr "fish: Wachtwoord wordt verstuurd..." - -msgid "fish: Sending initial line..." -msgstr "fish: Initiële lijn wordt verstuurd..." - -msgid "fish: Handshaking version..." -msgstr "fish: Versie handshaking..." - -msgid "fish: Getting host info..." -msgstr "fish: Verkrijgen van host-informatie..." -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: Map %s wordt gelezen..." - -#, c-format -msgid "%s: done." -msgstr "%s: voltooid." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" -#, c-format -msgid "%s: failure" -msgstr " %s: fout " +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: bewaar %s: opdracht verzenden..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fisch: Lokale leesopdracht mislukt, nullen worden verzonden" - -msgid "fish: storing file" -msgstr "fish: opslaan van bestand" - -msgid "Aborting transfer..." -msgstr "Overdracht wordt verbroken..." - -msgid "Error reported after abort." -msgstr "Fout gemeld na verbreking." - -msgid "Aborted transfer would be successful." -msgstr "Verbroken transfer zou een success zijn." +msgid "Warning: cannot open %s directory\n" +msgstr "Waarschuwing: kan map %s niet openen\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4329,6 +4269,14 @@ msgstr "(eerst chdir)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: mislukt; geen terugvalmogelijkheid " +#, c-format +msgid "%s: failure" +msgstr " %s: fout " + +#, c-format +msgid "%s: done." +msgstr "%s: voltooid." + msgid "ftpfs: storing file" msgstr "ftpfs: bestand opslaan" @@ -4485,6 +4433,53 @@ msgstr "sftp: (Ctrl-G break) Weergave lijst... %s" msgid "sftp: Listing done." msgstr "sftp: Klaar met opsomming." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" +"Helaas, wachtwoord-beveiligde verbindingen zijn op dit moment niet mogelijk." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "Overdracht wordt verbroken..." + +msgid "Error reported after abort." +msgstr "Fout gemeld na verbreking." + +msgid "Aborted transfer would be successful." +msgstr "Verbroken transfer zou een success zijn." + msgid "Inconsistent tar archive" msgstr "Inconsistent tar-archief" diff --git a/po/nl_BE.po b/po/nl_BE.po index 2a44a4b..c2a10af 100644 --- a/po/nl_BE.po +++ b/po/nl_BE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Dutch (Belgium) (http://app.transifex.com/mc/mc/language/" @@ -704,7 +704,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1540,7 +1541,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3901,65 +3902,23 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "" - -msgid "fish: Sending password..." -msgstr "" - -msgid "fish: Sending initial line..." -msgstr "" - -msgid "fish: Handshaking version..." -msgstr "" - -msgid "fish: Getting host info..." -msgstr "" - -#, c-format -msgid "fish: Reading directory %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#, c-format -msgid "%s: done." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "%s: failure" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "" - -msgid "fish: Local read failed, sending zeros" -msgstr "" - -msgid "fish: storing file" -msgstr "" - -msgid "Aborting transfer..." -msgstr "" - -msgid "Error reported after abort." -msgstr "" - -msgid "Aborted transfer would be successful." +msgid "Warning: cannot open %s directory\n" msgstr "" #, c-format @@ -4072,6 +4031,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "" + +#, c-format +msgid "%s: done." +msgstr "" + msgid "ftpfs: storing file" msgstr "" @@ -4205,6 +4172,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "" + +msgid "Error reported after abort." +msgstr "" + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "" @@ -3,16 +3,16 @@ # This file is distributed under the same license as the mc package. # # Translators: -# Piotr DrÄ…g <piotrdrag@gmail.com>, 2011-2023 +# Piotr DrÄ…g <piotrdrag@gmail.com>, 2011-2024 # Slava Zanko <slavazanko@gmail.com>, 2011 # Waldemar Stoczkowski, 2021 msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" -"Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>, 2011-2023\n" +"Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>, 2011-2024\n" "Language-Team: Polish (http://app.transifex.com/mc/mc/language/pl/)\n" "Language: pl\n" "MIME-Version: 1.0\n" @@ -743,15 +743,16 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors KEYWORD={TEKST},{TÅO},{ATR}:SÅOWO_KLUCZOWE2=…\n" +"--colors SÅOWO_KLUCZOWE={TEKST},{TÅO},{ATR}:SÅOWO_KLUCZOWE2=…\n" "\n" -"{TEKST}, {TÅO} i {ATR} można pominąć, zostanÄ… użyte wartoÅ›ci domyÅ›lne\n" +"{TEKST}, {TÅO} i {ATR} można pominąć, zostanÄ… użyte wartoÅ›ci domyÅ›lne\n" "\n" " SÅ‚owa kluczowe:\n" " Globalne: errors, disabled, reverse, gauge, header\n" @@ -761,8 +762,9 @@ msgstr "" " Okna dialogowe: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" " errdhotfocus\n" " Menu: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" Menu wyskakujÄ…ce: pmenunormal, pmenusel, pmenutitle\n" -" Edytor: editnormal, editbold, editmarked, editwhitespace,\n" +" Menu wyskakujÄ…ce: pmenunormal, pmenusel, pmenutitle\n" +" Edytor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " PrzeglÄ…darka: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1637,8 +1639,8 @@ msgstr "" "Åatwy w obsÅ‚udze edytor tekstu,\n" "napisany dla programu Midnight Commander." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" -msgstr "Copyright © 1996-2023 Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" +msgstr "Copyright © 1996-2024 Free Software Foundation" msgid "About" msgstr "O programie" @@ -4186,66 +4188,30 @@ msgstr "" "Wirtualny system plików EXTFS:\n" "%s" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Ostrzeżenie: nie można utworzyć katalogu %s\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: rozÅ‚Ä…czanie z %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: oczekiwanie na wiersz poczÄ…tkowy…" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "PoÅ‚Ä…czenia uwierzytelniane hasÅ‚em nie sÄ… na razie obsÅ‚ugiwane." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: wymagane jest hasÅ‚o dla %s" - -msgid "fish: Sending password..." -msgstr "fish: wysyÅ‚anie hasÅ‚a…" - -msgid "fish: Sending initial line..." -msgstr "fish: wysyÅ‚anie wiersza poczÄ…tkowego…" - -msgid "fish: Handshaking version..." -msgstr "fish: ustalanie wersji…" - -msgid "fish: Getting host info..." -msgstr "fish: pobieranie informacji o komputerze…" - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: odczytywanie katalogu %s…" +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" +msgstr "" +"Wirtualny system plików EXTFS:\n" +"bÅ‚Ä™dna nazwa pliku" -#, c-format -msgid "%s: done." -msgstr "%s: ukoÅ„czono." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" +"Wirtualny system plików EXTFS:\n" +"bÅ‚Ä™dna nazwa archiwum" -#, c-format -msgid "%s: failure" -msgstr "%s: niepowodzenie" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" +"Wirtualny system plików EXTFS:\n" +"nie można zbudować polecenia" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: zapis %s: wysyÅ‚anie polecenia…" - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: lokalny odczyt siÄ™ nie powiódÅ‚, wysyÅ‚anie zer" - -msgid "fish: storing file" -msgstr "fish: wysyÅ‚anie pliku" - -msgid "Aborting transfer..." -msgstr "Przerywanie przesyÅ‚ania…" - -msgid "Error reported after abort." -msgstr "ZgÅ‚oszono bÅ‚Ä…d po przerwaniu." - -msgid "Aborted transfer would be successful." -msgstr "Przerwane przesyÅ‚anie zostaÅ‚oby pomyÅ›lnie zakoÅ„czone." +msgid "Warning: cannot open %s directory\n" +msgstr "Ostrzeżenie: nie można utworzyć katalogu %s\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4357,6 +4323,14 @@ msgstr "(najpierw chdir)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: niepowodzenie; brak możliwoÅ›ci wycofania" +#, c-format +msgid "%s: failure" +msgstr "%s: niepowodzenie" + +#, c-format +msgid "%s: done." +msgstr "%s: ukoÅ„czono." + msgid "ftpfs: storing file" msgstr "ftpfs: wysyÅ‚anie pliku" @@ -4515,6 +4489,52 @@ msgstr "sftp: (Ctrl-G przerywa) wyÅ›wietlanie listy… %s" msgid "sftp: Listing done." msgstr "sftp: ukoÅ„czono wyÅ›wietlanie listy." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "powÅ‚oka: rozÅ‚Ä…czanie z %s" + +msgid "shell: Waiting for initial line..." +msgstr "powÅ‚oka: oczekiwanie na wiersz poczÄ…tkowy…" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "PoÅ‚Ä…czenia uwierzytelniane hasÅ‚em nie sÄ… na razie obsÅ‚ugiwane." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "powÅ‚oka: wymagane jest hasÅ‚o dla %s" + +msgid "shell: Sending password..." +msgstr "powÅ‚oka: wysyÅ‚anie hasÅ‚a…" + +msgid "shell: Sending initial line..." +msgstr "powÅ‚oka: wysyÅ‚anie wiersza poczÄ…tkowego…" + +msgid "shell: Getting host info..." +msgstr "powÅ‚oka: pobieranie informacji o komputerze…" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "powÅ‚oka: odczytywanie katalogu %s…" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "powÅ‚oka: zapis %s: wysyÅ‚anie polecenia…" + +msgid "shell: Local read failed, sending zeros" +msgstr "powÅ‚oka: lokalny odczyt siÄ™ nie powiódÅ‚, wysyÅ‚anie zer" + +msgid "shell: storing file" +msgstr "powÅ‚oka: wysyÅ‚anie pliku" + +msgid "Aborting transfer..." +msgstr "Przerywanie przesyÅ‚ania…" + +msgid "Error reported after abort." +msgstr "ZgÅ‚oszono bÅ‚Ä…d po przerwaniu." + +msgid "Aborted transfer would be successful." +msgstr "Przerwane przesyÅ‚anie zostaÅ‚oby pomyÅ›lnie zakoÅ„czone." + msgid "Inconsistent tar archive" msgstr "Niespójne archiwum tar" @@ -5,16 +5,16 @@ # Translators: # Gilberto J <2101458@my.ipleiria.pt>, 2012 # Gilberto Jorge <gmj125@gmail.com>, 2012-2013 -# Gilberto Jorge <gmj125@gmail.com>, 2013-2023 +# Gilberto Jorge <gmj125@gmail.com>, 2013-2024 # Peter J. Mello <admin@petermello.net>, 2021 # Slava Zanko <slavazanko@gmail.com>, 2011 msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" -"Last-Translator: Gilberto Jorge <gmj125@gmail.com>, 2013-2023\n" +"Last-Translator: Gilberto Jorge <gmj125@gmail.com>, 2013-2024\n" "Language-Team: Portuguese (http://app.transifex.com/mc/mc/language/pt/)\n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -742,7 +742,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -750,23 +751,23 @@ msgid "" msgstr "" "--colors KEYWORD={FORE},{BACK},{ATTR}:KEYWORD2=...\n" "\n" -"{FORE}, {BACK} e {ATTR} pode ser omitido, e o valor por omissão será usado\n" +"{FORE}, {BACK} e {ATTR} podem ser omitidos, o valor por omissão será usado\n" "\n" -" Palavras chave (Keywords):\n" +" Keywords:\n" " Global: errors, disabled, reverse, gauge, header\n" " input, inputmark, inputunchanged, commandlinemark\n" " bbarhotkey, bbarbutton, statusbar\n" -" Visualização de ficheiro: normal, selected, marked, markselect\n" -" Caixas de diálogo: dnormal, dfocus, dhotnormal, dhotfocus, " -"errdhotnormal,\n" +" File display: normal, selected, marked, markselect\n" +" Dialog boxes: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" Menus popup: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Popup menus: pmenunormal, pmenusel, pmenutitle\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" -" Visualizador: viewnormal,viewbold, viewunderline, viewselected\n" -" Ajuda: helpnormal, helpitalic, helpbold, helplink, helpslink\n" +" Viewer: viewnormal,viewbold, viewunderline, viewselected\n" +" Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1636,8 +1637,8 @@ msgstr "" "Um editor de texto amigo do utilizador\n" "escrito para o Midnight Commander." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" -msgstr "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" +msgstr "Copyright (C) 1996-2024 the Free Software Foundation" msgid "About" msgstr "Acerca" @@ -4181,66 +4182,30 @@ msgstr "" "Sistema de ficheiro virtual EXTFS:\n" "%s" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Aviso: não é possÃvel abrir o diretório %s\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: A desligar de %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: A aguardar por linha inicial..." - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "Desculpe, por ora ligações com senha autenticada não são possÃveis." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: É necessário senha para %s" - -msgid "fish: Sending password..." -msgstr "fish: A enviar senha..." - -msgid "fish: Sending initial line..." -msgstr "fish: A enviar linha inicial..." - -msgid "fish: Handshaking version..." -msgstr "fish: Versão de protocolo (handshacking)..." - -msgid "fish: Getting host info..." -msgstr "fish: A obter informação de host..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: A ler directório %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" +msgstr "" +"Sistema de ficheiros virtual EXTFS:\n" +"nome de ficheiro errado" -#, c-format -msgid "%s: done." -msgstr "%s: terminado." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" +"Sistema de ficheiros virtual EXTFS:\n" +"nome de arquivo errado" -#, c-format -msgid "%s: failure" -msgstr "%s: falha" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" +"Sistema de ficheiros virtual EXTFS:\n" +"não é possÃvel construir comando" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: armazenar %s: a enviar comando..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: Leitura local falhou, a enviar zeros" - -msgid "fish: storing file" -msgstr "fish: a guardar ficheiro" - -msgid "Aborting transfer..." -msgstr "A abortar transferência..." - -msgid "Error reported after abort." -msgstr "Erro reportado após abortar." - -msgid "Aborted transfer would be successful." -msgstr "Transferência abortada teria tido sucesso." +msgid "Warning: cannot open %s directory\n" +msgstr "Aviso: não é possÃvel abrir o diretório %s\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4352,6 +4317,14 @@ msgstr "(chdir primeiro)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: falhou; nenhum local para onde ir" +#, c-format +msgid "%s: failure" +msgstr "%s: falha" + +#, c-format +msgid "%s: done." +msgstr "%s: terminado." + msgid "ftpfs: storing file" msgstr "ftpfs: a guardar ficheiro" @@ -4508,6 +4481,52 @@ msgstr "sftp: (Ctrl-G break) A listar... %s" msgid "sftp: Listing done." msgstr "sftp: Listagem efetuada." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "shell: A desligar de %s" + +msgid "shell: Waiting for initial line..." +msgstr "shell: À espera da linha inicial..." + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "Desculpe, por ora ligações com senha autenticada não são possÃveis." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "shell: É necessário password para %s" + +msgid "shell: Sending password..." +msgstr "shell: A enviar password..." + +msgid "shell: Sending initial line..." +msgstr "shell: A enviar linha inicial..." + +msgid "shell: Getting host info..." +msgstr "shell: A obter informação do host..." + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "shell: A ler directório %s..." + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "shell: guardar %s: a enviar comando..." + +msgid "shell: Local read failed, sending zeros" +msgstr "shell: Leitura local falhou, a enviar zeros" + +msgid "shell: storing file" +msgstr "shell: a guardar ficheiro" + +msgid "Aborting transfer..." +msgstr "A abortar transferência..." + +msgid "Error reported after abort." +msgstr "Erro reportado após abortar." + +msgid "Aborted transfer would be successful." +msgstr "Transferência abortada teria tido sucesso." + msgid "Inconsistent tar archive" msgstr "Arquivo tar inconsistente" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo Binary files differindex 4c60344..98b19f7 100644 --- a/po/pt_BR.gmo +++ b/po/pt_BR.gmo diff --git a/po/pt_BR.po b/po/pt_BR.po index 12008e5..125313d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ # Translators: # Enrico Nicoletto <enrico.BR@gmx.co.uk>, 2013 # Heitor Adão Júnior <heitoradao@gmail.com>, 2017 -# marcelo cripe <marcelocripe@gmail.com>, 2022-2023 +# marcelo cripe <marcelocripe@gmail.com>, 2022-2024 # Mauro Hemerly Gazzani <mauro.hemerly@gmail.com>, 2017 # Rafael Fontenelle <rffontenelle@gmail.com>, 2012 # Slava Zanko <slavazanko@gmail.com>, 2011 @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" -"Last-Translator: marcelo cripe <marcelocripe@gmail.com>, 2022-2023\n" +"Last-Translator: marcelo cripe <marcelocripe@gmail.com>, 2022-2024\n" "Language-Team: Portuguese (Brazil) (http://app.transifex.com/mc/mc/language/" "pt_BR/)\n" "Language: pt_BR\n" @@ -755,7 +755,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -763,22 +764,26 @@ msgid "" msgstr "" "--colors KEYWORD={FORE},{BACK},{ATTR}:KEYWORD2=...\n" "\n" -"{FORE}, {BACK} e {ATTR} podem ser omitidos e o padrão será utilizado\n" +"{FORE}, {BACK} e {ATTR} pode ser omitido e o padrão será utilizado\n" "\n" -" Palavras-chave:\n" -" Global: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -" Exibição de arquivo: normal, selected, marked, markselect\n" +" Keywords (Palavras-chave):\n" +" Global: erros, desativado, reverso, medidor, entrada do\n" +" cabeçalho, marca de entrada, entrada inalterada,\n" +" tecla de atalho da marca da linha de comando da\n" +" barra, botão da barra, estado da barra\n" +"\n" +"\n" +" Exibição do arquivo: normal, selecionado, marcado, marca da seleção\n" " Caixas de diálogo: dnormal, dfocus, dhotnormal, dhotfocus, " "errdhotnormal,\n" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" Caixas de diálogo dos menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Menus de contexto pmenunormal, pmenusel, pmenutitle\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" -" Visualizador: viewnormal,viewbold, viewunderline, viewselected\n" +" Visualização: viewnormal,viewbold, viewunderline, viewselected\n" " Ajuda: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes @@ -1658,8 +1663,8 @@ msgstr "" "Um editor de texto amigável\n" "escrito para o Midnight Commander." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" -msgstr "Direitos de Autor (c) 1996-2023 a Fundação Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" +msgstr "Direitos de Autor (C) 1996-2024 a Fundação ‘Free Software Foundation’" msgid "About" msgstr "Sobre" @@ -4231,69 +4236,32 @@ msgstr "" "Sistema de arquivos virtual EXTFS:\n" "%s" -#, c-format -msgid "Warning: cannot open %s directory\n" +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -"Aviso:\n" -"Não foi possÃvel abrir o diretório %s\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "O fish foi desconectado de %s" - -msgid "fish: Waiting for initial line..." -msgstr "O fish está aguardando a linha inicial..." +"Sistema de arquivos virtual EXTFS:\n" +"O nome do arquivo não está correto" -msgid "Sorry, we cannot do password authenticated connections for now." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -"Desculpe-me, não é possÃvel fazer a autenticação por senha neste momento." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "O fish necessita da senha para %s" - -msgid "fish: Sending password..." -msgstr "O fish está enviando a senha..." +"Sistema de arquivos virtuais EXTFS:\n" +"O nome do arquivo está errado" -msgid "fish: Sending initial line..." -msgstr "O fish está enviando a linha inicial..." - -msgid "fish: Handshaking version..." -msgstr "A versão de protocolo(handshacking) do fish..." - -msgid "fish: Getting host info..." -msgstr "O fish está obtendo as informações do hospedeiro..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "O fish está lendo o diretório %s..." - -#, c-format -msgid "%s: done." -msgstr "%s: foi concluÃdo com sucesso." - -#, c-format -msgid "%s: failure" -msgstr "%s: falhou durante o processo" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" +"Sistema de arquivos virtuais EXTFS:\n" +"Não foi possÃvel construir o comando" #, c-format -msgid "fish: store %s: sending command..." -msgstr "O fish armazenou %s e está enviando o comando..." - -msgid "fish: Local read failed, sending zeros" -msgstr "Ocorreu um erro no fish durante a leitura local e será enviado zeros" - -msgid "fish: storing file" -msgstr "O fish está armazenando o(s) arquivo(s)" - -msgid "Aborting transfer..." -msgstr "Interrompendo a transferência..." - -msgid "Error reported after abort." -msgstr "O erro foi reportado depois será finalizado." - -msgid "Aborted transfer would be successful." -msgstr "A transferência foi interrompida, mas poderia ser bem sucedida." +msgid "Warning: cannot open %s directory\n" +msgstr "" +"Aviso:\n" +"Não foi possÃvel abrir o diretório %s\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4409,6 +4377,14 @@ msgstr "(primeiro o chdir)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "Ocorreu uma falha no ftpfs e não é possÃvel voltar" +#, c-format +msgid "%s: failure" +msgstr "%s: falhou durante o processo" + +#, c-format +msgid "%s: done." +msgstr "%s: foi concluÃdo com sucesso." + msgid "ftpfs: storing file" msgstr "O ftpfs está armazenando os arquivos" @@ -4578,6 +4554,53 @@ msgstr "O sftp está listando (pressione as teclas Ctrl+G para pausar)... %s" msgid "sftp: Listing done." msgstr "A listagem do sftp foi concluÃda com sucesso." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "Shell: Desconectando de %s" + +msgid "shell: Waiting for initial line..." +msgstr "Shell: Aguardando a linha inicial..." + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" +"Desculpe-me, não é possÃvel fazer a autenticação por senha neste momento." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "Shell: A senha é necessária para %s" + +msgid "shell: Sending password..." +msgstr "Shell: Enviando a senha..." + +msgid "shell: Sending initial line..." +msgstr "Shell: Enviando a linha inicial..." + +msgid "shell: Getting host info..." +msgstr "Shell: Obtendo as informações do hospedeiro..." + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "Shell: Lendo o diretório %s..." + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "Shell: Armazenar %s: Enviando o comando..." + +msgid "shell: Local read failed, sending zeros" +msgstr "Shell: Ocorreu uma falha na leitura local, enviando zeros" + +msgid "shell: storing file" +msgstr "Shell: Armazenando o arquivo" + +msgid "Aborting transfer..." +msgstr "Interrompendo a transferência..." + +msgid "Error reported after abort." +msgstr "O erro foi reportado depois será finalizado." + +msgid "Aborted transfer would be successful." +msgstr "A transferência foi interrompida, mas poderia ser bem sucedida." + msgid "Inconsistent tar archive" msgstr "O arquivo tar não é consistente" @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Simona Iacob <s@zp1.net>, 2021-2023\n" "Language-Team: Romanian (http://app.transifex.com/mc/mc/language/ro/)\n" @@ -744,30 +744,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors KEYWORD={FORE},{BACK},{ATTR}:KEYWORD2=...\n" -"\n" -"{FORE}, {BACK} and {ATTR} can be omitted, and the default will be used\n" -"\n" -" Keywords:\n" -" Global: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -" File display: normal, selected, marked, markselect\n" -" Dialog boxes: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" -" errdhotfocus\n" -" Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -" Viewer: viewnormal,viewbold, viewunderline, viewselected\n" -" Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1637,8 +1620,8 @@ msgstr "" "Un editor de text uÈ™or de utilizat\n" "creat pentru Midnight Commander." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" -msgstr "Copyright (C) 1996-2023 FundaÈ›ia pentru Software Liber" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" +msgstr "" msgid "About" msgstr "Despre" @@ -4178,68 +4161,24 @@ msgstr "" "Sistem de fiÈ™iere virtuale EXTFS:\n" "%s" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "AtenÈ›ie: nu se poate deschide dosarul %s\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: Se deconectează de la %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: Se aÈ™teptă linia iniÈ›ială..." - -msgid "Sorry, we cannot do password authenticated connections for now." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -"Ne pare rău, deocamdată nu se pot efectua conectări autentificate prin " -"parolă." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: Este necesară o parolă pentru %s" - -msgid "fish: Sending password..." -msgstr "fish: Se trimite parola..." - -msgid "fish: Sending initial line..." -msgstr "fish: Se trimite linia iniÈ›ială..." - -msgid "fish: Handshaking version..." -msgstr "fish: Se negociază versiunea..." -msgid "fish: Getting host info..." -msgstr "fish: Se obÈ›in informaÈ›ii despre gazdă..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: Citesc dosarul %s..." - -#, c-format -msgid "%s: done." -msgstr "%s: efectuat." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" -#, c-format -msgid "%s: failure" -msgstr "%s: eÈ™ec" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: stochează %s: trimit comanda..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: Citirea locală a eÈ™uat, trimit zero-uri" - -msgid "fish: storing file" -msgstr "fish: se stochează fiÈ™ierul" - -msgid "Aborting transfer..." -msgstr "Abandonez transferul..." - -msgid "Error reported after abort." -msgstr "S-a raportat o eroare după abandon." - -msgid "Aborted transfer would be successful." -msgstr "Transferul abandonat va reuÈ™i." +msgid "Warning: cannot open %s directory\n" +msgstr "AtenÈ›ie: nu se poate deschide dosarul %s\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4351,6 +4290,14 @@ msgstr "(întâi chdir)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: eÈ™ec; nu mai există nici o variantă la care să revin" +#, c-format +msgid "%s: failure" +msgstr "%s: eÈ™ec" + +#, c-format +msgid "%s: done." +msgstr "%s: efectuat." + msgid "ftpfs: storing file" msgstr "ftpfs: se stochează fiÈ™ierul" @@ -4509,6 +4456,54 @@ msgstr "sftp: (Ctrl-G întrerupe) AfiÈ™are... %s" msgid "sftp: Listing done." msgstr "sftp: AfiÈ™area a fost efectuată." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" +"Ne pare rău, deocamdată nu se pot efectua conectări autentificate prin " +"parolă." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "Abandonez transferul..." + +msgid "Error reported after abort." +msgstr "S-a raportat o eroare după abandon." + +msgid "Aborted transfer would be successful." +msgstr "Transferul abandonat va reuÈ™i." + msgid "Inconsistent tar archive" msgstr "Arhivă tar trunchiată" @@ -8,6 +8,7 @@ # Alex Tkachenko <alex@bcs.zp.ua>, 1998 # and Alex Tkachenko <alex@bcs.zp.ua>, 1998 # Andrei Stepanov, 2023 +# Andrei Stepanov, 2023 # Andrew Borodin <aborodin@vmail.ru>, 2009-2012 # Andrew V. Samoilov <sav@bcs.zp.ua>, 1999,2014 # Anton Sergeevich Chumak <nightfast@yahoo.co.uk>, 2005 @@ -18,6 +19,7 @@ # Mr.GreyWolf, 2016 # NaiLi (aka jamesjames) Rootaerc <theism@mail.ru>, 2012 # Pavel Suravezhkin, 2022 +# Pavel Suravezhkin, 2022 # Piotr DrÄ…g <piotrdrag@gmail.com>, 2018 # Sergey Panov <sipan@mit.edu>, 1999 # Simple88, 2016 @@ -28,7 +30,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Andrei Stepanov, 2023\n" "Language-Team: Russian (http://app.transifex.com/mc/mc/language/ru/)\n" @@ -187,7 +189,7 @@ msgid "True color not supported with ncurses." msgstr "True Color не поддерживаетÑÑ ncurses." msgid "Your terminal doesn't even seem to support 256 colors." -msgstr "КажетÑÑ, ваш терминал не поддерживает даже 256 цветов." +msgstr "Похоже, ваш терминал не поддерживает даже 256 цветов." msgid "True color not supported in this slang version." msgstr "True Color не поддерживаетÑÑ Ð² Ñтой верÑии slang." @@ -759,34 +761,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors КЛЮЧЕВОЕ_СЛОВО={ТЕКСТ},{ФОÐ},{ÐТРИБУТ}:КЛЮЧЕВОЕ_СЛОВО2=...\n" -"\n" -"{ТЕКСТ}, {ФОÐ} и {ÐТРИБУТ} можно опуÑтить, чтобы иÑпользовать Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾ " -"умолчанию\n" -"\n" -"Ключевые Ñлова:\n" -" Общие: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -" Отображение файлов: normal, selected, marked, markselect\n" -" Диалоги: dnormal, dfocus, dhotnormal, dhotfocus, " -"errdhotnormal,\n" -" errdhotfocus\n" -" Меню: menunormal, menuhot, menusel, menuhotsel, " -"menuinactive\n" -" Ð’Ñплывающие меню: pmenunormal, pmenusel, pmenutitle\n" -" Редактор: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -" ПроÑмотрщик: viewnormal, viewbold, viewunderline, viewselected\n" -" Справка: helpnormal, helpitalic, helpbold, helplink, " -"helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -977,7 +958,7 @@ msgid "ButtonBar|Help" msgstr "Помощь" msgid "ButtonBar|Save" -msgstr "Сохранить" +msgstr "Сохран" msgid "ButtonBar|Edit" msgstr "Правка" @@ -989,7 +970,7 @@ msgid "ButtonBar|Search" msgstr "ПоиÑк" msgid "ButtonBar|Options" -msgstr "ÐаÑтройки" +msgstr "ÐаÑÑ‚Ñ€" msgid "ButtonBar|Quit" msgstr "Выход" @@ -1546,10 +1527,10 @@ msgid "&None" msgstr "Ðе&Ñ‚" msgid "&Dynamic paragraphing" -msgstr "ДинамичеÑкий" +msgstr "&ДинамичеÑкий" msgid "Type &writer wrap" -msgstr "ÐвтоматичеÑкий переноÑ" +msgstr "&ÐвтоматичеÑкий переноÑ" msgid "Wrap mode" msgstr "Режим переноÑа Ñтрок" @@ -1573,13 +1554,13 @@ msgid "Other options" msgstr "Прочие наÑтройки" msgid "&Return does autoindent" -msgstr "&ÐвтоотÑтуп \"Вводом\"" +msgstr "Ð&втоотÑтуп \"Вводом\"" msgid "Confir&m before saving" -msgstr "П&одтверждать запиÑÑŒ файла" +msgstr "Подтверждать запиÑÑŒ &файла" msgid "Save file &position" -msgstr "Со&хранÑÑ‚ÑŒ позицию в файле" +msgstr "Сох&ранÑÑ‚ÑŒ позицию в файле" msgid "&Visible trailing spaces" msgstr "Отображать проб&елы" @@ -1654,8 +1635,8 @@ msgstr "" "ТекÑтовый редактор Ñ Ð´Ñ€ÑƒÐ¶ÐµÑтвенным интерфейÑом пользователÑ.\n" "Создан Ð´Ð»Ñ Midnight Commander." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" -msgstr "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" +msgstr "" msgid "About" msgstr "О программе" @@ -1928,7 +1909,7 @@ msgid "S&ingle press" msgstr "Одино&чное нажатие" msgid "Timeout:" -msgstr "Интервал:" +msgstr "Период:" msgid "Pause after run" msgstr "Пауза поÑле выполнениÑ" @@ -1985,10 +1966,10 @@ msgid "Case &insensitive" msgstr "Без &учёта региÑтра" msgid "Use panel sort mo&de" -msgstr "&ИÑпользовать Ñортировку панели" +msgstr "И&Ñпользовать Ñортировку панели" msgid "Show mi&ni-status" -msgstr "Показывать &мини-ÑтатуÑ" +msgstr "&Показывать Ñтроку ÑоÑтоÑниÑ" msgid "Use SI si&ze units" msgstr "Вывод в единицах &СИ" @@ -2006,7 +1987,7 @@ msgid "&Fast dir reload" msgstr "&БыÑÑ‚Ñ€Ð°Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° каталога" msgid "Ma&rk moves down" -msgstr "&Отметка перемещает курÑор" +msgstr "Отметка переме&щает курÑор" msgid "Re&verse files only" msgstr "Обрат&ить только файлы" @@ -2071,22 +2052,22 @@ msgid "&Long file list" msgstr "&РаÑширенный" msgid "&User defined:" -msgstr "&Определённый пользователем" +msgstr "&Заданный пользователем:" msgid "columns" msgstr "Ñтолбцы" msgid "User &mini status" -msgstr "Строка &мини-ÑтатуÑа в формате пользователÑ" +msgstr "&ПользовательÑÐºÐ°Ñ Ñтрока ÑоÑтоÑниÑ" msgid "Listing format" msgstr "Формат ÑпиÑка файлов" msgid "Executable &first" -msgstr "ИÑполнÑемые &вначале" +msgstr "Сперва иÑпо&лнÑемые" msgid "&Reverse" -msgstr "&Обратный" +msgstr "Обра&тный" msgid "Sort order" msgstr "ПорÑдок Ñортировки" @@ -2108,7 +2089,7 @@ msgid "Confirmation|Di&rectory hotlist delete" msgstr "Удаление ÑпиÑка &каталогов" msgid "Confirmation|&History cleanup" -msgstr "&ОчиÑтка иÑтории" +msgstr "О&чиÑтка иÑтории" msgid "Confirmation" msgstr "Подтверждение" @@ -2194,6 +2175,9 @@ msgid "" "%s\n" "%s" msgstr "" +"Ðе удалоÑÑŒ Ñменить каталог на\n" +"%s\n" +"%s" msgid "Secure deletion" msgstr "Ðадёжное удаление" @@ -2455,7 +2439,7 @@ msgid "&Size only" msgstr "По &размеру" msgid "&Thorough" -msgstr "По&байтный" +msgstr "Поб&айтный" msgid "" "Both panels should be in the listing mode\n" @@ -2510,11 +2494,11 @@ msgstr "ÐаÑтройка" #, c-format msgid "Setup saved to %s" -msgstr "Параметры Ñохранены в %s" +msgstr "ÐаÑтройки Ñохранены в %s" #, c-format msgid "Unable to save setup to %s" -msgstr "Ðе удалоÑÑŒ Ñохранить параметры в %s" +msgstr "Ðе удалоÑÑŒ Ñохранить наÑтройки в %s" msgid "Cannot execute commands on non-local filesystems" msgstr "Ðе удалоÑÑŒ выполнить команды на нелокальных файловых ÑиÑтемах" @@ -2620,7 +2604,7 @@ msgid "" "Cannot stat hardlink source file \"%s\"\n" "%s" msgstr "" -"Ðе удалоÑÑŒ получить ÑвойÑтва иÑходного файла жёÑÑ‚. ÑÑылки\"%s\"\n" +"Ðе удалоÑÑŒ получить ÑвойÑтва иÑходного файла жёÑÑ‚. ÑÑылки \"%s\"\n" "%s" #, c-format @@ -3084,13 +3068,13 @@ msgid "&Info" msgstr "Инфо&рмациÑ" msgid "&Tree" -msgstr "Дерев&о" +msgstr "&Дерево" msgid "&Listing format..." msgstr "Фор&мат ÑпиÑка..." msgid "&Sort order..." -msgstr "ПорÑдок &Ñортировки..." +msgstr "ПорÑдок Ñор&тировки..." msgid "&Filter..." msgstr "&Фильтр..." @@ -3111,7 +3095,7 @@ msgid "Paneli&ze" msgstr "Па&нелизациÑ" msgid "&Rescan" -msgstr "&Перепроверить" +msgstr "&Обновить" msgid "&View" msgstr "П&роÑмотр" @@ -3339,7 +3323,7 @@ msgid "A&ll charsets" msgstr "Ð’Ñ&е кодировки" msgid "Fir&st hit" -msgstr "До первого в&хождениÑ" +msgstr "До первого вхо&ждениÑ" msgid "Find File" msgstr "ПоиÑк файла" @@ -3485,7 +3469,7 @@ msgid "No node information" msgstr "Ðет информации об узле" msgid "Free nodes:" -msgstr "Свободно узлов:" +msgstr "Своб. узлов:" msgid "No space information" msgstr "Ðет информации о проÑтранÑтве" @@ -3511,7 +3495,7 @@ msgstr "ФС: %s" #, c-format msgid "Accessed: %s" -msgstr "Обращение: %s" +msgstr "ДоÑтуп: %s" #, c-format msgid "Modified: %s" @@ -3652,7 +3636,7 @@ msgid "sort|m" msgstr "м" msgid "&Modify time" -msgstr "Ð’Ñ€ÐµÐ¼Ñ &правки" +msgstr "Дата &правки" #. TRANSLATORS: one single character to represent 'Access time' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix @@ -3660,7 +3644,7 @@ msgid "sort|a" msgstr "д" msgid "&Access time" -msgstr "Ð’Ñ€ÐµÐ¼Ñ &доÑтупа" +msgstr "Дата &доÑтупа" #. TRANSLATORS: one single character to represent 'Change time' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix @@ -3668,7 +3652,7 @@ msgid "sort|h" msgstr "п" msgid "C&hange time" -msgstr "Ð’&Ñ€ÐµÐ¼Ñ Ð¿Ñ€Ð°Ð²ÐºÐ¸ атрибутов" +msgstr "Дата &Ñмены" msgid "Perm" msgstr "Права" @@ -3726,7 +3710,7 @@ msgid "Unknown tag on display format:" msgstr "ÐеизвеÑтный тег в формате отображениÑ:" msgid "&Files only" -msgstr "Только файлы" +msgstr "Только &файлы" msgid "&Case sensitive" msgstr "С учётом ре&гиÑтра" @@ -3836,7 +3820,7 @@ msgid "ButtonBar|Dynamc" msgstr "Динамч" msgid "ButtonBar|Rescan" -msgstr "ПереÑм" +msgstr "Обновить" msgid "ButtonBar|Forget" msgstr "Забыть" @@ -3875,7 +3859,7 @@ msgid "Learn keys" msgstr "Определение клавиш" msgid "Teach me a key" -msgstr "Обучите Ð¼ÐµÐ½Ñ ÐºÐ»Ð°Ð²Ð¸ÑˆÐµ" +msgstr "ПривÑзка клавиши" #, c-format msgid "" @@ -3930,9 +3914,9 @@ msgid "" "which keys are not marked with OK. Press space on the missing\n" "key, or click with the mouse to define it. Move around with Tab." msgstr "" -"Ðажмите вÑе перечиÑленные выше клавиши. ПоÑле нажатий найдите,\n" -"какие клавиши не имеют пометки \"OK\". Ð”Ð»Ñ Ð¾Ð±ÑƒÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð°Ð²Ð¸ÑˆÐµ выберите\n" -"её при помощи Tab или мышкой и нажмите пробел." +"Ðажмите вÑе перечиÑленные выше клавиши. ПоÑле найдите\n" +"клавиши без пометки \"OK\". Ð”Ð»Ñ Ð¿Ñ€Ð¸Ð²Ñзки клавиши выберите\n" +"её через Tab и нажмите пробел, или щёлкните мышкой." #, c-format msgid "" @@ -4199,66 +4183,30 @@ msgstr "" "Ð’Ð¸Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð°Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема EXTFS:\n" "%s" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Внимание: не удалоÑÑŒ открыть каталог %s\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: отÑоединение от %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: ожидаетÑÑ Ð½Ð°Ñ‡Ð°Ð»ÑŒÐ½Ð°Ñ Ñтрока..." - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "Извините, не удалоÑÑŒ Ñоздать авторизованные паролем ÑоединениÑ." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: требуетÑÑ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð´Ð»Ñ %s" - -msgid "fish: Sending password..." -msgstr "fish: поÑылаетÑÑ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ..." - -msgid "fish: Sending initial line..." -msgstr "fish: поÑылаетÑÑ Ð½Ð°Ñ‡Ð°Ð»ÑŒÐ½Ð°Ñ Ñтрока..." - -msgid "fish: Handshaking version..." -msgstr "fish: верÑÐ¸Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ ÑвÑзи..." - -msgid "fish: Getting host info..." -msgstr "fish: ÑобираетÑÑ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± удалённой машине..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: Чтение каталога %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" +msgstr "" +"Ð’Ð¸Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð°Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема EXTFS:\n" +"неправильное Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°" -#, c-format -msgid "%s: done." -msgstr "%s: готово." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" +"Ð’Ð¸Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð°Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема EXTFS:\n" +"неправильное Ð¸Ð¼Ñ Ð°Ñ€Ñ…Ð¸Ð²Ð°" -#, c-format -msgid "%s: failure" -msgstr "%s: ошибка" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" +"Ð’Ð¸Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð°Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема EXTFS:\n" +"не удаётÑÑ Ñобрать команду" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: запиÑÑŒ %s: поÑылаетÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: Ñбой локального чтениÑ, поÑылаютÑÑ Ð½ÑƒÐ»Ð¸" - -msgid "fish: storing file" -msgstr "fish: запиÑÑŒ файла" - -msgid "Aborting transfer..." -msgstr "Прерывание передачи..." - -msgid "Error reported after abort." -msgstr "Отмечена ошибка поÑле прерываниÑ." - -msgid "Aborted transfer would be successful." -msgstr "Передача уÑпешно прервана." +msgid "Warning: cannot open %s directory\n" +msgstr "Внимание: не удалоÑÑŒ открыть каталог %s\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4370,6 +4318,14 @@ msgstr "(Ñначала chdir)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: ошибка; некуда перейти на аварийный режим" +#, c-format +msgid "%s: failure" +msgstr "%s: ошибка" + +#, c-format +msgid "%s: done." +msgstr "%s: готово." + msgid "ftpfs: storing file" msgstr "ftpfs: запиÑÑŒ файла" @@ -4527,6 +4483,52 @@ msgstr "sftp: чтение ÑпиÑка файлов (прерывание по msgid "sftp: Listing done." msgstr "sftp: Чтение ÑпиÑка файлов завершено." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "shell: Отключение от %s" + +msgid "shell: Waiting for initial line..." +msgstr "shell: Ожидание начальное Ñтроки..." + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "Извините, не удалоÑÑŒ Ñоздать авторизованные паролем ÑоединениÑ." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "shell: ТребуетÑÑ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð´Ð»Ñ %s" + +msgid "shell: Sending password..." +msgstr "shell: ОтправлÑетÑÑ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ..." + +msgid "shell: Sending initial line..." +msgstr "shell: ОтправлÑетÑÑ Ð½Ð°Ñ‡Ð°Ð»ÑŒÐ½Ð°Ñ Ñтрока..." + +msgid "shell: Getting host info..." +msgstr "shell: Получение данных хоÑта..." + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "shell: Чтение каталога %s..." + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "shell: хранилище %s: отправлÑетÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°..." + +msgid "shell: Local read failed, sending zeros" +msgstr "shell: Локальное чтение не удалоÑÑŒ, отправлÑÑŽÑ‚ÑÑ Ð½ÑƒÐ»Ð¸" + +msgid "shell: storing file" +msgstr "shell: Ñохранение файла" + +msgid "Aborting transfer..." +msgstr "Прерывание передачи..." + +msgid "Error reported after abort." +msgstr "Отмечена ошибка поÑле прерываниÑ." + +msgid "Aborted transfer would be successful." +msgstr "Передача уÑпешно прервана." + msgid "Inconsistent tar archive" msgstr "ÐеÑоглаÑованный архив tar" @@ -4546,9 +4548,11 @@ msgid "" "%s\n" "doesn't look like a tar archive" msgstr "" +"%s\n" +"не похож на архив tar" msgid "tar: mc_lseek not stopped at a record boundary" -msgstr "" +msgstr "tar: mc_lseek не оÑтановилÑÑ Ð³Ñ€Ð°Ð½Ð¸Ñ†Ðµ запиÑи" msgid "undelfs: error" msgstr "undelfs: ошибка" Binary files differ@@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: hualahyja, 2019\n" "Language-Team: Slovak (http://app.transifex.com/mc/mc/language/sk/)\n" @@ -735,30 +735,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors KĽÚČ_SLOVO={POPRED},{POZAD},{ATRIB}:KĽÚČ_SLOVO2=...\n" -"\n" -"{POPRED}, {POZAD} a {ATRIB} je možné vynechaÅ¥ a použijú sa predvolené\n" -"\n" -"KľúÄové slová:\n" -" Globálne: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -" Zobr. súbor.: normal, selected, marked, markselect\n" -" Dialóg. okná: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" -" errdhotfocus\n" -" Menu: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" Rolet. menu: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -" PrehliadaÄ: viewnormal,viewbold, viewunderline, viewselected\n" -" PomocnÃk: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1625,7 +1608,7 @@ msgstr "" "PoužÃvateľsky prÃvetivý textový editor\n" "napÃsaný pre Midnight Commander." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -4135,66 +4118,24 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Upozornenie: nepodarilo sa otvoriÅ¥ adresár %s\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: Odpája sa z %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: ÄŒaká sa na inicializaÄný riadok..." - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "Ľutujeme, zatiaľ nedokážeme pracovaÅ¥ s autentifikovanými spojeniami." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: %s vyžaduje heslo" - -msgid "fish: Sending password..." -msgstr "fish: Posiela sa heslo..." - -msgid "fish: Sending initial line..." -msgstr "fish: Posiela sa inicializaÄný riadok..." - -msgid "fish: Handshaking version..." -msgstr "fish: Dohaduje sa verzia..." - -msgid "fish: Getting host info..." -msgstr "fish: ZÃskavajú sa informácie o hostiteľovi" - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: NaÄÃtava sa adresár %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" +msgstr "" -#, c-format -msgid "%s: done." -msgstr "%s: hotovo." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" -#, c-format -msgid "%s: failure" -msgstr "%s: chyba" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: store %s: posiela sa prÃkaz..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: Miestne ÄÃtanie zlyhalo, posielajú sa nuly" - -msgid "fish: storing file" -msgstr "fish: ukladá sa súbor" - -msgid "Aborting transfer..." -msgstr "PreruÅ¡uje sa prenos..." - -msgid "Error reported after abort." -msgstr "Chyba hlásená po preruÅ¡enÃ." - -msgid "Aborted transfer would be successful." -msgstr "PreruÅ¡enie prenosu bolo úspeÅ¡né." +msgid "Warning: cannot open %s directory\n" +msgstr "Upozornenie: nepodarilo sa otvoriÅ¥ adresár %s\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4306,6 +4247,14 @@ msgstr "(naprv cd)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: chyba; niet kam sa vrátiÅ¥" +#, c-format +msgid "%s: failure" +msgstr "%s: chyba" + +#, c-format +msgid "%s: done." +msgstr "%s: hotovo." + msgid "ftpfs: storing file" msgstr "ftpfs: ukladám súbor" @@ -4445,6 +4394,52 @@ msgstr "sftp: (Ctrl-G preruÅ¡Ã) Výpis... %s" msgid "sftp: Listing done." msgstr "sftp: Výpis - hotovo." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "Ľutujeme, zatiaľ nedokážeme pracovaÅ¥ s autentifikovanými spojeniami." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "PreruÅ¡uje sa prenos..." + +msgid "Error reported after abort." +msgstr "Chyba hlásená po preruÅ¡enÃ." + +msgid "Aborted transfer would be successful." +msgstr "PreruÅ¡enie prenosu bolo úspeÅ¡né." + msgid "Inconsistent tar archive" msgstr "PoÅ¡kodený archÃv .tar" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Matej UrbanÄiÄ <>, 2012\n" "Language-Team: Slovenian (http://app.transifex.com/mc/mc/language/sl/)\n" @@ -716,7 +716,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1552,7 +1553,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3952,68 +3953,25 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: Prekinjam povezavo z %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: ÄŒakam na inicializacijsko vrstico..." - -msgid "Sorry, we cannot do password authenticated connections for now." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -"Oprostite, zaenkrat ne znamo ustvarjati z geslom avtentificiranih povezav." -#, c-format -msgid "fish: Password is required for %s" +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -msgid "fish: Sending password..." -msgstr "fish: PoÅ¡iljam geslo..." - -msgid "fish: Sending initial line..." -msgstr "fish: PoÅ¡iljam inicializacijsko vrstico..." - -msgid "fish: Handshaking version..." -msgstr "fish: Rovanje razliÄic..." - -msgid "fish: Getting host info..." +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: Berem imenik %s..." - -#, c-format -msgid "%s: done." -msgstr "%s: opravljeno." - -#, c-format -msgid "%s: failure" -msgstr "%s: napaka" - -#, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: shranjujem %s: poÅ¡iljnam ukaz..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: Krajevno branje ni uspelo, poÅ¡iljam nule" - -msgid "fish: storing file" +msgid "Warning: cannot open %s directory\n" msgstr "" -msgid "Aborting transfer..." -msgstr "Prekinjam prenos..." - -msgid "Error reported after abort." -msgstr "Napaka sporoÄena po prekinitvi." - -msgid "Aborted transfer would be successful." -msgstr "Prekinjen prenos bi bil uspeÅ¡en." - #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: Prekinjam povezavo z %s" @@ -4124,6 +4082,14 @@ msgstr "(najprej spremeni imenik)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: spodletel; ni veÄ možnih reÅ¡itev" +#, c-format +msgid "%s: failure" +msgstr "%s: napaka" + +#, c-format +msgid "%s: done." +msgstr "%s: opravljeno." + msgid "ftpfs: storing file" msgstr "" @@ -4261,6 +4227,53 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" +"Oprostite, zaenkrat ne znamo ustvarjati z geslom avtentificiranih povezav." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "Prekinjam prenos..." + +msgid "Error reported after abort." +msgstr "Napaka sporoÄena po prekinitvi." + +msgid "Aborted transfer would be successful." +msgstr "Prekinjen prenos bi bil uspeÅ¡en." + msgid "Inconsistent tar archive" msgstr "Nekonsistenten tar arhiv" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Slava Zanko <slavazanko@gmail.com>, 2011\n" "Language-Team: Serbian (http://app.transifex.com/mc/mc/language/sr/)\n" @@ -722,30 +722,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors KEYWORD={FORE},{BACK},{ATTR}:KEYWORD2=...\n" -"\n" -"{FORE}, {BACK} и {ATTR} могу да Ñе изоÑтаве, а биће коришћене оÑновноÑти\n" -"\n" -" Кључне речи:\n" -" Опште: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -" Приказивање датотека: normal, selected, marked, markselect\n" -" Поља прозорчета: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" -" errdhotfocus\n" -" Изборници: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" ИÑкачући изборници: pmenunormal, pmenusel, pmenutitle\n" -" Уређивач: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -" Прегледач: viewnormal,viewbold, viewunderline, viewselected\n" -" Помоћ: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1612,7 +1595,7 @@ msgstr "" "Уређивач текÑта наклоњен кориÑнику\n" "напиÑан за Поноћног наредника." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -4111,66 +4094,24 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Упозорење: не могу да отворим директоријум „%s“\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: Прекидам везу Ñа „%s“" - -msgid "fish: Waiting for initial line..." -msgstr "fish: Чекам почетни ред..." - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "Извините, али за Ñад не можемо да Ñе повезујемо уз потврду лозинке." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: Потребна је лозинка за „%s“" - -msgid "fish: Sending password..." -msgstr "fish: Шаљем лозинку..." - -msgid "fish: Sending initial line..." -msgstr "fish: Шаљем почетни ред..." - -msgid "fish: Handshaking version..." -msgstr "fish: Преговарам о издању..." - -msgid "fish: Getting host info..." -msgstr "fish: Добављам податке о домаћину..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: Читам директоријум „%s“..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" +msgstr "" -#, c-format -msgid "%s: done." -msgstr "%s: готово." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" -#, c-format -msgid "%s: failure" -msgstr "%s: неуÑпех" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: Ñкладиште „%s“: шаљем наредбу..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: МеÑно читање није уÑпело, шаљем нуле" - -msgid "fish: storing file" -msgstr "fish: Ñмештам датотеку" - -msgid "Aborting transfer..." -msgstr "Прекидам преноÑ..." - -msgid "Error reported after abort." -msgstr "Пријављена је грешка поÑле прекида." - -msgid "Aborted transfer would be successful." -msgstr "Прекинути Ð¿Ñ€ÐµÐ½Ð¾Ñ Ð±Ð¸ био уÑпешан." +msgid "Warning: cannot open %s directory\n" +msgstr "Упозорење: не могу да отворим директоријум „%s“\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4282,6 +4223,14 @@ msgstr "(прво промени директоријум)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: ниÑам уÑпео; немам решења" +#, c-format +msgid "%s: failure" +msgstr "%s: неуÑпех" + +#, c-format +msgid "%s: done." +msgstr "%s: готово." + msgid "ftpfs: storing file" msgstr "ftpfs: Ñмештам датотеку" @@ -4421,6 +4370,52 @@ msgstr "sftp: (Ктрл-Г прекида) ИÑпиÑујем... %s" msgid "sftp: Listing done." msgstr "sftp: ИÑпиÑивање је готово." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "Извините, али за Ñад не можемо да Ñе повезујемо уз потврду лозинке." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "Прекидам преноÑ..." + +msgid "Error reported after abort." +msgstr "Пријављена је грешка поÑле прекида." + +msgid "Aborted transfer would be successful." +msgstr "Прекинути Ð¿Ñ€ÐµÐ½Ð¾Ñ Ð±Ð¸ био уÑпешан." + msgid "Inconsistent tar archive" msgstr "ÐедоÑледна тар архива" @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Alexander Kilian <alexander.kilian@gmail.com>, 2022\n" "Language-Team: Swedish (http://app.transifex.com/mc/mc/language/sv/)\n" @@ -740,30 +740,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors NYCKELORD={FÖRGR},{BAKGR},{ATTR}:NYCKELORD2=...\n" -"\n" -"Om {FÖRGR}, {BAKGR} eller {ATTR} utelämnas används förinställt värde\n" -"\n" -" Nyckelord:\n" -" Globalt: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -" Filvisning: normal, selected, marked, markselect\n" -" Dialogrutor: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" -" errdhotfocus\n" -" Menyer: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" Popupmenyer: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -" Textvisare: viewnormal,viewbold, viewunderline, viewselected\n" -" Hjälp: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1630,7 +1613,7 @@ msgstr "" "En användarvänlig texteditor\n" "skriven för Midnight Commander." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -4135,66 +4118,24 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Varning: Öppning av katalogen %s misslyckades\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: Kopplar ned frÃ¥n %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: Väntar pÃ¥ första raden..." - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "Kan inte göra lösenords autentiserade anslutningar för närvarande." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: Lösenord krävs för %s" - -msgid "fish: Sending password..." -msgstr "fish: Sänder lösenord..." - -msgid "fish: Sending initial line..." -msgstr "fish: Sänder första raden..." - -msgid "fish: Handshaking version..." -msgstr "fish: Handskakning version..." - -msgid "fish: Getting host info..." -msgstr "fish: Mottar värd-info..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: Läser katalog %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" +msgstr "" -#, c-format -msgid "%s: done." -msgstr "%s: klar." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" -#, c-format -msgid "%s: failure" -msgstr "%s: fel" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: lagrar %s: sänder kommando..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: Lokal läsning misslyckades, sänder nollor" - -msgid "fish: storing file" -msgstr "fish: sparar fil" - -msgid "Aborting transfer..." -msgstr "Avbryter överföringen..." - -msgid "Error reported after abort." -msgstr "Fel rapporterades efter avslutningen." - -msgid "Aborted transfer would be successful." -msgstr "Avbruten överföring skulle ha varit lyckad." +msgid "Warning: cannot open %s directory\n" +msgstr "Varning: Öppning av katalogen %s misslyckades\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4306,6 +4247,14 @@ msgstr "(chdir först)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: misslyckades: det finns ingenstans att falla tillbaka pÃ¥" +#, c-format +msgid "%s: failure" +msgstr "%s: fel" + +#, c-format +msgid "%s: done." +msgstr "%s: klar." + msgid "ftpfs: storing file" msgstr "ftpfs: sparar fil" @@ -4445,6 +4394,52 @@ msgstr "sftp: (Ctrl-G avbryter) Listar... %s" msgid "sftp: Listing done." msgstr "sftp: Listning klar." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "Kan inte göra lösenords autentiserade anslutningar för närvarande." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "Avbryter överföringen..." + +msgid "Error reported after abort." +msgstr "Fel rapporterades efter avslutningen." + +msgid "Aborted transfer would be successful." +msgstr "Avbruten överföring skulle ha varit lyckad." + msgid "Inconsistent tar archive" msgstr "Inkonsistensfel i tararkivet" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Silesian (http://app.transifex.com/mc/mc/language/szl/)\n" @@ -704,7 +704,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1540,7 +1541,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3905,65 +3906,23 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "" - -msgid "fish: Sending password..." -msgstr "" - -msgid "fish: Sending initial line..." -msgstr "" - -msgid "fish: Handshaking version..." -msgstr "" - -msgid "fish: Getting host info..." -msgstr "" - -#, c-format -msgid "fish: Reading directory %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#, c-format -msgid "%s: done." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "%s: failure" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "" - -msgid "fish: Local read failed, sending zeros" -msgstr "" - -msgid "fish: storing file" -msgstr "" - -msgid "Aborting transfer..." -msgstr "" - -msgid "Error reported after abort." -msgstr "" - -msgid "Aborted transfer would be successful." +msgid "Warning: cannot open %s directory\n" msgstr "" #, c-format @@ -4076,6 +4035,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "" + +#, c-format +msgid "%s: done." +msgstr "" + msgid "ftpfs: storing file" msgstr "" @@ -4209,6 +4176,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "" + +msgid "Error reported after abort." +msgstr "" + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Slava Zanko <slavazanko@gmail.com>, 2011\n" "Language-Team: Tamil (http://app.transifex.com/mc/mc/language/ta/)\n" @@ -704,7 +704,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1540,7 +1541,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3901,65 +3902,23 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "" - -msgid "fish: Sending password..." -msgstr "" - -msgid "fish: Sending initial line..." -msgstr "" - -msgid "fish: Handshaking version..." -msgstr "" - -msgid "fish: Getting host info..." -msgstr "" - -#, c-format -msgid "fish: Reading directory %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#, c-format -msgid "%s: done." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "%s: failure" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "" - -msgid "fish: Local read failed, sending zeros" -msgstr "" - -msgid "fish: storing file" -msgstr "" - -msgid "Aborting transfer..." -msgstr "" - -msgid "Error reported after abort." -msgstr "" - -msgid "Aborted transfer would be successful." +msgid "Warning: cannot open %s directory\n" msgstr "" #, c-format @@ -4072,6 +4031,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "" + +#, c-format +msgid "%s: done." +msgstr "" + msgid "ftpfs: storing file" msgstr "" @@ -4205,6 +4172,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "" + +msgid "Error reported after abort." +msgstr "" + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Telugu (http://app.transifex.com/mc/mc/language/te/)\n" @@ -703,7 +703,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1539,7 +1540,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3900,65 +3901,23 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "" - -msgid "fish: Sending password..." -msgstr "" - -msgid "fish: Sending initial line..." -msgstr "" - -msgid "fish: Handshaking version..." -msgstr "" - -msgid "fish: Getting host info..." -msgstr "" - -#, c-format -msgid "fish: Reading directory %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#, c-format -msgid "%s: done." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "%s: failure" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "" - -msgid "fish: Local read failed, sending zeros" -msgstr "" - -msgid "fish: storing file" -msgstr "" - -msgid "Aborting transfer..." -msgstr "" - -msgid "Error reported after abort." -msgstr "" - -msgid "Aborted transfer would be successful." +msgid "Warning: cannot open %s directory\n" msgstr "" #, c-format @@ -4071,6 +4030,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "" + +#, c-format +msgid "%s: done." +msgstr "" + msgid "ftpfs: storing file" msgstr "" @@ -4204,6 +4171,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "" + +msgid "Error reported after abort." +msgstr "" + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "" @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Mehmet Akif 9oglu, 2023\n" "Language-Team: Turkish (http://app.transifex.com/mc/mc/language/tr/)\n" @@ -741,31 +741,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors KEYWORD={FORE},{BACK},{ATTR}:KEYWORD2=...\n" -"\n" -"{FORE}, {BACK} ve {ATTR} kaldırılabilir, ve varsayılan kullanılacaktır\n" -"\n" -" Keywords:\n" -" Genel: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -" Dosya görüntüsü: normal, selected, marked, markselect\n" -" Ä°letiÅŸim kutucukları: dnormal, dfocus, dhotnormal, dhotfocus, " -"errdhotnormal,\n" -" errdhotfocus\n" -" Menüler: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" Açılır pencere menüleri: pmenunormal, pmenusel, pmenutitle\n" -" Düzenleyici: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -" Görüntüleyici: viewnormal,viewbold, viewunderline, viewselected\n" -" Yardım: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1636,8 +1618,8 @@ msgstr "" "Kullanıcı dostu bir metin düzenleyici\n" "Midnight Commander için yazıldı" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" -msgstr "Telif Hakkı (C) 1996-2023 Özgür Yazılım Vakfı" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" +msgstr "" msgid "About" msgstr "Hakkında" @@ -4141,67 +4123,24 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "Uyarı: %s dizini açılamadı\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: %s baÄŸlantısı kapanıyor" - -msgid "fish: Waiting for initial line..." -msgstr "fish: Kendi satırı için bekliyor..." - -msgid "Sorry, we cannot do password authenticated connections for now." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -"Ãœzgünüm, ÅŸimdilik parola ile kimlik bildirimi yapılan baÄŸlantılar yapılamıyor" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: %s için parola gerekli" - -msgid "fish: Sending password..." -msgstr "fish: Parola gönderimi..." - -msgid "fish: Sending initial line..." -msgstr "fish: Satır gönderimi..." -msgid "fish: Handshaking version..." -msgstr "fish: Sürüm anlaÅŸması..." - -msgid "fish: Getting host info..." -msgstr "fish: Ä°stemci bilgisi alınıyor" - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: %s dizini okunuyor..." - -#, c-format -msgid "%s: done." -msgstr "%s: bitti." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" -#, c-format -msgid "%s: failure" -msgstr "%s: baÅŸarısız" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: %s kaydet: komut gönderiliyor..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: Yerel okuma baÅŸarısız, sıfırlar gönderiliyor" - -msgid "fish: storing file" -msgstr "fish: dosya saklama" - -msgid "Aborting transfer..." -msgstr "Aktarım durduruluyor..." - -msgid "Error reported after abort." -msgstr "Durdurma sonra hata raporlandı." - -msgid "Aborted transfer would be successful." -msgstr "Aktarımın durdurulması baÅŸarıldı." +msgid "Warning: cannot open %s directory\n" +msgstr "Uyarı: %s dizini açılamadı\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4313,6 +4252,14 @@ msgstr "(önce chdir)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: baÅŸarısız; son çare yok" +#, c-format +msgid "%s: failure" +msgstr "%s: baÅŸarısız" + +#, c-format +msgid "%s: done." +msgstr "%s: bitti." + msgid "ftpfs: storing file" msgstr "ftpfs: dosya saklama" @@ -4452,6 +4399,53 @@ msgstr "sftp: (kesmek için Ctrl-G) Listeleniyor... %s" msgid "sftp: Listing done." msgstr "sftp: Listeleme yapıldı." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" +"Ãœzgünüm, ÅŸimdilik parola ile kimlik bildirimi yapılan baÄŸlantılar yapılamıyor" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "Aktarım durduruluyor..." + +msgid "Error reported after abort." +msgstr "Durdurma sonra hata raporlandı." + +msgid "Aborted transfer would be successful." +msgstr "Aktarımın durdurulması baÅŸarıldı." + msgid "Inconsistent tar archive" msgstr "Tar arÅŸivi düzgün deÄŸil" @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Rostyslav Haitkulov <info@ubilling.net.ua>, 2023\n" "Language-Team: Ukrainian (http://app.transifex.com/mc/mc/language/uk/)\n" @@ -750,31 +750,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors КЛЮЧ={ТЕКСТ},{ФОÐ},{ÐТРИБУТ}:KEYWORD2=...\n" -"\n" -"{ТЕКСТ}, {ФОÐ} та {ÐТРИБУТ} можна не вказувати, в такому випадку будуть " -"викориÑтовуватиÑÑŒ Ñтандартні значеннÑ\n" -"\n" -"Ключі :\n" -" Глобальні: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -" Ð’Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²: normal, selected, marked, markselect\n" -" Діалогові вікна: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" -" errdhotfocus\n" -" Меню: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" КонтекÑтні меню: pmenunormal, pmenusel, pmenutitle\n" -" Редактор: editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -" ПереглÑдач: viewnormal,viewbold, viewunderline, viewselected\n" -" Довідка: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1641,7 +1623,7 @@ msgstr "" "Дружній до кориÑтувача редактор текÑту\n" "напиÑаний Ð´Ð»Ñ Midnight Commander." -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -4172,66 +4154,24 @@ msgstr "" "Віртуальна файлова ÑиÑтема EXTFS:\n" "%s" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "ПопередженнÑ: не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ каталог %s\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: триває Ð²Ñ–Ð´â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð²Ñ–Ð´ %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: очікуєтьÑÑ Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÐ¾Ð²Ð¸Ð¹ Ñ€Ñдок…" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "Зараз немає змоги Ñтворювати з’єднаннÑ, авторизовані паролем." - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: вимагаєтьÑÑ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð´Ð»Ñ %s" - -msgid "fish: Sending password..." -msgstr "fish: триває надÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ…" - -msgid "fish: Sending initial line..." -msgstr "fish: триває надÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ð³Ð¾ Ñ€Ñдка…" - -msgid "fish: Handshaking version..." -msgstr "fish: тривають переговори про верÑію…" - -msgid "fish: Getting host info..." -msgstr "fish: триває Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ð¾Ð¼Ð¾Ñтей про вузол…" - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: триває Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð° %s…" +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" +msgstr "" -#, c-format -msgid "%s: done." -msgstr "%s: завершено." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" -#, c-format -msgid "%s: failure" -msgstr "%s: ÑталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: Ð·Ð°Ð¿Ð¸Ñ %s: триває надÑÐ¸Ð»Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸â€¦" - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: ÑталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° локального читаннÑ, надÑилаютьÑÑ Ð½ÑƒÐ»Ñ–" - -msgid "fish: storing file" -msgstr "fish: триває Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ" - -msgid "Aborting transfer..." -msgstr "Триває Ð¿ÐµÑ€ÐµÑ€Ð¸Ð²Ð°Ð½Ð½Ñ Ð¿ÐµÑ€ÐµÐ½ÐµÑеннÑ…" - -msgid "Error reported after abort." -msgstr "СталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° піÑÐ»Ñ Ð¿ÐµÑ€ÐµÑ€Ð¸Ð²Ð°Ð½Ð½Ñ." - -msgid "Aborted transfer would be successful." -msgstr "Перерване перенеÑÐµÐ½Ð½Ñ Ð¼Ð¾Ð³Ð»Ð¾ завершитиÑÑ ÑƒÑпішно." +msgid "Warning: cannot open %s directory\n" +msgstr "ПопередженнÑ: не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ каталог %s\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4343,6 +4283,14 @@ msgstr "(Ñпочатку chdir)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: ÑталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°; нікуди перейти на аварійний режим" +#, c-format +msgid "%s: failure" +msgstr "%s: ÑталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°" + +#, c-format +msgid "%s: done." +msgstr "%s: завершено." + msgid "ftpfs: storing file" msgstr "ftpfs: триває Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ" @@ -4502,6 +4450,52 @@ msgstr "sftp: (Ctrl-G перервати) Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÑпиÑку... %s" msgid "sftp: Listing done." msgstr "sftp: Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÑпиÑку завершено." +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "Зараз немає змоги Ñтворювати з’єднаннÑ, авторизовані паролем." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "Триває Ð¿ÐµÑ€ÐµÑ€Ð¸Ð²Ð°Ð½Ð½Ñ Ð¿ÐµÑ€ÐµÐ½ÐµÑеннÑ…" + +msgid "Error reported after abort." +msgstr "СталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° піÑÐ»Ñ Ð¿ÐµÑ€ÐµÑ€Ð¸Ð²Ð°Ð½Ð½Ñ." + +msgid "Aborted transfer would be successful." +msgstr "Перерване перенеÑÐµÐ½Ð½Ñ Ð¼Ð¾Ð³Ð»Ð¾ завершитиÑÑ ÑƒÑпішно." + msgid "Inconsistent tar archive" msgstr "ВиÑвлено неузгоджений архів tar" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Uzbek (http://app.transifex.com/mc/mc/language/uz/)\n" @@ -703,7 +703,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1539,7 +1540,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3896,65 +3897,23 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "" - -msgid "fish: Sending password..." -msgstr "" - -msgid "fish: Sending initial line..." -msgstr "" - -msgid "fish: Handshaking version..." -msgstr "" - -msgid "fish: Getting host info..." -msgstr "" - -#, c-format -msgid "fish: Reading directory %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#, c-format -msgid "%s: done." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "%s: failure" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "" - -msgid "fish: Local read failed, sending zeros" -msgstr "" - -msgid "fish: storing file" -msgstr "" - -msgid "Aborting transfer..." -msgstr "" - -msgid "Error reported after abort." -msgstr "" - -msgid "Aborted transfer would be successful." +msgid "Warning: cannot open %s directory\n" msgstr "" #, c-format @@ -4067,6 +4026,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "" + +#, c-format +msgid "%s: done." +msgstr "" + msgid "ftpfs: storing file" msgstr "" @@ -4200,6 +4167,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "" + +msgid "Error reported after abort." +msgstr "" + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Slava Zanko <slavazanko@gmail.com>, 2011\n" "Language-Team: Vietnamese (http://app.transifex.com/mc/mc/language/vi/)\n" @@ -706,7 +706,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1542,7 +1543,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3930,67 +3931,25 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: Ngừng kết nối từ %s" - -msgid "fish: Waiting for initial line..." -msgstr "fish: Äang chá»i dòng đầu tiên..." - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "Xin lá»—i, bây giá» không thể tạo kết nối xác thá»±c theo máºt khẩu." - -#, c-format -msgid "fish: Password is required for %s" +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -msgid "fish: Sending password..." -msgstr "fish: Äang gá»i máºt khẩu..." - -msgid "fish: Sending initial line..." -msgstr "fish: Äang gá»i dòng đầu tiên..." - -msgid "fish: Handshaking version..." -msgstr "fish: Äang xác nháºn phiên bản..." - -msgid "fish: Getting host info..." +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: Äá»c thÆ° mục %s..." - -#, c-format -msgid "%s: done." -msgstr "%s: xong." - -#, c-format -msgid "%s: failure" -msgstr "%s: lá»—i" - -#, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: bản ghi %s: Ä‘ang gá»i câu lệnh..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: Lá»—i Ä‘á»c ná»™i bá»™, Ä‘ang gá»i các số không" - -msgid "fish: storing file" +msgid "Warning: cannot open %s directory\n" msgstr "" -msgid "Aborting transfer..." -msgstr "Dừng truyá»n tải..." - -msgid "Error reported after abort." -msgstr "Có lá»—i báo cáo sau khi dừng." - -msgid "Aborted transfer would be successful." -msgstr "Dừng truyá»n tải thà nh công." - #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: Ngắt kết nối từ %s" @@ -4101,6 +4060,14 @@ msgstr "(đầu tiên chdir)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: lá»—i; không có nÆ¡i nà o để quay lại vá»" +#, c-format +msgid "%s: failure" +msgstr "%s: lá»—i" + +#, c-format +msgid "%s: done." +msgstr "%s: xong." + msgid "ftpfs: storing file" msgstr "" @@ -4238,6 +4205,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "Xin lá»—i, bây giá» không thể tạo kết nối xác thá»±c theo máºt khẩu." + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "Dừng truyá»n tải..." + +msgid "Error reported after abort." +msgstr "Có lá»—i báo cáo sau khi dừng." + +msgid "Aborted transfer would be successful." +msgstr "Dừng truyá»n tải thà nh công." + msgid "Inconsistent tar archive" msgstr "Táºp tin tar không thÃch hợp" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Slava Zanko <slavazanko@gmail.com>, 2011\n" "Language-Team: Walloon (http://app.transifex.com/mc/mc/language/wa/)\n" @@ -704,7 +704,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1540,7 +1541,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3923,65 +3924,23 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: Dji m' disraloye di %s" - -msgid "fish: Waiting for initial line..." -msgstr "" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "" - -msgid "fish: Sending password..." -msgstr "fish: dj' evoye li scret di l' ûzeu..." - -msgid "fish: Sending initial line..." -msgstr "" - -msgid "fish: Handshaking version..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" msgstr "" -msgid "fish: Getting host info..." +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" msgstr "" -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: Dji lé li ridant FTP %s..." - -#, c-format -msgid "%s: done." +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" msgstr "" #, c-format -msgid "%s: failure" -msgstr "%s: berwete" - -#, c-format -msgid "fish: store %s: sending command..." -msgstr "" - -msgid "fish: Local read failed, sending zeros" -msgstr "" - -msgid "fish: storing file" -msgstr "" - -msgid "Aborting transfer..." -msgstr "" - -msgid "Error reported after abort." -msgstr "" - -msgid "Aborted transfer would be successful." +msgid "Warning: cannot open %s directory\n" msgstr "" #, c-format @@ -4094,6 +4053,14 @@ msgstr "" msgid "ftpfs: failed; nowhere to fallback to" msgstr "" +#, c-format +msgid "%s: failure" +msgstr "%s: berwete" + +#, c-format +msgid "%s: done." +msgstr "" + msgid "ftpfs: storing file" msgstr "" @@ -4227,6 +4194,52 @@ msgstr "" msgid "sftp: Listing done." msgstr "" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "" + +msgid "Error reported after abort." +msgstr "" + +msgid "Aborted transfer would be successful." +msgstr "" + msgid "Inconsistent tar archive" msgstr "" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo Binary files differindex eccf34e..55e9c2a 100644 --- a/po/zh_CN.gmo +++ b/po/zh_CN.gmo diff --git a/po/zh_CN.po b/po/zh_CN.po index e14efe9..1305971 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Gurbuzguven <6mehmet6@gmail.com>, 2021\n" "Language-Team: Chinese (China) (http://app.transifex.com/mc/mc/language/" @@ -736,30 +736,13 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" -"--colors KEYWORD={FORE},{BACK},{ATTR}:KEYWORD2=...\n" -"\n" -"{FORE}, {BACK} åŠ {ATTR} å¯ä»¥çœç•¥ï¼Œçœç•¥æ—¶ä½¿ç”¨é»˜è®¤å€¼\n" -"\n" -"关键è¯: \n" -"全局: errors, disabled, reverse, gauge, header\n" -" input, inputmark, inputunchanged, commandlinemark\n" -" bbarhotkey, bbarbutton, statusbar\n" -"文件显示: normal, selected, marked, markselect\n" -"对è¯æ¡†çª—å£:dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal, " -"errdhotfocus\n" -"èœå•: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -"弹出èœå•:pmenunormal, pmenusel, pmenutitle\n" -"编辑器:editnormal, editbold, editmarked, editwhitespace,\n" -" editlinestate, editbg, editframe, editframeactive\n" -" editframedrag\n" -"查看器:viewbold, viewunderline, viewselected\n" -"帮助:helpnormal, helpi talic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -1625,7 +1608,7 @@ msgstr "" "为 Midnight Commander 编写的\n" "一个界é¢å‹å¥½çš„文本编辑器。" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -4122,66 +4105,24 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "è¦å‘Š: æ— æ³•æ‰“å¼€ç›®å½• %s\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: æ£åœ¨ä»Ž %s æ–开连接" - -msgid "fish: Waiting for initial line..." -msgstr "fish: æ£åœ¨ç‰å¾…åˆå§‹åŒ–è¡Œ..." - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "抱æ‰ï¼Œç›®å‰æ— 法建立密ç 验è¯çš„连接。" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: %s 需è¦å¯†ç " - -msgid "fish: Sending password..." -msgstr "fish: æ£åœ¨å‘é€å¯†ç ..." - -msgid "fish: Sending initial line..." -msgstr "fish: æ£åœ¨å‘é€åˆå§‹åŒ–è¡Œ..." - -msgid "fish: Handshaking version..." -msgstr "fish: æ£åœ¨æ¡æ‰‹ï¼Œå商版本..." - -msgid "fish: Getting host info..." -msgstr "fish: æ£åœ¨èŽ·å–主机信æ¯..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish: æ£åœ¨è¯»å–目录 %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" +msgstr "" -#, c-format -msgid "%s: done." -msgstr "%s: 完æˆã€‚" +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" -#, c-format -msgid "%s: failure" -msgstr "%s: 失败" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: ä¿å˜ %s: æ£åœ¨å‘é€å‘½ä»¤..." - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: 本地读å–失败，æ£åœ¨å‘é€é›¶" - -msgid "fish: storing file" -msgstr "fish: æ£åœ¨ä¿å˜æ–‡ä»¶" - -msgid "Aborting transfer..." -msgstr "æ£åœ¨ä¸æ¢ä¼ 输..." - -msgid "Error reported after abort." -msgstr "ä¸æ¢åŽå‘生错误。" - -msgid "Aborted transfer would be successful." -msgstr "被ä¸æ¢çš„ä¼ è¾“å¯èƒ½æˆåŠŸå®Œæˆäº†ã€‚" +msgid "Warning: cannot open %s directory\n" +msgstr "è¦å‘Š: æ— æ³•æ‰“å¼€ç›®å½• %s\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4293,6 +4234,14 @@ msgstr "(先改å˜ç›®å½•)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: 失败；没有åŽå¤‡" +#, c-format +msgid "%s: failure" +msgstr "%s: 失败" + +#, c-format +msgid "%s: done." +msgstr "%s: 完æˆã€‚" + msgid "ftpfs: storing file" msgstr "ftpfs: ä¿å˜æ–‡ä»¶ä¸" @@ -4432,6 +4381,52 @@ msgstr "sftp: (Ctrl-G 终æ¢) æ£åœ¨åˆ—出... %s" msgid "sftp: Listing done." msgstr "sftp: 列出完毕。" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "抱æ‰ï¼Œç›®å‰æ— 法建立密ç 验è¯çš„连接。" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "æ£åœ¨ä¸æ¢ä¼ 输..." + +msgid "Error reported after abort." +msgstr "ä¸æ¢åŽå‘生错误。" + +msgid "Aborted transfer would be successful." +msgstr "被ä¸æ¢çš„ä¼ è¾“å¯èƒ½æˆåŠŸå®Œæˆäº†ã€‚" + msgid "Inconsistent tar archive" msgstr "ä¸å®Œæ•´çš„ tar 档案文件" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo Binary files differindex 903dd87..1146d4d 100644 --- a/po/zh_TW.gmo +++ b/po/zh_TW.gmo diff --git a/po/zh_TW.po b/po/zh_TW.po index 9a4e67d..e4dd192 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2023-08-13 21:07+0200\n" +"POT-Creation-Date: 2024-01-27 09:33+0100\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Meng Pang Wang, 2023\n" "Language-Team: Chinese (Taiwan) (http://app.transifex.com/mc/mc/language/" @@ -724,7 +724,8 @@ msgid "" " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" -" Editor: editnormal, editbold, editmarked, editwhitespace,\n" +" Editor: editnormal, editbold, editmarked, editwhitespace, " +"editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" @@ -1569,7 +1570,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2023 the Free Software Foundation" +msgid "Copyright (C) 1996-2024 the Free Software Foundation" msgstr "" msgid "About" @@ -3985,66 +3986,24 @@ msgid "" "%s" msgstr "" -#, c-format -msgid "Warning: cannot open %s directory\n" -msgstr "è¦å‘Šï¼šç„¡æ³•é–‹å•Ÿç›®éŒ„ %s\n" - -#, c-format -msgid "fish: Disconnecting from %s" -msgstr "fish: çµæŸè‡³ %s 的連線" - -msgid "fish: Waiting for initial line..." -msgstr "fish: ç‰å¾…起始化訊æ¯" - -msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "ä¸å¥½æ„æ€ï¼Œç›®å‰ç„¡æ³•é€²è¡Œç¶“éŽå¯†ç¢¼èªè‰çš„連線。" - -#, c-format -msgid "fish: Password is required for %s" -msgstr "fish: %s è¦æ±‚輸入密碼" - -msgid "fish: Sending password..." -msgstr "fish: æ£åœ¨é€å‡ºç™»å…¥å¯†ç¢¼" - -msgid "fish: Sending initial line..." -msgstr "fish: é€å‡ºèµ·å§‹åŒ–訊æ¯" - -msgid "fish: Handshaking version..." -msgstr "fish: 交æ¡ç‰ˆæœ¬" - -msgid "fish: Getting host info..." -msgstr "fish: å–得主機資訊..." - -#, c-format -msgid "fish: Reading directory %s..." -msgstr "fish：æ£åœ¨è®€å–目錄 %s..." +msgid "" +"EXTFS virtual file system:\n" +"wrong file name" +msgstr "" -#, c-format -msgid "%s: done." -msgstr "%s: 完æˆã€‚" +msgid "" +"EXTFS virtual file system:\n" +"wrong archive name" +msgstr "" -#, c-format -msgid "%s: failure" -msgstr "%s: 失敗" +msgid "" +"EXTFS virtual file system:\n" +"cannot build command" +msgstr "" #, c-format -msgid "fish: store %s: sending command..." -msgstr "fish: 儲å˜%s: é€å‡ºå‘½ä»¤" - -msgid "fish: Local read failed, sending zeros" -msgstr "fish: 本地端讀å–錯誤, 沒有é€å‡º" - -msgid "fish: storing file" -msgstr "fish: 儲å˜æª”案" - -msgid "Aborting transfer..." -msgstr "放棄傳輸...." - -msgid "Error reported after abort." -msgstr "æ”¾æ£„å¾Œå›žå ±éŒ¯èª¤" - -msgid "Aborted transfer would be successful." -msgstr "å°‡æˆåŠŸæ”¾æ£„傳輸" +msgid "Warning: cannot open %s directory\n" +msgstr "è¦å‘Šï¼šç„¡æ³•é–‹å•Ÿç›®éŒ„ %s\n" #, c-format msgid "ftpfs: Disconnecting from %s" @@ -4156,6 +4115,14 @@ msgstr "(先切æ›è·¯å¾‘)" msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: 失敗; 無法轉移到其它目錄" +#, c-format +msgid "%s: failure" +msgstr "%s: 失敗" + +#, c-format +msgid "%s: done." +msgstr "%s: 完æˆã€‚" + msgid "ftpfs: storing file" msgstr "ftpfs: 儲å˜æª”案" @@ -4293,6 +4260,52 @@ msgstr "sftp: (Ctrl-G 跳出) 列表... %s" msgid "sftp: Listing done." msgstr "sftp: 列表完æˆã€‚" +#, c-format +msgid "shell: Disconnecting from %s" +msgstr "" + +msgid "shell: Waiting for initial line..." +msgstr "" + +msgid "Sorry, we cannot do password authenticated connections for now." +msgstr "ä¸å¥½æ„æ€ï¼Œç›®å‰ç„¡æ³•é€²è¡Œç¶“éŽå¯†ç¢¼èªè‰çš„連線。" + +#, c-format +msgid "shell: Password is required for %s" +msgstr "" + +msgid "shell: Sending password..." +msgstr "" + +msgid "shell: Sending initial line..." +msgstr "" + +msgid "shell: Getting host info..." +msgstr "" + +#, c-format +msgid "shell: Reading directory %s..." +msgstr "" + +#, c-format +msgid "shell: store %s: sending command..." +msgstr "" + +msgid "shell: Local read failed, sending zeros" +msgstr "" + +msgid "shell: storing file" +msgstr "" + +msgid "Aborting transfer..." +msgstr "放棄傳輸...." + +msgid "Error reported after abort." +msgstr "æ”¾æ£„å¾Œå›žå ±éŒ¯èª¤" + +msgid "Aborted transfer would be successful." +msgstr "å°‡æˆåŠŸæ”¾æ£„傳輸" + msgid "Inconsistent tar archive" msgstr "ä¸å®Œæ•´çš„ tar 檔案集" diff --git a/src/Makefile.in b/src/Makefile.in index 0a4b851..3fdbaed 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -148,7 +148,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ @@ -1,7 +1,7 @@ /* Handle command line arguments. - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: @@ -345,7 +345,7 @@ mc_args_new_color_group (void) " errdhotfocus\n" " Menus: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" " Popup menus: pmenunormal, pmenusel, pmenutitle\n" - " Editor: editnormal, editbold, editmarked, editwhitespace,\n" + " Editor: editnormal, editbold, editmarked, editwhitespace, editnonprintable,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" diff --git a/src/background.c b/src/background.c index 41a7f40..74c449e 100644 --- a/src/background.c +++ b/src/background.c @@ -2,7 +2,7 @@ /* Background support. - Copyright (C) 1996-2023 + Copyright (C) 1996-2024 Free Software Foundation, Inc. Written by: @@ -553,7 +553,10 @@ do_background (file_op_context_t * ctx, char *info) { int nullfd; + (void) close (comm[0]); parent_fd = comm[1]; + + (void) close (back_comm[1]); from_parent_fd = back_comm[0]; mc_global.we_are_background = TRUE; @@ -580,6 +583,8 @@ do_background (file_op_context_t * ctx, char *info) } else { + (void) close (comm[1]); + (void) close (back_comm[0]); ctx->pid = pid; register_task_running (ctx, pid, comm[0], back_comm[1], info); return 1; diff --git a/src/clipboard.c b/src/clipboard.c index 3c31cb0..a919792 100644 --- a/src/clipboard.c +++ b/src/clipboard.c @@ -1,7 +1,7 @@ /* Util for external clipboard. - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: diff --git a/src/cons.handler.c b/src/cons.handler.c index d747ff3..5f58a42 100644 --- a/src/cons.handler.c +++ b/src/cons.handler.c @@ -1,7 +1,7 @@ /* Client interface for General purpose Linux console save/restore server - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. This file is part of the Midnight Commander. diff --git a/src/consaver/Makefile.in b/src/consaver/Makefile.in index 1945611..bb55429 100644 --- a/src/consaver/Makefile.in +++ b/src/consaver/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/src/consaver/cons.saver.c b/src/consaver/cons.saver.c index 4867ab6..dda9c41 100644 --- a/src/consaver/cons.saver.c +++ b/src/consaver/cons.saver.c @@ -11,7 +11,7 @@ Partly rewritten by Jakub Jelinek <jakub@redhat.com>. - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. This file is part of the Midnight Commander. diff --git a/src/diffviewer/Makefile.in b/src/diffviewer/Makefile.in index cb5729e..b81b2dc 100644 --- a/src/diffviewer/Makefile.in +++ b/src/diffviewer/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/src/diffviewer/internal.h b/src/diffviewer/internal.h index 728d4b5..ad6fcb2 100644 --- a/src/diffviewer/internal.h +++ b/src/diffviewer/internal.h @@ -108,7 +108,7 @@ typedef struct WDiff gboolean new_frame; int skip_rows; int skip_cols; - int display_symbols; + gboolean display_symbols; int display_numbers; gboolean show_cr; int tab_size; diff --git a/src/diffviewer/search.c b/src/diffviewer/search.c index 77d09cd..e4cc306 100644 --- a/src/diffviewer/search.c +++ b/src/diffviewer/search.c @@ -1,7 +1,7 @@ /* Search functions for diffviewer. - Copyright (C) 2010-2023 + Copyright (C) 2010-2024 Free Software Foundation, Inc. Written by: @@ -85,7 +85,8 @@ mcdiffview_dialog_search (WDiff * dview) quick_widget_t quick_widgets[] = { /* *INDENT-OFF* */ QUICK_LABELED_INPUT (N_("Enter search string:"), input_label_above, INPUT_LAST_TEXT, - MC_HISTORY_SHARED_SEARCH, &exp, NULL, FALSE, FALSE, INPUT_COMPLETE_NONE), + MC_HISTORY_SHARED_SEARCH, &exp, NULL, FALSE, FALSE, + INPUT_COMPLETE_NONE), QUICK_SEPARATOR (TRUE), QUICK_START_COLUMNS, QUICK_RADIO (num_of_types, (const char **) list_of_types, diff --git a/src/diffviewer/ydiff.c b/src/diffviewer/ydiff.c index 3afb8af..c6c12dd 100644 --- a/src/diffviewer/ydiff.c +++ b/src/diffviewer/ydiff.c @@ -1,7 +1,7 @@ /* File difference viewer - Copyright (C) 2007-2023 + Copyright (C) 2007-2024 Free Software Foundation, Inc. Written by: @@ -71,19 +71,6 @@ /*** file scope macro definitions ****************************************************************/ -#define g_array_foreach(a, TP, cbf) \ -do { \ - size_t g_array_foreach_i;\ - \ - for (g_array_foreach_i = 0; g_array_foreach_i < a->len; g_array_foreach_i++) \ - { \ - TP *g_array_foreach_var; \ - \ - g_array_foreach_var = &g_array_index (a, TP, g_array_foreach_i); \ - (*cbf) (g_array_foreach_var); \ - } \ -} while (0) - #define FILE_READ_BUF 4096 #define FILE_FLAG_TEMP (1 << 0) @@ -131,6 +118,23 @@ TAB_SKIP (int ts, int pos) /* --------------------------------------------------------------------------------------------- */ +/** + * Fill buffer by spaces + * + * @param buf buffer + * @param n number of spaces + * @param zero_terminate add a nul after @n spaces + */ +static void +fill_by_space (char *buf, size_t n, gboolean zero_terminate) +{ + memset (buf, ' ', n); + if (zero_terminate) + buf[n] = '\0'; +} + +/* --------------------------------------------------------------------------------------------- */ + static gboolean rewrite_backup_content (const vfs_path_t * from_file_name_vpath, const char *to_file_name) { @@ -196,7 +200,7 @@ open_temp (void **name) */ static FBUF * -f_dopen (int fd) +dview_fdopen (int fd) { FBUF *fs; @@ -232,11 +236,11 @@ f_dopen (int fd) */ static int -f_free (FBUF * fs) +dview_ffree (FBUF * fs) { int rv = 0; - if (fs->flags & FILE_FLAG_TEMP) + if ((fs->flags & FILE_FLAG_TEMP) != 0) { rv = unlink (fs->data); g_free (fs->data); @@ -255,19 +259,19 @@ f_free (FBUF * fs) * @return file structure */ static FBUF * -f_temp (void) +dview_ftemp (void) { int fd; FBUF *fs; - fs = f_dopen (0); + fs = dview_fdopen (0); if (fs == NULL) return NULL; fd = open_temp (&fs->data); if (fd < 0) { - f_free (fs); + dview_ffree (fs); return NULL; } @@ -288,19 +292,19 @@ f_temp (void) */ static FBUF * -f_open (const char *filename, int flags) +dview_fopen (const char *filename, int flags) { int fd; FBUF *fs; - fs = f_dopen (0); + fs = dview_fdopen (0); if (fs == NULL) return NULL; fd = open (filename, flags); if (fd < 0) { - f_free (fs); + dview_ffree (fs); return NULL; } @@ -323,20 +327,20 @@ f_open (const char *filename, int flags) */ static size_t -f_gets (char *buf, size_t size, FBUF * fs) +dview_fgets (char *buf, size_t size, FBUF * fs) { size_t j = 0; do { int i; - int stop = 0; + gboolean stop = FALSE; for (i = fs->pos; j < size && i < fs->len && !stop; i++, j++) { buf[j] = fs->buf[i]; if (buf[j] == '\n') - stop = 1; + stop = TRUE; } fs->pos = i; @@ -365,11 +369,11 @@ f_gets (char *buf, size_t size, FBUF * fs) */ static off_t -f_seek (FBUF * fs, off_t off, int whence) +dview_fseek (FBUF * fs, off_t off, int whence) { off_t rv; - if (fs->len && whence != SEEK_END) + if (fs->len != 0 && whence != SEEK_END) { rv = lseek (fs->fd, 0, SEEK_CUR); if (rv != -1) @@ -404,7 +408,7 @@ f_seek (FBUF * fs, off_t off, int whence) */ static off_t -f_reset (FBUF * fs) +dview_freset (FBUF * fs) { off_t rv; @@ -428,7 +432,7 @@ f_reset (FBUF * fs) */ static ssize_t -f_write (FBUF * fs, const char *buf, size_t size) +dview_fwrite (FBUF * fs, const char *buf, size_t size) { ssize_t rv; @@ -450,7 +454,7 @@ f_write (FBUF * fs, const char *buf, size_t size) */ static off_t -f_trunc (FBUF * fs) +dview_ftrunc (FBUF * fs) { off_t off; @@ -479,14 +483,14 @@ f_trunc (FBUF * fs) */ static int -f_close (FBUF * fs) +dview_fclose (FBUF * fs) { int rv = -1; if (fs != NULL) { rv = close (fs->fd); - f_free (fs); + dview_ffree (fs); } return rv; @@ -504,7 +508,7 @@ f_close (FBUF * fs) */ static FBUF * -p_open (const char *cmd, int flags) +dview_popen (const char *cmd, int flags) { FILE *f; FBUF *fs; @@ -518,14 +522,14 @@ p_open (const char *cmd, int flags) if (type == NULL) return NULL; - fs = f_dopen (0); + fs = dview_fdopen (0); if (fs == NULL) return NULL; f = popen (cmd, type); if (f == NULL) { - f_free (fs); + dview_ffree (fs); return NULL; } @@ -544,14 +548,14 @@ p_open (const char *cmd, int flags) */ static int -p_close (FBUF * fs) +dview_pclose (FBUF * fs) { int rv = -1; if (fs != NULL) { rv = pclose (fs->data); - f_free (fs); + dview_ffree (fs); } return rv; @@ -694,7 +698,7 @@ scan_line (const char *p, GArray * ops) int f1, f2; int t1, t2; int cmd; - int range; + gboolean range = FALSE; /* handle the following cases: * NUMaNUM[,NUM] @@ -707,20 +711,19 @@ scan_line (const char *p, GArray * ops) return -1; f2 = f1; - range = 0; if (*p == ',') { p++; if (scan_deci (&p, &f2) != 0 || f2 < f1) return -1; - range = 1; + range = TRUE; } cmd = *p++; if (cmd == 'a') { - if (range != 0) + if (range) return -1; } else if (cmd != 'c' && cmd != 'd') @@ -730,17 +733,17 @@ scan_line (const char *p, GArray * ops) return -1; t2 = t1; - range = 0; + range = FALSE; if (*p == ',') { p++; if (scan_deci (&p, &t2) != 0 || t2 < t1) return -1; - range = 1; + range = TRUE; } - if (cmd == 'd' && range != 0) + if (cmd == 'd' && range) return -1; op.a[0][0] = f1; @@ -768,7 +771,7 @@ scan_diff (FBUF * f, GArray * ops) int sz; char buf[BUFSIZ]; - while ((sz = f_gets (buf, sizeof (buf) - 1, f)) != 0) + while ((sz = dview_fgets (buf, sizeof (buf) - 1, f)) != 0) { if (isdigit (buf[0])) { @@ -778,12 +781,10 @@ scan_diff (FBUF * f, GArray * ops) buf[sz] = '\0'; if (scan_line (buf, ops) != 0) return -1; - - continue; } - - while (buf[sz - 1] != '\n' && (sz = f_gets (buf, sizeof (buf), f)) != 0) - ; + else + while (buf[sz - 1] != '\n' && (sz = dview_fgets (buf, sizeof (buf), f)) != 0) + ; } return ops->len; @@ -829,14 +830,14 @@ dff_execute (const char *args, const char *extra, const char *file1, const char if (cmd == NULL) return -1; - f = p_open (cmd, O_RDONLY); + f = dview_popen (cmd, O_RDONLY); g_free (cmd); if (f == NULL) return -1; rv = scan_diff (f, ops); - code = p_close (f); + code = dview_pclose (f); if (rv < 0 || code == -1 || !WIFEXITED (code) || WEXITSTATUS (code) == 2) rv = -1; @@ -846,6 +847,38 @@ dff_execute (const char *args, const char *extra, const char *file1, const char /* --------------------------------------------------------------------------------------------- */ +static gboolean +printer_for (char ch, DFUNC printer, void *ctx, FBUF * f, int *line, off_t * off) +{ + size_t sz; + char buf[BUFSIZ]; + + sz = dview_fgets (buf, sizeof (buf), f); + if (sz == 0) + return FALSE; + + (*line)++; + printer (ctx, ch, *line, *off, sz, buf); + *off += sz; + + while (buf[sz - 1] != '\n') + { + sz = dview_fgets (buf, sizeof (buf), f); + if (sz == 0) + { + printer (ctx, 0, 0, 0, 1, "\n"); + break; + } + + printer (ctx, 0, 0, 0, sz, buf); + *off += sz; + } + + return TRUE; +} + +/* --------------------------------------------------------------------------------------------- */ + /** * Reparse and display file according to diff statements. * @@ -863,29 +896,30 @@ dff_reparse (diff_place_t ord, const char *filename, const GArray * ops, DFUNC p { size_t i; FBUF *f; - size_t sz; - char buf[BUFSIZ]; int line = 0; off_t off = 0; const DIFFCMD *op; diff_place_t eff; - int add_cmd; - int del_cmd; + int add_cmd, del_cmd; - f = f_open (filename, O_RDONLY); + f = dview_fopen (filename, O_RDONLY); if (f == NULL) return -1; - ord &= 1; + if (ord != DIFF_LEFT) + ord = DIFF_RIGHT; eff = ord; - add_cmd = 'a'; - del_cmd = 'd'; - if (ord != 0) + if (ord != DIFF_LEFT) { add_cmd = 'd'; del_cmd = 'a'; } + else + { + add_cmd = 'a'; + del_cmd = 'd'; + } #define F1 a[eff][0] #define F2 a[eff][1] #define T1 a[ ord^1 ][0] @@ -895,60 +929,26 @@ dff_reparse (diff_place_t ord, const char *filename, const GArray * ops, DFUNC p int n; op = &g_array_index (ops, DIFFCMD, i); - n = op->F1 - (op->cmd != add_cmd); - while (line < n && (sz = f_gets (buf, sizeof (buf), f)) != 0) - { - line++; - printer (ctx, EQU_CH, line, off, sz, buf); - off += sz; - while (buf[sz - 1] != '\n') - { - sz = f_gets (buf, sizeof (buf), f); - if (sz == 0) - { - printer (ctx, 0, 0, 0, 1, "\n"); - break; - } - printer (ctx, 0, 0, 0, sz, buf); - off += sz; - } - } + n = op->F1; + if (op->cmd != add_cmd) + n--; + + while (line < n && printer_for (EQU_CH, printer, ctx, f, &line, &off)) + ; if (line != n) goto err; if (op->cmd == add_cmd) - { - n = op->T2 - op->T1 + 1; - while (n != 0) - { + for (n = op->T2 - op->T1 + 1; n != 0; n--) printer (ctx, DEL_CH, 0, 0, 1, "\n"); - n--; - } - } if (op->cmd == del_cmd) { - n = op->F2 - op->F1 + 1; - while (n != 0 && (sz = f_gets (buf, sizeof (buf), f)) != 0) - { - line++; - printer (ctx, ADD_CH, line, off, sz, buf); - off += sz; - while (buf[sz - 1] != '\n') - { - sz = f_gets (buf, sizeof (buf), f); - if (sz == 0) - { - printer (ctx, 0, 0, 0, 1, "\n"); - break; - } - printer (ctx, 0, 0, 0, sz, buf); - off += sz; - } - n--; - } + for (n = op->F2 - op->F1 + 1; + n != 0 && printer_for (ADD_CH, printer, ctx, f, &line, &off); n--) + ; if (n != 0) goto err; @@ -956,35 +956,15 @@ dff_reparse (diff_place_t ord, const char *filename, const GArray * ops, DFUNC p if (op->cmd == 'c') { - n = op->F2 - op->F1 + 1; - while (n != 0 && (sz = f_gets (buf, sizeof (buf), f)) != 0) - { - line++; - printer (ctx, CHG_CH, line, off, sz, buf); - off += sz; - while (buf[sz - 1] != '\n') - { - sz = f_gets (buf, sizeof (buf), f); - if (sz == 0) - { - printer (ctx, 0, 0, 0, 1, "\n"); - break; - } - printer (ctx, 0, 0, 0, sz, buf); - off += sz; - } - n--; - } + for (n = op->F2 - op->F1 + 1; + n != 0 && printer_for (CHG_CH, printer, ctx, f, &line, &off); n--) + ; if (n != 0) goto err; - n = op->T2 - op->T1 - (op->F2 - op->F1); - while (n > 0) - { + for (n = op->T2 - op->T1 - (op->F2 - op->F1); n > 0; n--) printer (ctx, CHG_CH, 0, 0, 1, "\n"); - n--; - } } } #undef T2 @@ -992,29 +972,14 @@ dff_reparse (diff_place_t ord, const char *filename, const GArray * ops, DFUNC p #undef F2 #undef F1 - while ((sz = f_gets (buf, sizeof (buf), f)) != 0) - { - line++; - printer (ctx, EQU_CH, line, off, sz, buf); - off += sz; - while (buf[sz - 1] != '\n') - { - sz = f_gets (buf, sizeof (buf), f); - if (sz == 0) - { - printer (ctx, 0, 0, 0, 1, "\n"); - break; - } - printer (ctx, 0, 0, 0, sz, buf); - off += sz; - } - } + while (printer_for (EQU_CH, printer, ctx, f, &line, &off)) + ; - f_close (f); + dview_fclose (f); return 0; err: - f_close (f); + dview_fclose (f); return -1; } @@ -1145,8 +1110,6 @@ hdiff_multi (const char *s, const char *t, const BRACKET bracket, int min, GArra int len; ret = g_array_new (FALSE, TRUE, sizeof (PAIR)); - if (ret == NULL) - return FALSE; len = lcsubstr (s + bracket[DIFF_LEFT].off, bracket[DIFF_LEFT].len, t + bracket[DIFF_RIGHT].off, bracket[DIFF_RIGHT].len, ret, min); @@ -1295,9 +1258,8 @@ cvt_cpy (char *dst, const char *src, size_t srcsize, int base, int ts) j = TAB_SKIP (ts, i + base); i += j - 1; - while (j-- > 0) - *dst++ = ' '; - dst--; + fill_by_space (dst, j, FALSE); + dst += j - 1; } } return i + base; @@ -1339,9 +1301,8 @@ cvt_ncpy (char *dst, int dstsize, const char **_src, size_t srcsize, int base, i if (j > dstsize - i) j = dstsize - i; i += j - 1; - while (j-- > 0) - *dst++ = ' '; - dst--; + fill_by_space (dst, j, FALSE); + dst += j - 1; } } *_src = src; @@ -1435,12 +1396,9 @@ cvt_mget (const char *src, size_t srcsize, char *dst, int dstsize, int skip, int } sz = dst - tmp; } - while (dstsize != 0) - { - dstsize--; - *dst++ = ' '; - } - *dst = '\0'; + + fill_by_space (dst, dstsize, TRUE); + return sz; } @@ -1538,13 +1496,10 @@ cvt_mgeta (const char *src, size_t srcsize, char *dst, int dstsize, int skip, in } sz = dst - tmp; } - while (dstsize != 0) - { - dstsize--; - *att++ = '\0'; - *dst++ = ' '; - } - *dst = '\0'; + + memset (att, '\0', dstsize); + fill_by_space (dst, dstsize, TRUE); + return sz; } @@ -1581,17 +1536,16 @@ cvt_fget (FBUF * f, off_t off, char *dst, size_t dstsize, int skip, int ts, gboo if (sizeof (tmp) < amount || sizeof (tmp) <= dstsize || sizeof (cvt) < 8 * amount) { /* abnormal, but avoid buffer overflow */ - memset (dst, ' ', dstsize); - dst[dstsize] = '\0'; + fill_by_space (dst, dstsize, TRUE); return 0; } - f_seek (f, off, SEEK_SET); + dview_fseek (f, off, SEEK_SET); while (skip > base) { old_base = base; - sz = f_gets (tmp, amount, f); + sz = dview_fgets (tmp, amount, f); if (sz == 0) break; @@ -1606,8 +1560,7 @@ cvt_fget (FBUF * f, off_t off, char *dst, size_t dstsize, int skip, int ts, gboo if (base < skip) { - memset (dst, ' ', dstsize); - dst[dstsize] = '\0'; + fill_by_space (dst, dstsize, TRUE); return 0; } @@ -1621,7 +1574,7 @@ cvt_fget (FBUF * f, off_t off, char *dst, size_t dstsize, int skip, int ts, gboo if (q == NULL) { - sz = f_gets (tmp, dstsize - useful + 1, f); + sz = dview_fgets (tmp, dstsize - useful + 1, f); if (sz != 0) { const char *ptr = tmp; @@ -1642,7 +1595,6 @@ cvt_fget (FBUF * f, off_t off, char *dst, size_t dstsize, int skip, int ts, gboo dst[sz] = lastch; for (i = 0; i < sz && dst[i] != '\n'; i++) - { if (dst[i] == '\r' && dst[i + 1] == '\n') { if (show_cr) @@ -1653,17 +1605,13 @@ cvt_fget (FBUF * f, off_t off, char *dst, size_t dstsize, int skip, int ts, gboo dst[i++] = 'M'; } else - { dst[i++] = '*'; - } } break; } - } - for (; i < dstsize; i++) - dst[i] = ' '; - dst[i] = '\0'; + fill_by_space (dst, dstsize, TRUE); + return sz; } @@ -1671,9 +1619,9 @@ cvt_fget (FBUF * f, off_t off, char *dst, size_t dstsize, int skip, int ts, gboo /* diff printers et al ****************************************************** */ static void -cc_free_elt (void *elt) +cc_free_elt (gpointer elt) { - DIFFLN *p = elt; + DIFFLN *p = (DIFFLN *) elt; if (p != NULL) g_free (p->p); @@ -1727,7 +1675,7 @@ printer (void *ctx, int ch, int line, off_t off, size_t sz, const char *str) if (dsrc == DATA_SRC_TMP && (line != 0 || ch == 0)) { FBUF *f = ((PRINTER_CTX *) ctx)->f; - f_write (f, str, sz); + dview_fwrite (f, str, sz); } return 0; } @@ -1741,8 +1689,8 @@ redo_diff (WDiff * dview) PRINTER_CTX ctx; GArray *ops; int ndiff; - int rv; - char extra[256]; + int rv = 0; + char extra[BUF_MEDIUM]; extra[0] = '\0'; if (dview->opt.quality == 2) @@ -1762,8 +1710,8 @@ redo_diff (WDiff * dview) if (dview->dsrc != DATA_SRC_MEM) { - f_reset (f[DIFF_LEFT]); - f_reset (f[DIFF_RIGHT]); + dview_freset (f[DIFF_LEFT]); + dview_freset (f[DIFF_RIGHT]); } ops = g_array_new (FALSE, FALSE, sizeof (DIFFCMD)); @@ -1776,8 +1724,6 @@ redo_diff (WDiff * dview) } ctx.dsrc = dview->dsrc; - - rv = 0; ctx.a = dview->a[DIFF_LEFT]; ctx.f = f[DIFF_LEFT]; rv |= dff_reparse (DIFF_LEFT, dview->file[DIFF_LEFT], ops, printer, &ctx); @@ -1794,44 +1740,40 @@ redo_diff (WDiff * dview) if (dview->dsrc == DATA_SRC_TMP) { - f_trunc (f[DIFF_LEFT]); - f_trunc (f[DIFF_RIGHT]); + dview_ftrunc (f[DIFF_LEFT]); + dview_ftrunc (f[DIFF_RIGHT]); } if (dview->dsrc == DATA_SRC_MEM && HDIFF_ENABLE) { + size_t i; + dview->hdiff = g_ptr_array_new (); - if (dview->hdiff != NULL) + + for (i = 0; i < dview->a[DIFF_LEFT]->len; i++) { - size_t i; + GArray *h = NULL; + const DIFFLN *p; + const DIFFLN *q; - for (i = 0; i < dview->a[DIFF_LEFT]->len; i++) + p = &g_array_index (dview->a[DIFF_LEFT], DIFFLN, i); + q = &g_array_index (dview->a[DIFF_RIGHT], DIFFLN, i); + if (p->line != 0 && q->line != 0 && p->ch == CHG_CH) { - GArray *h = NULL; - const DIFFLN *p; - const DIFFLN *q; + gboolean runresult; - p = &g_array_index (dview->a[DIFF_LEFT], DIFFLN, i); - q = &g_array_index (dview->a[DIFF_RIGHT], DIFFLN, i); - if (p->line && q->line && p->ch == CHG_CH) - { - h = g_array_new (FALSE, FALSE, sizeof (BRACKET)); - if (h != NULL) - { - gboolean runresult; + h = g_array_new (FALSE, FALSE, sizeof (BRACKET)); - runresult = - hdiff_scan (p->p, p->u.len, q->p, q->u.len, HDIFF_MINCTX, h, - HDIFF_DEPTH); - if (!runresult) - { - g_array_free (h, TRUE); - h = NULL; - } - } + runresult = + hdiff_scan (p->p, p->u.len, q->p, q->u.len, HDIFF_MINCTX, h, HDIFF_DEPTH); + if (!runresult) + { + g_array_free (h, TRUE); + h = NULL; } - g_ptr_array_add (dview->hdiff, h); } + + g_ptr_array_add (dview->hdiff, h); } } return ndiff; @@ -1874,7 +1816,7 @@ get_digits (unsigned int n) { int d = 1; - while (n /= 10) + while ((n /= 10) != 0) d++; return d; } @@ -1935,19 +1877,19 @@ static int find_prev_hunk (const GArray * a, int pos) { #if 1 - while (pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch != EQU_CH) - pos--; - while (pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch == EQU_CH) - pos--; - while (pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch != EQU_CH) - pos--; + for (; pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch != EQU_CH; pos--) + ; + for (; pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch == EQU_CH; pos--) + ; + for (; pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch != EQU_CH; pos--) + ; if (pos > 0 && (size_t) pos < a->len) pos++; #else - while (pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos - 1))->ch == EQU_CH) - pos--; - while (pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos - 1))->ch != EQU_CH) - pos--; + for (; pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos - 1))->ch == EQU_CH; pos--) + ; + for (; pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos - 1))->ch != EQU_CH; pos--) + ; #endif return pos; @@ -1958,10 +1900,10 @@ find_prev_hunk (const GArray * a, int pos) static size_t find_next_hunk (const GArray * a, size_t pos) { - while (pos < a->len && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch != EQU_CH) - pos++; - while (pos < a->len && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch == EQU_CH) - pos++; + for (; pos < a->len && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch != EQU_CH; pos++) + ; + for (; pos < a->len && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch == EQU_CH; pos++) + ; return pos; } @@ -2009,15 +1951,17 @@ get_current_hunk (WDiff * dview, int *start_line1, int *end_line1, int *start_li default: break; } - while (pos > 0 && ((DIFFLN *) & g_array_index (a0, DIFFLN, pos))->ch != EQU_CH) - pos--; + + for (; pos > 0 && ((DIFFLN *) & g_array_index (a0, DIFFLN, pos))->ch != EQU_CH; pos--) + ; if (pos > 0) { *start_line1 = ((DIFFLN *) & g_array_index (a0, DIFFLN, pos))->line + 1; *start_line2 = ((DIFFLN *) & g_array_index (a1, DIFFLN, pos))->line + 1; } - pos = dview->skip_rows; - while (pos < a0->len && ((DIFFLN *) & g_array_index (a0, DIFFLN, pos))->ch != EQU_CH) + + for (pos = dview->skip_rows; + pos < a0->len && ((DIFFLN *) & g_array_index (a0, DIFFLN, pos))->ch != EQU_CH; pos++) { int l0, l1; @@ -2027,7 +1971,6 @@ get_current_hunk (WDiff * dview, int *start_line1, int *end_line1, int *start_li *end_line1 = MAX (*start_line1, l0); if (l1 > 0) *end_line2 = MAX (*start_line2, l1); - pos++; } } return res; @@ -2057,12 +2000,9 @@ dview_remove_hunk (WDiff * dview, FILE * merge_file, int from1, int to1, else f0 = fopen (dview->file[DIFF_LEFT], "r"); - line = 0; - while (fgets (buf, sizeof (buf), f0) != NULL && line < from1 - 1) - { - line++; + for (line = 0; fgets (buf, sizeof (buf), f0) != NULL && line < from1 - 1; line++) fputs (buf, merge_file); - } + while (fgets (buf, sizeof (buf), f0) != NULL) { line++; @@ -2090,8 +2030,7 @@ dview_add_hunk (WDiff * dview, FILE * merge_file, int from1, int from2, int to2, { int line; char buf[BUF_10K]; - FILE *f0; - FILE *f1; + FILE *f0, *f1; if (merge_direction == FROM_RIGHT_TO_LEFT) { @@ -2104,14 +2043,9 @@ dview_add_hunk (WDiff * dview, FILE * merge_file, int from1, int from2, int to2, f1 = fopen (dview->file[DIFF_RIGHT], "r"); } - line = 0; - while (fgets (buf, sizeof (buf), f0) != NULL && line < from1 - 1) - { - line++; + for (line = 0; fgets (buf, sizeof (buf), f0) != NULL && line < from1 - 1; line++) fputs (buf, merge_file); - } - line = 0; - while (fgets (buf, sizeof (buf), f1) != NULL && line <= to2) + for (line = 0; fgets (buf, sizeof (buf), f1) != NULL && line <= to2;) { line++; if (line >= from2) @@ -2141,10 +2075,9 @@ static void dview_replace_hunk (WDiff * dview, FILE * merge_file, int from1, int to1, int from2, int to2, action_direction_t merge_direction) { - int line1 = 0, line2 = 0; + int line1, line2; char buf[BUF_10K]; - FILE *f0; - FILE *f1; + FILE *f0, *f1; if (merge_direction == FROM_RIGHT_TO_LEFT) { @@ -2157,12 +2090,9 @@ dview_replace_hunk (WDiff * dview, FILE * merge_file, int from1, int to1, int fr f1 = fopen (dview->file[DIFF_RIGHT], "r"); } - while (fgets (buf, sizeof (buf), f0) != NULL && line1 < from1 - 1) - { - line1++; + for (line1 = 0; fgets (buf, sizeof (buf), f0) != NULL && line1 < from1 - 1; line1++) fputs (buf, merge_file); - } - while (fgets (buf, sizeof (buf), f1) != NULL && line2 <= to2) + for (line2 = 0; fgets (buf, sizeof (buf), f1) != NULL && line2 <= to2;) { line2++; if (line2 >= from2) @@ -2295,18 +2225,14 @@ dview_reread (WDiff * dview) destroy_hdiff (dview); if (dview->a[DIFF_LEFT] != NULL) - { - g_array_foreach (dview->a[DIFF_LEFT], DIFFLN, cc_free_elt); g_array_free (dview->a[DIFF_LEFT], TRUE); - } if (dview->a[DIFF_RIGHT] != NULL) - { - g_array_foreach (dview->a[DIFF_RIGHT], DIFFLN, cc_free_elt); g_array_free (dview->a[DIFF_RIGHT], TRUE); - } dview->a[DIFF_LEFT] = g_array_new (FALSE, FALSE, sizeof (DIFFLN)); + g_array_set_clear_func (dview->a[DIFF_LEFT], cc_free_elt); dview->a[DIFF_RIGHT] = g_array_new (FALSE, FALSE, sizeof (DIFFLN)); + g_array_set_clear_func (dview->a[DIFF_RIGHT], cc_free_elt); ndiff = redo_diff (dview); if (ndiff >= 0) @@ -2358,15 +2284,14 @@ dview_select_encoding (WDiff * dview) static void dview_load_options (WDiff * dview) { - gboolean show_numbers, show_symbols; + gboolean show_numbers; int tab_size; - show_symbols = mc_config_get_bool (mc_global.main_config, "DiffView", "show_symbols", FALSE); - if (show_symbols) - dview->display_symbols = 1; + dview->display_symbols = + mc_config_get_bool (mc_global.main_config, "DiffView", "show_symbols", FALSE); show_numbers = mc_config_get_bool (mc_global.main_config, "DiffView", "show_numbers", FALSE); if (show_numbers) - dview->display_numbers = calc_nwidth ((const GArray * const *) dview->a); + dview->display_numbers = 1; tab_size = mc_config_get_int (mc_global.main_config, "DiffView", "tab_size", 8); if (tab_size > 0 && tab_size < 9) dview->tab_size = tab_size; @@ -2394,8 +2319,7 @@ dview_load_options (WDiff * dview) static void dview_save_options (WDiff * dview) { - mc_config_set_bool (mc_global.main_config, "DiffView", "show_symbols", - dview->display_symbols != 0); + mc_config_set_bool (mc_global.main_config, "DiffView", "show_symbols", dview->display_symbols); mc_config_set_bool (mc_global.main_config, "DiffView", "show_numbers", dview->display_numbers != 0); mc_config_set_int (mc_global.main_config, "DiffView", "tab_size", dview->tab_size); @@ -2468,27 +2392,27 @@ dview_init (WDiff * dview, const char *args, const char *file1, const char *file if (dsrc == DATA_SRC_TMP) { - f[DIFF_LEFT] = f_temp (); + f[DIFF_LEFT] = dview_ftemp (); if (f[DIFF_LEFT] == NULL) return -1; - f[DIFF_RIGHT] = f_temp (); + f[DIFF_RIGHT] = dview_ftemp (); if (f[DIFF_RIGHT] == NULL) { - f_close (f[DIFF_LEFT]); + dview_fclose (f[DIFF_LEFT]); return -1; } } else if (dsrc == DATA_SRC_ORG) { - f[DIFF_LEFT] = f_open (file1, O_RDONLY); + f[DIFF_LEFT] = dview_fopen (file1, O_RDONLY); if (f[DIFF_LEFT] == NULL) return -1; - f[DIFF_RIGHT] = f_open (file2, O_RDONLY); + f[DIFF_RIGHT] = dview_fopen (file2, O_RDONLY); if (f[DIFF_RIGHT] == NULL) { - f_close (f[DIFF_LEFT]); + dview_fclose (f[DIFF_LEFT]); return -1; } } @@ -2499,7 +2423,7 @@ dview_init (WDiff * dview, const char *args, const char *file1, const char *file dview->new_frame = TRUE; dview->skip_rows = 0; dview->skip_cols = 0; - dview->display_symbols = 0; + dview->display_symbols = FALSE; dview->display_numbers = 0; dview->show_cr = TRUE; dview->tab_size = 8; @@ -2529,14 +2453,16 @@ dview_init (WDiff * dview, const char *args, const char *file1, const char *file dview_set_codeset (dview); #endif dview->a[DIFF_LEFT] = g_array_new (FALSE, FALSE, sizeof (DIFFLN)); + g_array_set_clear_func (dview->a[DIFF_LEFT], cc_free_elt); dview->a[DIFF_RIGHT] = g_array_new (FALSE, FALSE, sizeof (DIFFLN)); + g_array_set_clear_func (dview->a[DIFF_RIGHT], cc_free_elt); ndiff = redo_diff (dview); if (ndiff < 0) { /* goto MSG_DESTROY stage: dview_fini() */ - f_close (f[DIFF_LEFT]); - f_close (f[DIFF_RIGHT]); + dview_fclose (f[DIFF_LEFT]); + dview_fclose (f[DIFF_RIGHT]); return -1; } @@ -2554,8 +2480,8 @@ dview_fini (WDiff * dview) { if (dview->dsrc != DATA_SRC_MEM) { - f_close (dview->f[DIFF_RIGHT]); - f_close (dview->f[DIFF_LEFT]); + dview_fclose (dview->f[DIFF_RIGHT]); + dview_fclose (dview->f[DIFF_LEFT]); } #ifdef HAVE_CHARSET @@ -2566,13 +2492,11 @@ dview_fini (WDiff * dview) destroy_hdiff (dview); if (dview->a[DIFF_LEFT] != NULL) { - g_array_foreach (dview->a[DIFF_LEFT], DIFFLN, cc_free_elt); g_array_free (dview->a[DIFF_LEFT], TRUE); dview->a[DIFF_LEFT] = NULL; } if (dview->a[DIFF_RIGHT] != NULL) { - g_array_foreach (dview->a[DIFF_RIGHT], DIFFLN, cc_free_elt); g_array_free (dview->a[DIFF_RIGHT], TRUE); dview->a[DIFF_RIGHT] = NULL; } @@ -2591,7 +2515,7 @@ dview_display_file (const WDiff * dview, diff_place_t ord, int r, int c, int hei char buf[BUFSIZ]; FBUF *f = dview->f[ord]; int skip = dview->skip_cols; - int display_symbols = dview->display_symbols; + gboolean display_symbols = dview->display_symbols; int display_numbers = dview->display_numbers; gboolean show_cr = dview->show_cr; int tab_size = 8; @@ -2599,7 +2523,9 @@ dview_display_file (const WDiff * dview, diff_place_t ord, int r, int c, int hei int nwidth = display_numbers; int xwidth; - xwidth = display_symbols + display_numbers; + xwidth = display_numbers; + if (display_symbols) + xwidth++; if (dview->tab_size > 0 && dview->tab_size < 9) tab_size = dview->tab_size; @@ -2608,9 +2534,9 @@ dview_display_file (const WDiff * dview, diff_place_t ord, int r, int c, int hei if (xwidth > width && display_symbols) { xwidth--; - display_symbols = 0; + display_symbols = FALSE; } - if (xwidth > width && display_numbers) + if (xwidth > width && display_numbers != 0) { xwidth = width; display_numbers = width; @@ -2631,7 +2557,9 @@ dview_display_file (const WDiff * dview, diff_place_t ord, int r, int c, int hei for (i = dview->skip_rows, j = 0; i < dview->a[ord]->len && j < height; j++, i++) { - int ch, next_ch = 0, col; + int ch; + int next_ch = 0; + int col; size_t cnt; p = (DIFFLN *) & g_array_index (dview->a[ord], DIFFLN, i); @@ -2644,7 +2572,7 @@ dview_display_file (const WDiff * dview, diff_place_t ord, int r, int c, int hei } if (p->line != 0) { - if (display_numbers) + if (display_numbers != 0) { tty_gotoyx (r + j, c - xwidth); g_snprintf (buf, display_numbers + 1, "%*d", nwidth, p->line); @@ -2734,19 +2662,17 @@ dview_display_file (const WDiff * dview, diff_place_t ord, int r, int c, int hei } else { - if (display_numbers) + if (display_numbers != 0) { tty_gotoyx (r + j, c - xwidth); - memset (buf, ' ', display_numbers); - buf[display_numbers] = '\0'; + fill_by_space (buf, display_numbers, TRUE); tty_print_string (buf); } if (ch == DEL_CH) tty_setcolor (DFF_DEL_COLOR); if (ch == CHG_CH) tty_setcolor (DFF_CHD_COLOR); - memset (buf, ' ', width); - buf[width] = '\0'; + fill_by_space (buf, width, TRUE); } tty_gotoyx (r + j, c); /* tty_print_nstring (buf, width); */ @@ -2776,10 +2702,8 @@ dview_display_file (const WDiff * dview, diff_place_t ord, int r, int c, int hei if (mc_global.utf8_display) { if (!dview->utf8) - { next_ch = convert_from_8bit_to_utf_c ((unsigned char) next_ch, dview->converter); - } } else if (dview->utf8) next_ch = convert_from_utf_to_current_c (next_ch, dview->converter); @@ -2796,8 +2720,7 @@ dview_display_file (const WDiff * dview, diff_place_t ord, int r, int c, int hei k = width; if (width < xwidth - 1) k = xwidth - 1; - memset (buf, ' ', k); - buf[k] = '\0'; + fill_by_space (buf, k, TRUE); for (; j < height; j++) { if (xwidth != 0) @@ -2852,7 +2775,7 @@ dview_status (const WDiff * dview, diff_place_t ord, int width, int c) static void dview_redo (WDiff * dview) { - if (dview->display_numbers) + if (dview->display_numbers != 0) { int old; @@ -2869,8 +2792,7 @@ static void dview_update (WDiff * dview) { int height = dview->height; - int width1; - int width2; + int width1, width2; int last; last = dview->a[DIFF_LEFT]->len - 1; @@ -2885,6 +2807,10 @@ dview_update (WDiff * dview) if (height < 2) return; + /* use an actual length of dview->a */ + if (dview->display_numbers != 0) + dview->display_numbers = calc_nwidth ((const GArray * const *) dview->a); + width1 = dview->half1 + dview->bias; width2 = dview->half2 - dview->bias; if (dview->full) @@ -2898,7 +2824,9 @@ dview_update (WDiff * dview) int xwidth; tty_setcolor (NORMAL_COLOR); - xwidth = dview->display_symbols + dview->display_numbers; + xwidth = dview->display_numbers; + if (dview->display_symbols) + xwidth++; if (width1 > 1) tty_draw_box (1, 0, height, width1, FALSE); if (width2 > 1) @@ -2934,8 +2862,11 @@ dview_update (WDiff * dview) } if (width2 > 2) { - dview_status (dview, dview->ord ^ 1, width2, width1); - dview_display_file (dview, dview->ord ^ 1, 2, width1 + 1, height - 2, width2 - 2); + diff_place_t ord; + + ord = dview->ord == DIFF_LEFT ? DIFF_RIGHT : DIFF_LEFT; + dview_status (dview, ord, width2, width1); + dview_display_file (dview, ord, 2, width1 + 1, height - 2, width2 - 2); } } @@ -3004,7 +2935,6 @@ dview_goto_cmd (WDiff * dview, diff_place_t ord) size_t i = 0; if (newline > 0) - { for (; i < dview->a[ord]->len; i++) { const DIFFLN *p; @@ -3013,9 +2943,10 @@ dview_goto_cmd (WDiff * dview, diff_place_t ord) if (p->line == newline) break; } - } + dview->skip_rows = dview->search.last_accessed_num_line = (ssize_t) i; } + g_free (input); } @@ -3125,7 +3056,7 @@ dview_execute_cmd (WDiff * dview, long command) switch (command) { case CK_ShowSymbols: - dview->display_symbols ^= 1; + dview->display_symbols = !dview->display_symbols; dview->new_frame = TRUE; break; case CK_ShowNumbers: @@ -3502,9 +3433,9 @@ while (0) #define UNGET_FILE(n) \ do \ { \ - if (use_copy##n) \ + if (use_copy##n != 0) \ { \ - int changed = 0; \ + gboolean changed = FALSE; \ if (use_copy##n > 0) \ { \ time_t mtime; \ @@ -3534,8 +3465,7 @@ dview_diff_cmd (const void *f0, const void *f1) /* run from panels */ const WPanel *panel0 = (const WPanel *) f0; const WPanel *panel1 = (const WPanel *) f1; - const file_entry_t *fe0; - const file_entry_t *fe1; + const file_entry_t *fe0, *fe1; fe0 = panel_current_entry (panel0); file0 = vfs_path_append_new (panel0->cwd_vpath, fe0->fname->str, (char *) NULL); @@ -3613,12 +3543,9 @@ dview_diff_cmd (const void *f0, const void *f1) rv = -1; if (file0 != NULL && file1 != NULL) { - int use_copy0; - int use_copy1; - struct stat st0; - struct stat st1; - vfs_path_t *real_file0; - vfs_path_t *real_file1; + int use_copy0, use_copy1; + struct stat st0, st1; + vfs_path_t *real_file0, *real_file1; GET_FILE_AND_STAMP (0); GET_FILE_AND_STAMP (1); diff --git a/src/editor/Makefile.in b/src/editor/Makefile.in index b20d678..ffef1a0 100644 --- a/src/editor/Makefile.in +++ b/src/editor/Makefile.in @@ -137,7 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/src/editor/bookmark.c b/src/editor/bookmark.c index d530660..040a01b 100644 --- a/src/editor/bookmark.c +++ b/src/editor/bookmark.c @@ -1,7 +1,7 @@ /* Editor book mark handling - Copyright (C) 2001-2023 + Copyright (C) 2001-2024 Free Software Foundation, Inc. Written by: diff --git a/src/editor/edit-impl.h b/src/editor/edit-impl.h index 3d00545..98472ee 100644 --- a/src/editor/edit-impl.h +++ b/src/editor/edit-impl.h @@ -141,7 +141,7 @@ WEdit *edit_find_editor (const WDialog * h); gboolean edit_widget_is_editor (const Widget * w); gboolean edit_drop_hotkey_menu (WDialog * h, int key); void edit_menu_cmd (WDialog * h); -void user_menu (WEdit * edit, const char *menu_file, int selected_entry); +void edit_user_menu (WEdit * edit, const char *menu_file, int selected_entry); void edit_init_menu (WMenuBar * menubar); void edit_save_mode_cmd (void); off_t edit_move_forward3 (const WEdit * edit, off_t current, long cols, off_t upto); @@ -163,7 +163,7 @@ void edit_set_codeset (WEdit * edit); void edit_block_copy_cmd (WEdit * edit); void edit_block_move_cmd (WEdit * edit); -int edit_block_delete_cmd (WEdit * edit); +gboolean edit_block_delete_cmd (WEdit * edit); void edit_delete_line (WEdit * edit); int edit_delete (WEdit * edit, gboolean byte_delete); diff --git a/src/editor/edit.c b/src/editor/edit.c index dc3b322..2eceeed 100644 --- a/src/editor/edit.c +++ b/src/editor/edit.c @@ -1,7 +1,7 @@ /* Editor low level data handling and cursor fundamentals. - Copyright (C) 1996-2023 + Copyright (C) 1996-2024 Free Software Foundation, Inc. Written by: @@ -142,6 +142,7 @@ static const struct edit_filters { "lz4 -cd %s 2>&1", "lz4 > %s", ".lz4" }, { "lzip -cd %s 2>&1", "lzip > %s", ".lz"}, { "lzma -cd %s 2>&1", "lzma > %s", ".lzma" }, + { "lzop -cd %s 2>&1", "lzop > %s", ".lzo"}, { "bzip2 -cd %s 2>&1", "bzip2 > %s", ".bz2" }, { "gzip -cd %s 2>&1", "gzip > %s", ".gz" }, { "gzip -cd %s 2>&1", "gzip > %s", ".Z" } @@ -262,15 +263,20 @@ static char * edit_get_filter (const vfs_path_t * filename_vpath) { int i; - char *p, *quoted_name; + char *quoted_name; + char *p = NULL; i = edit_find_filter (filename_vpath); if (i < 0) return NULL; quoted_name = name_quote (vfs_path_as_str (filename_vpath), FALSE); - p = g_strdup_printf (all_filters[i].read, quoted_name); - g_free (quoted_name); + if (quoted_name != NULL) + { + p = g_strdup_printf (all_filters[i].read, quoted_name); + g_free (quoted_name); + } + return p; } @@ -479,6 +485,7 @@ edit_load_position (WEdit * edit, gboolean load_position) { long line, column; off_t offset; + off_t b; if (edit->filename_vpath == NULL || *(vfs_path_get_by_index (edit->filename_vpath, 0)->path) == '\0') @@ -503,7 +510,8 @@ edit_load_position (WEdit * edit, gboolean load_position) edit->search_start = edit->buffer.curs1; } - edit_move_to_prev_col (edit, edit_buffer_get_current_bol (&edit->buffer)); + b = edit_buffer_get_current_bol (&edit->buffer); + edit_move_to_prev_col (edit, b); edit_move_display (edit, line - (WIDGET (edit)->rect.lines / 2)); } @@ -637,7 +645,7 @@ edit_modification (WEdit * edit) edit->caches_valid = FALSE; /* raise lock when file modified */ - if (!edit->modified && !edit->delete_file) + if (edit->modified == 0 && edit->delete_file == 0) edit->locked = lock_file (edit->filename_vpath); edit->modified = 1; } @@ -679,12 +687,12 @@ is_blank (const edit_buffer_t * buf, off_t offset) off_t s, f; s = edit_buffer_get_bol (buf, offset); - f = edit_buffer_get_eol (buf, offset) - 1; - while (s <= f) + f = edit_buffer_get_eol (buf, offset); + for (; s < f; s++) { int c; - c = edit_buffer_get_byte (buf, s++); + c = edit_buffer_get_byte (buf, s); if (!isspace (c)) return FALSE; } @@ -697,7 +705,8 @@ is_blank (const edit_buffer_t * buf, off_t offset) static off_t edit_find_line (WEdit * edit, long line) { - long i, j = 0; + long i; + long j = 0; long m = 2000000000; /* what is the magic number? */ if (!edit->caches_valid) @@ -874,7 +883,10 @@ edit_move_to_bottom (WEdit * edit) static void edit_cursor_to_bol (WEdit * edit) { - edit_cursor_move (edit, edit_buffer_get_current_bol (&edit->buffer) - edit->buffer.curs1); + off_t b; + + b = edit_buffer_get_current_bol (&edit->buffer); + edit_cursor_move (edit, b - edit->buffer.curs1); edit->search_start = edit->buffer.curs1; edit->prev_col = edit_get_col (edit); edit->over_col = 0; @@ -886,7 +898,10 @@ edit_cursor_to_bol (WEdit * edit) static void edit_cursor_to_eol (WEdit * edit) { - edit_cursor_move (edit, edit_buffer_get_current_eol (&edit->buffer) - edit->buffer.curs1); + off_t b; + + b = edit_buffer_get_current_eol (&edit->buffer); + edit_cursor_move (edit, b - edit->buffer.curs1); edit->search_start = edit->buffer.curs1; edit->prev_col = edit_get_col (edit); edit->over_col = 0; @@ -897,8 +912,8 @@ edit_cursor_to_eol (WEdit * edit) static unsigned long my_type_of (int c) { - unsigned long x, r = 0; - const char *p, *q; + unsigned long r = 0; + const char *q; const char chars_move_whole_word[] = "!=&|<>^~ !:;, !'!`!.?!\"!( !) !{ !} !Aa0 !+-*/= |<> ![ !] !\\#! "; @@ -918,16 +933,21 @@ my_type_of (int c) else if (isspace (c)) c = ' '; q = strchr (chars_move_whole_word, c); - if (!q) + if (q == NULL) return 0xFFFFFFFFUL; + do { + unsigned long x; + const char *p; + for (x = 1, p = chars_move_whole_word; p < q; p++) if (*p == '!') x <<= 1; r |= x; } - while ((q = strchr (q + 1, c))); + while ((q = strchr (q + 1, c)) != NULL); + return r; } @@ -949,8 +969,10 @@ edit_left_word_move (WEdit * edit, int s) if (edit->buffer.curs1 == 0) break; c1 = edit_buffer_get_previous_byte (&edit->buffer); + if (c1 == '\n') + break; c2 = edit_buffer_get_current_byte (&edit->buffer); - if (c1 == '\n' || c2 == '\n') + if (c2 == '\n') break; if ((my_type_of (c1) & my_type_of (c2)) == 0) break; @@ -988,8 +1010,10 @@ edit_right_word_move (WEdit * edit, int s) if (edit->buffer.curs1 >= edit->buffer.size) break; c1 = edit_buffer_get_previous_byte (&edit->buffer); + if (c1 == '\n') + break; c2 = edit_buffer_get_current_byte (&edit->buffer); - if (c1 == '\n' || c2 == '\n') + if (c2 == '\n') break; if ((my_type_of (c1) & my_type_of (c2)) == 0) break; @@ -1118,8 +1142,10 @@ edit_right_delete_word (WEdit * edit) int c1, c2; c1 = edit_delete (edit, TRUE); + if (c1 == '\n') + break; c2 = edit_buffer_get_current_byte (&edit->buffer); - if (c1 == '\n' || c2 == '\n') + if (c2 == '\n') break; if ((isspace (c1) == 0) != (isspace (c2) == 0)) break; @@ -1138,8 +1164,10 @@ edit_left_delete_word (WEdit * edit) int c1, c2; c1 = edit_backspace (edit, TRUE); + if (c1 == '\n') + break; c2 = edit_buffer_get_previous_byte (&edit->buffer); - if (c1 == '\n' || c2 == '\n') + if (c2 == '\n') break; if ((isspace (c1) == 0) != (isspace (c2) == 0)) break; @@ -1162,8 +1190,11 @@ edit_do_undo (WEdit * edit) edit->undo_stack_disable = 1; /* don't record undo's onto undo stack! */ edit->over_col = 0; + while ((ac = edit_pop_undo_action (edit)) < KEY_PRESS) { + off_t b; + switch ((int) ac) { case STACK_BOTTOM: @@ -1199,16 +1230,14 @@ edit_do_undo (WEdit * edit) if (ac >= MARK_1 - 2 && ac < MARK_2 - 2) { edit->mark1 = ac - MARK_1; - edit->column1 = - (long) edit_move_forward3 (edit, edit_buffer_get_bol (&edit->buffer, edit->mark1), - 0, edit->mark1); + b = edit_buffer_get_bol (&edit->buffer, edit->mark1); + edit->column1 = (long) edit_move_forward3 (edit, b, 0, edit->mark1); } if (ac >= MARK_2 - 2 && ac < MARK_CURS - 2) { edit->mark2 = ac - MARK_2; - edit->column2 = - (long) edit_move_forward3 (edit, edit_buffer_get_bol (&edit->buffer, edit->mark2), - 0, edit->mark2); + b = edit_buffer_get_bol (&edit->buffer, edit->mark2); + edit->column2 = (long) edit_move_forward3 (edit, b, 0, edit->mark2); } else if (ac >= MARK_CURS - 2 && ac < KEY_PRESS) { @@ -1249,8 +1278,11 @@ edit_do_redo (WEdit * edit) return; edit->over_col = 0; + while ((ac = edit_pop_redo_action (edit)) < KEY_PRESS) { + off_t b; + switch ((int) ac) { case STACK_BOTTOM: @@ -1284,19 +1316,17 @@ edit_do_redo (WEdit * edit) if (ac >= MARK_1 - 2 && ac < MARK_2 - 2) { edit->mark1 = ac - MARK_1; - edit->column1 = - (long) edit_move_forward3 (edit, edit_buffer_get_bol (&edit->buffer, edit->mark1), - 0, edit->mark1); + b = edit_buffer_get_bol (&edit->buffer, edit->mark1); + edit->column1 = (long) edit_move_forward3 (edit, b, 0, edit->mark1); } else if (ac >= MARK_2 - 2 && ac < KEY_PRESS) { edit->mark2 = ac - MARK_2; - edit->column2 = - (long) edit_move_forward3 (edit, edit_buffer_get_bol (&edit->buffer, edit->mark2), - 0, edit->mark2); + b = edit_buffer_get_bol (&edit->buffer, edit->mark2); + edit->column2 = (long) edit_move_forward3 (edit, b, 0, edit->mark2); } /* more than one pop usually means something big */ - if (count++) + if (count++ != 0) edit->force |= REDRAW_PAGE; } @@ -1326,6 +1356,7 @@ edit_group_undo (WEdit * edit) { long ac = KEY_PRESS; long cur_ac = KEY_PRESS; + while (ac != STACK_BOTTOM && ac == cur_ac) { cur_ac = get_prev_undo_action (edit); @@ -1374,7 +1405,8 @@ is_aligned_on_a_tab (WEdit * edit) static gboolean right_of_four_spaces (WEdit * edit) { - int i, ch = 0; + int i; + int ch = 0; for (i = 1; i <= HALF_TAB_SIZE; i++) ch |= edit_buffer_get_byte (&edit->buffer, edit->buffer.curs1 - i); @@ -1442,14 +1474,8 @@ insert_spaces_tab (WEdit * edit, gboolean half) if (half) i /= 2; if (i != 0) - { - i = ((edit->curs_col / i) + 1) * i - edit->curs_col; - while (i > 0) - { + for (i = ((edit->curs_col / i) + 1) * i - edit->curs_col; i > 0; i -= space_width) edit_insert (edit, ' '); - i -= space_width; - } - } } /* --------------------------------------------------------------------------------------------- */ @@ -1609,6 +1635,8 @@ edit_move_block_to_right (WEdit * edit) do { + off_t b; + edit_cursor_move (edit, cur_bol - edit->buffer.curs1); if (!edit_line_is_blank (edit, edit->buffer.curs_line)) { @@ -1616,8 +1644,9 @@ edit_move_block_to_right (WEdit * edit) insert_spaces_tab (edit, edit_options.fake_half_tabs); else edit_insert (edit, '\t'); - edit_cursor_move (edit, - edit_buffer_get_bol (&edit->buffer, cur_bol) - edit->buffer.curs1); + + b = edit_buffer_get_bol (&edit->buffer, cur_bol); + edit_cursor_move (edit, b - edit->buffer.curs1); } if (cur_bol == 0) @@ -1687,10 +1716,10 @@ edit_move_block_to_left (WEdit * edit) static size_t edit_print_string (WEdit * e, const char *s) { - size_t i = 0; + size_t i; - while (s[i] != '\0') - edit_execute_cmd (e, CK_InsertChar, (unsigned char) s[i++]); + for (i = 0; s[i] != '\0'; i++) + edit_execute_cmd (e, CK_InsertChar, (unsigned char) s[i]); e->force |= REDRAW_COMPLETELY; edit_update_screen (e); return i; @@ -1772,10 +1801,10 @@ edit_insert_column_from_file (WEdit * edit, int file, off_t * start_pos, off_t * /** User edit menu, like user menu (F2) but only in editor. */ void -user_menu (WEdit * edit, const char *menu_file, int selected_entry) +edit_user_menu (WEdit * edit, const char *menu_file, int selected_entry) { char *block_file; - gboolean nomark; + gboolean mark; off_t curs; off_t start_mark, end_mark; struct stat status; @@ -1784,27 +1813,27 @@ user_menu (WEdit * edit, const char *menu_file, int selected_entry) block_file = mc_config_get_full_path (EDIT_HOME_BLOCK_FILE); block_file_vpath = vfs_path_from_str (block_file); curs = edit->buffer.curs1; - nomark = !eval_marks (edit, &start_mark, &end_mark); - if (!nomark) + mark = eval_marks (edit, &start_mark, &end_mark); + if (mark) edit_save_block (edit, block_file, start_mark, end_mark); /* run shell scripts from menu */ if (user_menu_cmd (CONST_WIDGET (edit), menu_file, selected_entry) && (mc_stat (block_file_vpath, &status) == 0) && (status.st_size != 0)) { - int rc = 0; + gboolean rc = FALSE; FILE *fd; /* i.e. we have marked block */ - if (!nomark) + if (mark) rc = edit_block_delete_cmd (edit); - if (rc == 0) + if (!rc) { off_t ins_len; ins_len = edit_insert_file (edit, block_file_vpath); - if (!nomark && ins_len > 0) + if (mark && ins_len > 0) edit_set_markers (edit, start_mark, start_mark + ins_len, 0, 0); } /* truncate block file */ @@ -1827,7 +1856,8 @@ edit_get_write_filter (const vfs_path_t * write_name_vpath, const vfs_path_t * f { int i; const char *write_name; - char *p, *write_name_quoted; + char *write_name_quoted; + char *p = NULL; i = edit_find_filter (filename_vpath); if (i < 0) @@ -1835,8 +1865,11 @@ edit_get_write_filter (const vfs_path_t * write_name_vpath, const vfs_path_t * f write_name = vfs_path_get_last_path_str (write_name_vpath); write_name_quoted = name_quote (write_name, FALSE); - p = g_strdup_printf (all_filters[i].write, write_name_quoted); - g_free (write_name_quoted); + if (write_name_quoted != NULL) + { + p = g_strdup_printf (all_filters[i].write, write_name_quoted); + g_free (write_name_quoted); + } return p; } @@ -1950,7 +1983,7 @@ edit_write_stream (WEdit * edit, FILE * f) gboolean is_break_char (char c) { - return (isspace (c) || strchr ("{}[]()<>=|/\\!?~-+`'\",.;:#$%^&*", c)); + return (isspace (c) || strchr ("{}[]()<>=|/\\!?~-+`'\",.;:#$%^&*", c) != NULL); } /* --------------------------------------------------------------------------------------------- */ @@ -2006,7 +2039,7 @@ edit_insert_file (WEdit * edit, const vfs_path_t * filename_vpath) { int file; off_t blocklen; - int vertical_insertion = 0; + gboolean vertical_insertion = FALSE; char *buf; file = mc_open (filename_vpath, O_RDONLY | O_BINARY); @@ -2019,7 +2052,7 @@ edit_insert_file (WEdit * edit, const vfs_path_t * filename_vpath) { /* if contain signature VERTICAL_MAGIC then it vertical block */ if (memcmp (buf, VERTICAL_MAGIC, sizeof (VERTICAL_MAGIC)) == 0) - vertical_insertion = 1; + vertical_insertion = TRUE; else mc_lseek (file, 0, SEEK_SET); } @@ -2377,6 +2410,7 @@ edit_push_undo_action (WEdit * edit, long c) && ((sp - 2) & edit->undo_stack_size_mask) != edit->undo_stack_bottom) { long d; + if (edit->undo_stack[spm1] < 0) { d = edit->undo_stack[(sp - 2) & edit->undo_stack_size_mask]; @@ -2457,6 +2491,7 @@ edit_push_redo_action (WEdit * edit, long c) && ((sp - 2) & edit->redo_stack_size_mask) != edit->redo_stack_bottom) { long d; + if (edit->redo_stack[spm1] < 0) { d = edit->redo_stack[(sp - 2) & edit->redo_stack_size_mask]; @@ -2848,8 +2883,10 @@ edit_get_cursor_offset (const WEdit * edit) long edit_get_col (const WEdit * edit) { - return (long) edit_move_forward3 (edit, edit_buffer_get_current_bol (&edit->buffer), 0, - edit->buffer.curs1); + off_t b; + + b = edit_buffer_get_current_bol (&edit->buffer); + return (long) edit_move_forward3 (edit, b, 0, edit->buffer.curs1); } /* --------------------------------------------------------------------------------------------- */ @@ -2867,8 +2904,10 @@ edit_update_curs_row (WEdit * edit) void edit_update_curs_col (WEdit * edit) { - edit->curs_col = (long) edit_move_forward3 (edit, edit_buffer_get_current_bol (&edit->buffer), - 0, edit->buffer.curs1); + off_t b; + + b = edit_buffer_get_current_bol (&edit->buffer); + edit->curs_col = (long) edit_move_forward3 (edit, b, 0, edit->buffer.curs1); } /* --------------------------------------------------------------------------------------------- */ @@ -2900,7 +2939,6 @@ edit_scroll_upward (WEdit * edit, long i) edit_update_curs_row (edit); } - /* --------------------------------------------------------------------------------------------- */ void @@ -2956,16 +2994,19 @@ edit_move_to_prev_col (WEdit * edit, off_t p) { long prev = edit->prev_col; long over = edit->over_col; + off_t b; edit_cursor_move (edit, edit_move_forward3 (edit, p, prev + edit->over_col, 0) - edit->buffer.curs1); if (edit_options.cursor_beyond_eol) { + off_t e; long line_len; - line_len = (long) edit_move_forward3 (edit, edit_buffer_get_current_bol (&edit->buffer), 0, - edit_buffer_get_current_eol (&edit->buffer)); + b = edit_buffer_get_current_bol (&edit->buffer); + e = edit_buffer_get_current_eol (&edit->buffer); + line_len = (long) edit_move_forward3 (edit, b, 0, e); if (line_len < prev + edit->over_col) { edit->over_col = prev + over - line_len; @@ -2974,9 +3015,9 @@ edit_move_to_prev_col (WEdit * edit, off_t p) } else { - edit->curs_col = prev + over; - edit->prev_col = edit->curs_col; edit->over_col = 0; + edit->prev_col = edit->curs_col; + edit->curs_col = prev + over; } } else @@ -2996,12 +3037,13 @@ edit_move_to_prev_col (WEdit * edit, off_t p) q = edit->curs_col; edit->curs_col -= (edit->curs_col % fake_half_tabs); p = edit_buffer_get_current_bol (&edit->buffer); - edit_cursor_move (edit, - edit_move_forward3 (edit, p, edit->curs_col, - 0) - edit->buffer.curs1); + b = edit_move_forward3 (edit, p, edit->curs_col, 0); + edit_cursor_move (edit, b - edit->buffer.curs1); if (!left_of_four_spaces (edit)) - edit_cursor_move (edit, - edit_move_forward3 (edit, p, q, 0) - edit->buffer.curs1); + { + b = edit_move_forward3 (edit, p, q, 0); + edit_cursor_move (edit, b - edit->buffer.curs1); + } } } } @@ -3069,6 +3111,71 @@ edit_set_markers (WEdit * edit, off_t m1, off_t m2, long c1, long c2) edit->column2 = c2; } +/* --------------------------------------------------------------------------------------------- */ +/** + if mark2 is -1 then marking is from mark1 to the cursor. + Otherwise its between the markers. This handles this. + Returns FALSE if no text is marked. + */ + +gboolean +eval_marks (WEdit * edit, off_t * start_mark, off_t * end_mark) +{ + long end_mark_curs; + + if (edit->mark1 == edit->mark2) + { + *start_mark = *end_mark = 0; + edit->column2 = edit->column1 = 0; + return FALSE; + } + + if (edit->end_mark_curs < 0) + end_mark_curs = edit->buffer.curs1; + else + end_mark_curs = edit->end_mark_curs; + + if (edit->mark2 >= 0) + { + *start_mark = MIN (edit->mark1, edit->mark2); + *end_mark = MAX (edit->mark1, edit->mark2); + } + else + { + *start_mark = MIN (edit->mark1, end_mark_curs); + *end_mark = MAX (edit->mark1, end_mark_curs); + edit->column2 = edit->curs_col + edit->over_col; + } + + if (edit->column_highlight + && ((edit->mark1 > end_mark_curs && edit->column1 < edit->column2) + || (edit->mark1 < end_mark_curs && edit->column1 > edit->column2))) + { + off_t start_bol, start_eol; + off_t end_bol, end_eol; + long col1, col2; + off_t diff1, diff2; + + start_bol = edit_buffer_get_bol (&edit->buffer, *start_mark); + start_eol = edit_buffer_get_eol (&edit->buffer, start_bol - 1) + 1; + end_bol = edit_buffer_get_bol (&edit->buffer, *end_mark); + end_eol = edit_buffer_get_eol (&edit->buffer, *end_mark); + col1 = MIN (edit->column1, edit->column2); + col2 = MAX (edit->column1, edit->column2); + + diff1 = edit_move_forward3 (edit, start_bol, col2, 0) - + edit_move_forward3 (edit, start_bol, col1, 0); + diff2 = edit_move_forward3 (edit, end_bol, col2, 0) - + edit_move_forward3 (edit, end_bol, col1, 0); + + *start_mark -= diff1; + *end_mark += diff2; + *start_mark = MAX (*start_mark, start_eol); + *end_mark = MIN (*end_mark, end_eol); + } + + return TRUE; +} /* --------------------------------------------------------------------------------------------- */ /** highlight marker toggle */ @@ -3364,7 +3471,6 @@ edit_execute_cmd (WEdit * edit, long command, int char_for_insertion) if (!mc_global.utf8_display || edit->charpoint == 0) #endif if (edit_buffer_get_current_byte (&edit->buffer) != '\n') - edit_delete (edit, FALSE); } if (edit_options.cursor_beyond_eol && edit->over_col > 0) @@ -3378,7 +3484,7 @@ edit_execute_cmd (WEdit * edit, long command, int char_for_insertion) && !mc_global.utf8_display) { unsigned char str[UTF8_CHAR_LEN + 1]; - size_t i = 0; + size_t i; int res; res = g_unichar_to_utf8 (char_for_insertion, (char *) str); @@ -3388,14 +3494,12 @@ edit_execute_cmd (WEdit * edit, long command, int char_for_insertion) str[1] = '\0'; } else - { str[res] = '\0'; - } - while (i <= UTF8_CHAR_LEN && str[i] != '\0') + + for (i = 0; i <= UTF8_CHAR_LEN && str[i] != '\0'; i++) { char_for_insertion = str[i]; edit_insert (edit, char_for_insertion); - i++; } } else @@ -3920,7 +4024,7 @@ edit_execute_cmd (WEdit * edit, long command, int char_for_insertion) edit_goto_matching_bracket (edit); break; case CK_UserMenu: - user_menu (edit, NULL, -1); + edit_user_menu (edit, NULL, -1); break; case CK_Sort: edit_sort_cmd (edit); diff --git a/src/editor/editbuffer.c b/src/editor/editbuffer.c index 24bc7ee..acc776a 100644 --- a/src/editor/editbuffer.c +++ b/src/editor/editbuffer.c @@ -1,7 +1,7 @@ /* Editor text keep buffer. - Copyright (C) 2013-2023 + Copyright (C) 2013-2024 Free Software Foundation, Inc. Written by: diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c index de624f2..bca9df7 100644 --- a/src/editor/editcmd.c +++ b/src/editor/editcmd.c @@ -1,7 +1,7 @@ /* Editor high level editing commands - Copyright (C) 1996-2023 + Copyright (C) 1996-2024 Free Software Foundation, Inc. Written by: @@ -460,22 +460,23 @@ edit_save_cmd (WEdit * edit) /* --------------------------------------------------------------------------------------------- */ static void -edit_delete_column_of_text (WEdit * edit) +edit_delete_column_of_text (WEdit * edit, off_t m1, off_t m2) { - off_t m1, m2; off_t n; + off_t r; long b, c, d; - eval_marks (edit, &m1, &m2); n = edit_buffer_get_forward_offset (&edit->buffer, m1, 0, m2) + 1; - c = (long) edit_move_forward3 (edit, edit_buffer_get_bol (&edit->buffer, m1), 0, m1); - d = (long) edit_move_forward3 (edit, edit_buffer_get_bol (&edit->buffer, m2), 0, m2); + r = edit_buffer_get_bol (&edit->buffer, m1); + c = (long) edit_move_forward3 (edit, r, 0, m1); + r = edit_buffer_get_bol (&edit->buffer, m2); + d = (long) edit_move_forward3 (edit, r, 0, m2); b = MAX (MIN (c, d), MIN (edit->column1, edit->column2)); c = MAX (c, MAX (edit->column1, edit->column2)); while (n-- != 0) { - off_t r, p, q; + off_t p, q; r = edit_buffer_get_current_bol (&edit->buffer); p = edit_move_forward3 (edit, r, b, 0); @@ -490,25 +491,22 @@ edit_delete_column_of_text (WEdit * edit) /* move to next line except on the last delete */ if (n != 0) - edit_cursor_move (edit, - edit_buffer_get_forward_offset (&edit->buffer, edit->buffer.curs1, 1, - 0) - edit->buffer.curs1); + { + r = edit_buffer_get_forward_offset (&edit->buffer, edit->buffer.curs1, 1, 0); + edit_cursor_move (edit, r - edit->buffer.curs1); + } } } /* --------------------------------------------------------------------------------------------- */ -/** if success return 0 */ +/** if success return TRUE */ -static int -edit_block_delete (WEdit * edit) +static gboolean +edit_block_delete (WEdit * edit, off_t start_mark, off_t end_mark) { - off_t start_mark, end_mark; off_t curs_pos; long curs_line, c1, c2; - if (!eval_marks (edit, &start_mark, &end_mark)) - return 0; - if (edit->column_highlight && edit->mark2 < 0) edit_mark_cmd (edit, FALSE); @@ -517,7 +515,7 @@ edit_block_delete (WEdit * edit) edit_query_dialog2 (_("Warning"), ("Block is large, you may not be able to undo this action"), _("C&ontinue"), _("&Cancel")) != 0) - return 1; + return FALSE; c1 = MIN (edit->column1, edit->column2); c2 = MAX (edit->column1, edit->column2); @@ -538,16 +536,18 @@ edit_block_delete (WEdit * edit) { if (edit->column_highlight) { + off_t b, e; off_t line_width; if (edit->mark2 < 0) edit_mark_cmd (edit, FALSE); - edit_delete_column_of_text (edit); + edit_delete_column_of_text (edit, start_mark, end_mark); /* move cursor to the saved position */ edit_move_to_line (edit, curs_line); /* calculate line width and cursor position before cut */ - line_width = edit_move_forward3 (edit, edit_buffer_get_current_bol (&edit->buffer), 0, - edit_buffer_get_current_eol (&edit->buffer)); + b = edit_buffer_get_current_bol (&edit->buffer); + e = edit_buffer_get_current_eol (&edit->buffer); + line_width = edit_move_forward3 (edit, b, 0, e); if (edit_options.cursor_beyond_eol && curs_pos > line_width) edit->over_col = curs_pos - line_width; } @@ -563,7 +563,7 @@ edit_block_delete (WEdit * edit) edit_set_markers (edit, 0, 0, 0, 0); edit->force |= REDRAW_PAGE; - return 0; + return TRUE; } /* --------------------------------------------------------------------------------------------- */ @@ -586,7 +586,8 @@ edit_get_block (WEdit * edit, off_t start, off_t finish, off_t * l) int c; off_t x; - x = edit_move_forward3 (edit, edit_buffer_get_bol (&edit->buffer, start), 0, start); + x = edit_buffer_get_bol (&edit->buffer, start); + x = edit_move_forward3 (edit, x, 0, start); c = edit_buffer_get_byte (&edit->buffer, start); if ((x >= edit->column1 && x < edit->column2) || (x >= edit->column2 && x < edit->column1) || c == '\n') @@ -631,15 +632,28 @@ static void pipe_mail (const edit_buffer_t * buf, char *to, char *subject, char *cc) { FILE *p = 0; - char *s; + char *s = NULL; to = name_quote (to, FALSE); - subject = name_quote (subject, FALSE); - cc = name_quote (cc, FALSE); - s = g_strconcat ("mail -s ", subject, *cc ? " -c " : "", cc, " ", to, (char *) NULL); - g_free (to); - g_free (subject); - g_free (cc); + if (to != NULL) + { + subject = name_quote (subject, FALSE); + if (subject != NULL) + { + cc = name_quote (cc, FALSE); + if (cc == NULL) + s = g_strdup_printf ("mail -s %s %s", subject, to); + else + { + s = g_strdup_printf ("mail -s %s -c %s %s", subject, cc, to); + g_free (cc); + } + + g_free (subject); + } + + g_free (to); + } if (s != NULL) { @@ -1256,72 +1270,6 @@ edit_close_cmd (WEdit * edit) } /* --------------------------------------------------------------------------------------------- */ -/** - if mark2 is -1 then marking is from mark1 to the cursor. - Otherwise its between the markers. This handles this. - Returns FALSE if no text is marked. - */ - -gboolean -eval_marks (WEdit * edit, off_t * start_mark, off_t * end_mark) -{ - long end_mark_curs; - - if (edit->mark1 == edit->mark2) - { - *start_mark = *end_mark = 0; - edit->column2 = edit->column1 = 0; - return FALSE; - } - - if (edit->end_mark_curs < 0) - end_mark_curs = edit->buffer.curs1; - else - end_mark_curs = edit->end_mark_curs; - - if (edit->mark2 >= 0) - { - *start_mark = MIN (edit->mark1, edit->mark2); - *end_mark = MAX (edit->mark1, edit->mark2); - } - else - { - *start_mark = MIN (edit->mark1, end_mark_curs); - *end_mark = MAX (edit->mark1, end_mark_curs); - edit->column2 = edit->curs_col + edit->over_col; - } - - if (edit->column_highlight - && ((edit->mark1 > end_mark_curs && edit->column1 < edit->column2) - || (edit->mark1 < end_mark_curs && edit->column1 > edit->column2))) - { - off_t start_bol, start_eol; - off_t end_bol, end_eol; - long col1, col2; - off_t diff1, diff2; - - start_bol = edit_buffer_get_bol (&edit->buffer, *start_mark); - start_eol = edit_buffer_get_eol (&edit->buffer, start_bol - 1) + 1; - end_bol = edit_buffer_get_bol (&edit->buffer, *end_mark); - end_eol = edit_buffer_get_eol (&edit->buffer, *end_mark); - col1 = MIN (edit->column1, edit->column2); - col2 = MAX (edit->column1, edit->column2); - - diff1 = edit_move_forward3 (edit, start_bol, col2, 0) - - edit_move_forward3 (edit, start_bol, col1, 0); - diff2 = edit_move_forward3 (edit, end_bol, col2, 0) - - edit_move_forward3 (edit, end_bol, col1, 0); - - *start_mark -= diff1; - *end_mark += diff2; - *start_mark = MAX (*start_mark, start_eol); - *end_mark = MIN (*end_mark, end_eol); - } - - return TRUE; -} - -/* --------------------------------------------------------------------------------------------- */ void edit_block_copy_cmd (WEdit * edit) @@ -1398,6 +1346,7 @@ edit_block_move_cmd (WEdit * edit) off_t size; long c1, c2, b_width; long x, x2; + off_t b1, b2; c1 = MIN (edit->column1, edit->column2); c2 = MAX (edit->column1, edit->column2); @@ -1409,8 +1358,9 @@ edit_block_move_cmd (WEdit * edit) x2 = x + edit->over_col; /* do nothing when cursor inside first line of selected area */ - if ((edit_buffer_get_eol (&edit->buffer, edit->buffer.curs1) == - edit_buffer_get_eol (&edit->buffer, start_mark)) && x2 > c1 && x2 <= c2) + b1 = edit_buffer_get_eol (&edit->buffer, edit->buffer.curs1); + b2 = edit_buffer_get_eol (&edit->buffer, start_mark); + if (b1 == b2 && x2 > c1 && x2 <= c2) return; if (edit->buffer.curs1 > start_mark @@ -1429,7 +1379,8 @@ edit_block_move_cmd (WEdit * edit) edit->over_col = MAX (0, edit->over_col - b_width); /* calculate the cursor pos after delete block */ - current = edit_move_forward3 (edit, edit_buffer_get_current_bol (&edit->buffer), x, 0); + b1 = edit_buffer_get_current_bol (&edit->buffer); + current = edit_move_forward3 (edit, b1, x, 0); edit_cursor_move (edit, current - edit->buffer.curs1); edit_scroll_screen_over_cursor (edit); @@ -1443,6 +1394,7 @@ edit_block_move_cmd (WEdit * edit) else { off_t count, count_orig; + off_t x; current = edit->buffer.curs1; copy_buf = g_malloc0 (end_mark - start_mark); @@ -1453,9 +1405,8 @@ edit_block_move_cmd (WEdit * edit) copy_buf[end_mark - count - 1] = edit_delete (edit, TRUE); edit_scroll_screen_over_cursor (edit); - edit_cursor_move (edit, - current - edit->buffer.curs1 - - (((current - edit->buffer.curs1) > 0) ? end_mark - start_mark : 0)); + x = current > edit->buffer.curs1 ? end_mark - start_mark : 0; + edit_cursor_move (edit, current - edit->buffer.curs1 - x); edit_scroll_screen_over_cursor (edit); count_orig = count; while (count-- > start_mark) @@ -1475,19 +1426,19 @@ edit_block_move_cmd (WEdit * edit) } /* --------------------------------------------------------------------------------------------- */ -/** returns 1 if canceelled by user */ +/** returns FALSE if canceelled by user */ -int +gboolean edit_block_delete_cmd (WEdit * edit) { off_t start_mark, end_mark; if (eval_marks (edit, &start_mark, &end_mark)) - return edit_block_delete (edit); + return edit_block_delete (edit, start_mark, end_mark); edit_delete_line (edit); - return 0; + return TRUE; } /* --------------------------------------------------------------------------------------------- */ @@ -1859,7 +1810,7 @@ edit_sort_cmd (WEdit * edit) edit->force |= REDRAW_COMPLETELY; - if (edit_block_delete_cmd (edit)) + if (!edit_block_delete_cmd (edit)) return 1; { @@ -1934,7 +1885,7 @@ edit_block_process_cmd (WEdit * edit, int macro_number) fname = g_strdup_printf ("%s.%i.sh", EDIT_HOME_MACRO_FILE, macro_number); macros_fname = g_build_filename (mc_config_get_data_path (), fname, (char *) NULL); - user_menu (edit, macros_fname, 0); + edit_user_menu (edit, macros_fname, 0); g_free (fname); g_free (macros_fname); edit->force |= REDRAW_COMPLETELY; diff --git a/src/editor/editcomplete.c b/src/editor/editcomplete.c index 06f304d..f3ea0e7 100644 --- a/src/editor/editcomplete.c +++ b/src/editor/editcomplete.c @@ -1,7 +1,7 @@ /* Editor word completion engine - Copyright (C) 2021-2023 + Copyright (C) 2021-2024 Free Software Foundation, Inc. Written by: diff --git a/src/editor/editdraw.c b/src/editor/editdraw.c index fbd1e09..49be571 100644 --- a/src/editor/editdraw.c +++ b/src/editor/editdraw.c @@ -1,7 +1,7 @@ /* Editor text drawing. - Copyright (C) 1996-2023 + Copyright (C) 1996-2024 Free Software Foundation, Inc. Written by: @@ -448,7 +448,6 @@ print_to_widget (WEdit * edit, long row, int start_col, int start_col_real, { int style; unsigned int textchar; - int color; if (cols_to_skip != 0) { @@ -458,8 +457,6 @@ print_to_widget (WEdit * edit, long row, int start_col, int start_col_real, style = p->style & 0xFF00; textchar = p->ch; - /* If non-printable - use black background */ - color = (style & MOD_ABNORMAL) != 0 ? 0 : p->style >> 16; if ((style & MOD_WHITESPACE) != 0) { @@ -475,8 +472,10 @@ print_to_widget (WEdit * edit, long row, int start_col, int start_col_real, tty_setcolor (EDITOR_BOLD_COLOR); else if ((style & MOD_MARKED) != 0) tty_setcolor (EDITOR_MARKED_COLOR); + else if ((style & MOD_ABNORMAL) != 0) + tty_setcolor (EDITOR_NONPRINTABLE_COLOR); else - tty_lowlevel_setcolor (color); + tty_lowlevel_setcolor (p->style >> 16); if (edit_options.show_right_margin) { @@ -951,9 +950,8 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row, if ((force & REDRAW_LINE_ABOVE) != 0 && curs_row >= 1) { row = curs_row - 1; - b = edit_buffer_get_backward_offset (&edit->buffer, - edit_buffer_get_current_bol (&edit->buffer), - 1); + b = edit_buffer_get_current_bol (&edit->buffer); + b = edit_buffer_get_backward_offset (&edit->buffer, b, 1); if (row >= start_row && row <= end_row) { if (key_pending (edit)) diff --git a/src/editor/editmacros.c b/src/editor/editmacros.c index 8545d67..6c07139 100644 --- a/src/editor/editmacros.c +++ b/src/editor/editmacros.c @@ -1,7 +1,7 @@ /* Editor macros engine - Copyright (C) 2001-2023 + Copyright (C) 2001-2024 Free Software Foundation, Inc. This file is part of the Midnight Commander. diff --git a/src/editor/editmenu.c b/src/editor/editmenu.c index 3509fa2..f83742c 100644 --- a/src/editor/editmenu.c +++ b/src/editor/editmenu.c @@ -1,7 +1,7 @@ /* Editor menu definitions and initialisation - Copyright (C) 1996-2023 + Copyright (C) 1996-2024 Free Software Foundation, Inc. Written by: diff --git a/src/editor/editoptions.c b/src/editor/editoptions.c index 9e059f3..c81d9b8 100644 --- a/src/editor/editoptions.c +++ b/src/editor/editoptions.c @@ -1,7 +1,7 @@ /* Editor options dialog box - Copyright (C) 1996-2023 + Copyright (C) 1996-2024 Free Software Foundation, Inc. Written by: diff --git a/src/editor/editsearch.c b/src/editor/editsearch.c index 1bdf883..4ed5785 100644 --- a/src/editor/editsearch.c +++ b/src/editor/editsearch.c @@ -1,7 +1,7 @@ /* Search & replace engine of MCEditor. - Copyright (C) 2021-2023 + Copyright (C) 2021-2024 Free Software Foundation, Inc. Written by: @@ -29,7 +29,7 @@ #include "lib/global.h" #include "lib/search.h" -#include "lib/mcconfig.h" /* mc_config_history_get */ +#include "lib/mcconfig.h" /* mc_config_history_get_recent_item() */ #ifdef HAVE_CHARSET #include "lib/charsets.h" /* cp_source */ #endif @@ -780,16 +780,12 @@ edit_search_cmd (WEdit * edit, gboolean again) else { /* find last search string in history */ - GList *history; + char *s; - history = mc_config_history_get (MC_HISTORY_SHARED_SEARCH); - if (history != NULL) + s = mc_config_history_get_recent_item (MC_HISTORY_SHARED_SEARCH); + if (s != NULL) { - /* FIXME: is it possible that history->data == NULL? */ - edit->last_search_string = (char *) history->data; - history->data = NULL; - history = g_list_first (history); - g_list_free_full (history, g_free); + edit->last_search_string = s; if (edit_search_init (edit, edit->last_search_string)) { @@ -877,7 +873,8 @@ edit_replace_cmd (WEdit * edit, gboolean again) edit->search = NULL; } - input2_str = g_string_new (input2); + input2_str = g_string_new_take (input2); + input2 = NULL; if (edit->search == NULL) { diff --git a/src/editor/editwidget.c b/src/editor/editwidget.c index 05f03e8..45be31e 100644 --- a/src/editor/editwidget.c +++ b/src/editor/editwidget.c @@ -1,7 +1,7 @@ /* Editor initialisation and callback handler. - Copyright (C) 1996-2023 + Copyright (C) 1996-2024 Free Software Foundation, Inc. Written by: @@ -152,7 +152,7 @@ edit_about (void) QUICK_LABEL (N_("A user friendly text editor\n" "written for the Midnight Commander."), NULL), QUICK_SEPARATOR (FALSE), - QUICK_LABEL (N_("Copyright (C) 1996-2023 the Free Software Foundation"), NULL), + QUICK_LABEL (N_("Copyright (C) 1996-2024 the Free Software Foundation"), NULL), QUICK_START_BUTTONS (TRUE, TRUE), QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), QUICK_END @@ -182,9 +182,10 @@ edit_about (void) */ static void -edit_help (void) +edit_help (const WDialog * h) { - ev_help_t event_data = { NULL, "[Internal File Editor]" }; + ev_help_t event_data = { NULL, h->help_ctx }; + mc_event_raise (MCEVENT_GROUP_CORE, "help", &event_data); } @@ -426,8 +427,7 @@ edit_dialog_command_execute (WDialog * h, long command) dlg_close (h); break; case CK_Help: - edit_help (); - /* edit->force |= REDRAW_COMPLETELY; */ + edit_help (h); break; case CK_Menu: edit_menu_cmd (h); diff --git a/src/editor/etags.c b/src/editor/etags.c index 7b570d6..ddc5ca8 100644 --- a/src/editor/etags.c +++ b/src/editor/etags.c @@ -6,7 +6,7 @@ or, if etags utility not installed: $ find . -type f -name "*.[ch]" | ctags --c-kinds=+p --fields=+iaS --extra=+q -e -L- - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: diff --git a/src/editor/format.c b/src/editor/format.c index 3193067..9dc5d72 100644 --- a/src/editor/format.c +++ b/src/editor/format.c @@ -1,7 +1,7 @@ /* Dynamic paragraph formatting. - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Copyright (C) 1996 Paul Sheer diff --git a/src/editor/spell.c b/src/editor/spell.c index aeb0884..9d26345 100644 --- a/src/editor/spell.c +++ b/src/editor/spell.c @@ -1,7 +1,7 @@ /* Editor spell checker - Copyright (C) 2012-2023 + Copyright (C) 2012-2024 Free Software Foundation, Inc. Written by: diff --git a/src/editor/syntax.c b/src/editor/syntax.c index f95ad2b..4b8116f 100644 --- a/src/editor/syntax.c +++ b/src/editor/syntax.c @@ -1,7 +1,7 @@ /* Editor syntax highlighting. - Copyright (C) 1996-2023 + Copyright (C) 1996-2024 Free Software Foundation, Inc. Written by: @@ -248,7 +248,8 @@ compare_word_to_right (const WEdit * edit, off_t i, const GString * text, const unsigned char *p, *q; int c, d, j; - c = xx_tolower (edit, edit_buffer_get_byte (&edit->buffer, i - 1)); + c = edit_buffer_get_byte (&edit->buffer, i - 1); + c = xx_tolower (edit, c); if ((line_start && c != '\n') || (whole_left != NULL && strchr (whole_left, c) != NULL)) return -1; @@ -261,7 +262,8 @@ compare_word_to_right (const WEdit * edit, off_t i, const GString * text, return -1; while (TRUE) { - c = xx_tolower (edit, edit_buffer_get_byte (&edit->buffer, i)); + c = edit_buffer_get_byte (&edit->buffer, i); + c = xx_tolower (edit, c); if (*p == '\0' && whole_right != NULL && strchr (whole_right, c) == NULL) break; if (c == *p) @@ -277,7 +279,8 @@ compare_word_to_right (const WEdit * edit, off_t i, const GString * text, j = 0; while (TRUE) { - c = xx_tolower (edit, edit_buffer_get_byte (&edit->buffer, i)); + c = edit_buffer_get_byte (&edit->buffer, i); + c = xx_tolower (edit, c); if (c == *p) { j = i; @@ -308,7 +311,8 @@ compare_word_to_right (const WEdit * edit, off_t i, const GString * text, while (TRUE) { d = c; - c = xx_tolower (edit, edit_buffer_get_byte (&edit->buffer, i)); + c = edit_buffer_get_byte (&edit->buffer, i); + c = xx_tolower (edit, c); for (j = 0; p[j] != SYNTAX_TOKEN_BRACKET && p[j] != '\0'; j++) if (c == p[j]) goto found_char2; @@ -327,7 +331,8 @@ compare_word_to_right (const WEdit * edit, off_t i, const GString * text, case SYNTAX_TOKEN_BRACE: if (++p > q) return -1; - c = xx_tolower (edit, edit_buffer_get_byte (&edit->buffer, i)); + c = edit_buffer_get_byte (&edit->buffer, i); + c = xx_tolower (edit, c); for (; *p != SYNTAX_TOKEN_BRACE && *p != '\0'; p++) if (c == *p) goto found_char3; @@ -337,13 +342,18 @@ compare_word_to_right (const WEdit * edit, off_t i, const GString * text, p++; break; default: - if (*p != xx_tolower (edit, edit_buffer_get_byte (&edit->buffer, i))) + c = edit_buffer_get_byte (&edit->buffer, i); + if (*p != xx_tolower (edit, c)) return -1; } } - return (whole_right != NULL && - strchr (whole_right, - xx_tolower (edit, edit_buffer_get_byte (&edit->buffer, i))) != NULL) ? -1 : i; + + if (whole_right == NULL) + return i; + + c = edit_buffer_get_byte (&edit->buffer, i); + c = xx_tolower (edit, c); + return strchr (whole_right, c) != NULL ? -1 : i; } /* --------------------------------------------------------------------------------------------- */ @@ -371,7 +381,8 @@ apply_rules_going_right (WEdit * edit, off_t i) off_t end = 0; edit_syntax_rule_t _rule = edit->rule; - c = xx_tolower (edit, edit_buffer_get_byte (&edit->buffer, i)); + c = edit_buffer_get_byte (&edit->buffer, i); + c = xx_tolower (edit, c); if (c == 0) return; @@ -801,44 +812,44 @@ get_args (char *l, char **args, int args_size) /* --------------------------------------------------------------------------------------------- */ static int -this_try_alloc_color_pair (const char *fg, const char *bg, const char *attrs) +this_try_alloc_color_pair (tty_color_pair_t * color) { char f[80], b[80], a[80], *p; - if (bg != NULL && *bg == '\0') - bg = NULL; - if (fg != NULL && *fg == '\0') - fg = NULL; - if (attrs != NULL && *attrs == '\0') - attrs = NULL; + if (color->bg != NULL && *color->bg == '\0') + color->bg = NULL; + if (color->fg != NULL && *color->fg == '\0') + color->fg = NULL; + if (color->attrs != NULL && *color->attrs == '\0') + color->attrs = NULL; - if ((fg == NULL) && (bg == NULL)) + if (color->fg == NULL && color->bg == NULL) return EDITOR_NORMAL_COLOR; - if (fg != NULL) + if (color->fg != NULL) { - g_strlcpy (f, fg, sizeof (f)); + g_strlcpy (f, color->fg, sizeof (f)); p = strchr (f, '/'); if (p != NULL) *p = '\0'; - fg = f; + color->fg = f; } - if (bg != NULL) + if (color->bg != NULL) { - g_strlcpy (b, bg, sizeof (b)); + g_strlcpy (b, color->bg, sizeof (b)); p = strchr (b, '/'); if (p != NULL) *p = '\0'; - bg = b; + color->bg = b; } - if ((fg == NULL) || (bg == NULL)) + if (color->fg == NULL || color->bg == NULL) { /* get colors from skin */ char *editnormal; editnormal = mc_skin_get ("editor", "_default_", "default;default"); - if (fg == NULL) + if (color->fg == NULL) { g_strlcpy (f, editnormal, sizeof (f)); p = strchr (f, ';'); @@ -846,24 +857,24 @@ this_try_alloc_color_pair (const char *fg, const char *bg, const char *attrs) *p = '\0'; if (f[0] == '\0') g_strlcpy (f, "default", sizeof (f)); - fg = f; + color->fg = f; } - if (bg == NULL) + if (color->bg == NULL) { p = strchr (editnormal, ';'); if ((p != NULL) && (*(++p) != '\0')) g_strlcpy (b, p, sizeof (b)); else g_strlcpy (b, "default", sizeof (b)); - bg = b; + color->bg = b; } g_free (editnormal); } - if (attrs != NULL) + if (color->attrs != NULL) { - g_strlcpy (a, attrs, sizeof (a)); + g_strlcpy (a, color->attrs, sizeof (a)); p = strchr (a, '/'); if (p != NULL) *p = '\0'; @@ -871,9 +882,10 @@ this_try_alloc_color_pair (const char *fg, const char *bg, const char *attrs) p = a; while ((p = strchr (p, SYNTAX_TOKEN_PLUS)) != NULL) *p++ = '+'; - attrs = a; + color->attrs = a; } - return tty_try_alloc_color_pair (fg, bg, attrs); + + return tty_try_alloc_color_pair (color, TRUE); } /* --------------------------------------------------------------------------------------------- */ @@ -923,7 +935,7 @@ static int edit_read_syntax_rules (WEdit * edit, FILE * f, char **args, int args_size) { FILE *g = NULL; - char *fg, *bg, *attrs; + tty_color_pair_t color; char last_fg[32] = "", last_bg[32] = "", last_attrs[64] = ""; char whole_right[512]; char whole_left[512]; @@ -1089,19 +1101,19 @@ edit_read_syntax_rules (WEdit * edit, FILE * f, char **args, int args_size) g_ptr_array_add (c->keyword, k); no_words = FALSE; subst_defines (edit->defines, a, &args[ARGS_LEN]); - fg = *a; + color.fg = *a; if (*a != NULL) a++; - bg = *a; + color.bg = *a; if (*a != NULL) a++; - attrs = *a; + color.attrs = *a; if (*a != NULL) a++; - g_strlcpy (last_fg, fg != NULL ? fg : "", sizeof (last_fg)); - g_strlcpy (last_bg, bg != NULL ? bg : "", sizeof (last_bg)); - g_strlcpy (last_attrs, attrs != NULL ? attrs : "", sizeof (last_attrs)); - k->color = this_try_alloc_color_pair (fg, bg, attrs); + g_strlcpy (last_fg, color.fg != NULL ? color.fg : "", sizeof (last_fg)); + g_strlcpy (last_bg, color.bg != NULL ? color.bg : "", sizeof (last_bg)); + g_strlcpy (last_attrs, color.attrs != NULL ? color.attrs : "", sizeof (last_attrs)); + k->color = this_try_alloc_color_pair (&color); k->keyword = g_string_new (" "); check_not_a; } @@ -1153,22 +1165,22 @@ edit_read_syntax_rules (WEdit * edit, FILE * f, char **args, int args_size) k->keyword = g_string_new (*a++); subst_defines (edit->defines, a, &args[ARGS_LEN]); - fg = *a; + color.fg = *a; if (*a != NULL) a++; - bg = *a; + color.bg = *a; if (*a != NULL) a++; - attrs = *a; + color.attrs = *a; if (*a != NULL) a++; - if (fg == NULL) - fg = last_fg; - if (bg == NULL) - bg = last_bg; - if (attrs == NULL) - attrs = last_attrs; - k->color = this_try_alloc_color_pair (fg, bg, attrs); + if (color.fg == NULL) + color.fg = last_fg; + if (color.bg == NULL) + color.bg = last_bg; + if (color.attrs == NULL) + color.attrs = last_attrs; + k->color = this_try_alloc_color_pair (&color); check_not_a; } else if (*(args[0]) == '#') @@ -1481,7 +1493,7 @@ edit_free_syntax_rules (WEdit * edit) g_ptr_array_free (edit->rules, TRUE); edit->rules = NULL; g_clear_slist (&edit->syntax_marker, g_free); - tty_color_free_all_tmp (); + tty_color_free_temp (); } /* --------------------------------------------------------------------------------------------- */ diff --git a/src/events_init.c b/src/events_init.c index 53473e5..b29678c 100644 --- a/src/events_init.c +++ b/src/events_init.c @@ -1,7 +1,7 @@ /* Event callbacks initialization - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/src/execute.c b/src/execute.c index c220774..21095a2 100644 --- a/src/execute.c +++ b/src/execute.c @@ -1,7 +1,7 @@ /* Execution routines for GNU Midnight Commander - Copyright (C) 2003-2023 + Copyright (C) 2003-2024 Free Software Foundation, Inc. Written by: diff --git a/src/file_history.c b/src/file_history.c index e46985e..f4989e7 100644 --- a/src/file_history.c +++ b/src/file_history.c @@ -1,7 +1,7 @@ /* Load and show history of edited and viewed files - Copyright (C) 2020-2023 + Copyright (C) 2020-2024 Free Software Foundation, Inc. Written by: diff --git a/src/filemanager/Makefile.am b/src/filemanager/Makefile.am index 534d8dc..0b3c365 100644 --- a/src/filemanager/Makefile.am +++ b/src/filemanager/Makefile.am @@ -35,6 +35,4 @@ AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) if ENABLE_EXT2FS_ATTR libmcfilemanager_la_SOURCES += \ chattr.c - -AM_CPPFLAGS += @EXT2FS_CFLAGS@ @E2P_CFLAGS@ endif diff --git a/src/filemanager/Makefile.in b/src/filemanager/Makefile.in index 2e1300b..4297fd9 100644 --- a/src/filemanager/Makefile.in +++ b/src/filemanager/Makefile.in @@ -91,7 +91,6 @@ host_triplet = @host@ @ENABLE_EXT2FS_ATTR_TRUE@am__append_1 = \ @ENABLE_EXT2FS_ATTR_TRUE@ chattr.c -@ENABLE_EXT2FS_ATTR_TRUE@am__append_2 = @EXT2FS_CFLAGS@ @E2P_CFLAGS@ subdir = src/filemanager ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ @@ -138,7 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ @@ -467,7 +466,7 @@ libmcfilemanager_la_SOURCES = achown.c boxes.c boxes.h cd.c cd.h \ # Unmaintained, unsupported, etc # listmode.c listmode.h -AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(am__append_2) +AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) all: all-am .SUFFIXES: diff --git a/src/filemanager/achown.c b/src/filemanager/achown.c index dca3eca..717a645 100644 --- a/src/filemanager/achown.c +++ b/src/filemanager/achown.c @@ -1,7 +1,7 @@ /* Chown-advanced command -- for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. This file is part of the Midnight Commander. diff --git a/src/filemanager/boxes.c b/src/filemanager/boxes.c index e091c95..2dbc75d 100644 --- a/src/filemanager/boxes.c +++ b/src/filemanager/boxes.c @@ -1,7 +1,7 @@ /* Some misc dialog boxes for the program. - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: diff --git a/src/filemanager/cd.c b/src/filemanager/cd.c index 564a605..65b1f62 100644 --- a/src/filemanager/cd.c +++ b/src/filemanager/cd.c @@ -1,7 +1,7 @@ /* cd_to() function. - Copyright (C) 1995-2023 + Copyright (C) 1995-2024 Free Software Foundation, Inc. Written by: diff --git a/src/filemanager/chattr.c b/src/filemanager/chattr.c index 08a5a99..b5de12a 100644 --- a/src/filemanager/chattr.c +++ b/src/filemanager/chattr.c @@ -1,7 +1,7 @@ /* Chattr command -- for the Midnight Commander - Copyright (C) 2020-2023 + Copyright (C) 2020-2024 Free Software Foundation, Inc. Written by: diff --git a/src/filemanager/chmod.c b/src/filemanager/chmod.c index c93bcbc..bac3d99 100644 --- a/src/filemanager/chmod.c +++ b/src/filemanager/chmod.c @@ -1,7 +1,7 @@ /* Chmod command -- for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. This file is part of the Midnight Commander. diff --git a/src/filemanager/chown.c b/src/filemanager/chown.c index 1ce769f..ff84a4f 100644 --- a/src/filemanager/chown.c +++ b/src/filemanager/chown.c @@ -1,7 +1,7 @@ /* Chown command -- for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. This file is part of the Midnight Commander. diff --git a/src/filemanager/cmd.c b/src/filemanager/cmd.c index 8c33fd8..0ef7184 100644 --- a/src/filemanager/cmd.c +++ b/src/filemanager/cmd.c @@ -2,7 +2,7 @@ Routines invoked by a function key They normally operate on the current panel. - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: @@ -1199,15 +1199,15 @@ sftplink_cmd (void) /* --------------------------------------------------------------------------------------------- */ -#ifdef ENABLE_VFS_FISH +#ifdef ENABLE_VFS_SHELL void -fishlink_cmd (void) +shelllink_cmd (void) { nice_cd (_("Shell link to machine"), _(machine_str), "[FIle transfer over SHell filesystem]", ":fishlink_cmd: Shell link to machine ", "sh://", 1, TRUE); } -#endif /* ENABLE_VFS_FISH */ +#endif /* ENABLE_VFS_SHELL */ /* --------------------------------------------------------------------------------------------- */ diff --git a/src/filemanager/cmd.h b/src/filemanager/cmd.h index 26bfdb7..30b309c 100644 --- a/src/filemanager/cmd.h +++ b/src/filemanager/cmd.h @@ -35,8 +35,8 @@ void ftplink_cmd (void); #ifdef ENABLE_VFS_SFTP void sftplink_cmd (void); #endif -#ifdef ENABLE_VFS_FISH -void fishlink_cmd (void); +#ifdef ENABLE_VFS_SHELL +void shelllink_cmd (void); #endif void undelete_cmd (void); void help_cmd (void); diff --git a/src/filemanager/command.c b/src/filemanager/command.c index 47d2d75..360f104 100644 --- a/src/filemanager/command.c +++ b/src/filemanager/command.c @@ -4,7 +4,7 @@ with all the magic of the command input line, we depend on some help from the program's callback. - Copyright (C) 1995-2023 + Copyright (C) 1995-2024 Free Software Foundation, Inc. Written by: @@ -139,8 +139,11 @@ enter (WInput * lc_cmdline) char *s; s = expand_format (NULL, cmd[++i], TRUE); - g_string_append (command, s); - g_free (s); + if (s != NULL) + { + g_string_append (command, s); + g_free (s); + } } } @@ -248,8 +251,11 @@ command_insert (WInput * in, const char *text, gboolean insert_extra_space) char *quoted_text; quoted_text = name_quote (text, TRUE); - input_insert (in, quoted_text, insert_extra_space); - g_free (quoted_text); + if (quoted_text != NULL) + { + input_insert (in, quoted_text, insert_extra_space); + g_free (quoted_text); + } } /* --------------------------------------------------------------------------------------------- */ diff --git a/src/filemanager/dir.c b/src/filemanager/dir.c index 0931819..b405131 100644 --- a/src/filemanager/dir.c +++ b/src/filemanager/dir.c @@ -1,7 +1,7 @@ /* Directory routines - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: diff --git a/src/filemanager/ext.c b/src/filemanager/ext.c index b21c4d0..ccf5192 100644 --- a/src/filemanager/ext.c +++ b/src/filemanager/ext.c @@ -1,7 +1,7 @@ /* Extension dependent execution. - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: @@ -331,15 +331,19 @@ exec_make_shell_string (const char *lc_data, const vfs_path_t * filename_vpath) } } - if (!is_cd) - g_string_append (shell_string, text); - else + if (text != NULL) { - strcpy (pbuffer, text); - pbuffer = strchr (pbuffer, 0); + if (!is_cd) + g_string_append (shell_string, text); + else + { + strcpy (pbuffer, text); + pbuffer = strchr (pbuffer, '\0'); + } + + g_free (text); } - g_free (text); written_nonspace = TRUE; } } @@ -593,12 +597,15 @@ get_popen_information (const char *cmd_file, const char *args, char *buf, int bu static int get_file_type_local (const vfs_path_t * filename_vpath, char *buf, int buflen) { - char *tmp; - int ret; + char *filename_quoted; + int ret = 0; - tmp = name_quote (vfs_path_get_last_path_str (filename_vpath), FALSE); - ret = get_popen_information (FILE_CMD, tmp, buf, buflen); - g_free (tmp); + filename_quoted = name_quote (vfs_path_get_last_path_str (filename_vpath), FALSE); + if (filename_quoted != NULL) + { + ret = get_popen_information (FILE_CMD, filename_quoted, buf, buflen); + g_free (filename_quoted); + } return ret; } @@ -613,18 +620,28 @@ get_file_type_local (const vfs_path_t * filename_vpath, char *buf, int buflen) static int get_file_encoding_local (const vfs_path_t * filename_vpath, char *buf, int buflen) { - char *tmp, *lang, *args; - int ret; + char *filename_quoted; + int ret = 0; + + filename_quoted = name_quote (vfs_path_get_last_path_str (filename_vpath), FALSE); + if (filename_quoted != NULL) + { + char *lang; - tmp = name_quote (vfs_path_get_last_path_str (filename_vpath), FALSE); - lang = name_quote (autodetect_codeset, FALSE); - args = g_strconcat (" -L", lang, " -i ", tmp, (char *) NULL); + lang = name_quote (autodetect_codeset, FALSE); + if (lang != NULL) + { + char *args; - ret = get_popen_information ("enca", args, buf, buflen); + args = g_strdup_printf (" -L %s -i %s", lang, filename_quoted); + g_free (lang); - g_free (args); - g_free (lang); - g_free (tmp); + ret = get_popen_information ("enca", args, buf, buflen); + g_free (args); + } + + g_free (filename_quoted); + } return ret; } diff --git a/src/filemanager/file.c b/src/filemanager/file.c index fa2ef44..4e1f2c9 100644 --- a/src/filemanager/file.c +++ b/src/filemanager/file.c @@ -1,7 +1,7 @@ /* File management. - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: @@ -1521,7 +1521,7 @@ recursive_erase (file_op_total_context_t * tctx, file_op_context_t * ctx, const * * ATTENTION! Be careful when modifying this function (like commit 25e419ba0886f)! * Some implementations of readdir() in MC VFS (for example, vfs_s_readdir(), which is used - * in FISH) don't return "." and ".." entries. + * in SHELL) don't return "." and ".." entries. */ static int check_dir_is_empty (const vfs_path_t * vpath) @@ -2765,9 +2765,12 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx, /* Query to remove short file */ if (query_dialog (Q_ ("DialogTitle|Copy"), _("Incomplete file was retrieved"), D_ERROR, 2, _("&Delete"), _("&Keep")) == 0) - mc_unlink (dst_vpath); + dst_status = DEST_SHORT_DELETE; + else + dst_status = DEST_SHORT_KEEP; } - else if (dst_status == DEST_SHORT_DELETE) + + if (dst_status == DEST_SHORT_DELETE) mc_unlink (dst_vpath); else if (dst_status == DEST_FULL && !appending) { @@ -2812,9 +2815,11 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx, src_mode = 0100666 & ~src_mode; mc_chmod (dst_vpath, (src_mode & ctx->umask_kill)); } + } + /* Always sync timestamps */ + if (dst_status == DEST_FULL || dst_status == DEST_SHORT_KEEP) mc_utime (dst_vpath, ×); - } if (return_status == FILE_CONT) return_status = progress_update_one (tctx, ctx, file_size); diff --git a/src/filemanager/filegui.c b/src/filemanager/filegui.c index abca598..8e7777f 100644 --- a/src/filemanager/filegui.c +++ b/src/filemanager/filegui.c @@ -10,7 +10,7 @@ Janne Kukonlehto added much error recovery to them for being used in an interactive program. - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: diff --git a/src/filemanager/filemanager.c b/src/filemanager/filemanager.c index b995024..1250dad 100644 --- a/src/filemanager/filemanager.c +++ b/src/filemanager/filemanager.c @@ -1,7 +1,7 @@ /* Main dialog (file panels) of the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: @@ -210,8 +210,8 @@ create_panel_menu (void) #ifdef ENABLE_VFS_FTP entries = g_list_prepend (entries, menu_entry_new (_("FT&P link..."), CK_ConnectFtp)); #endif -#ifdef ENABLE_VFS_FISH - entries = g_list_prepend (entries, menu_entry_new (_("S&hell link..."), CK_ConnectFish)); +#ifdef ENABLE_VFS_SHELL + entries = g_list_prepend (entries, menu_entry_new (_("S&hell link..."), CK_ConnectShell)); #endif #ifdef ENABLE_VFS_SFTP entries = g_list_prepend (entries, menu_entry_new (_("SFTP li&nk..."), CK_ConnectSftp)); @@ -1240,9 +1240,9 @@ midnight_execute_cmd (Widget * sender, long command) case CK_Find: find_cmd (current_panel); break; -#ifdef ENABLE_VFS_FISH - case CK_ConnectFish: - fishlink_cmd (); +#ifdef ENABLE_VFS_SHELL + case CK_ConnectShell: + shelllink_cmd (); break; #endif #ifdef ENABLE_VFS_FTP diff --git a/src/filemanager/filenot.c b/src/filemanager/filenot.c index 2bfc76a..0ceed42 100644 --- a/src/filemanager/filenot.c +++ b/src/filemanager/filenot.c @@ -3,7 +3,7 @@ tree about the changes made to the directory structure. - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Author: diff --git a/src/filemanager/fileopctx.c b/src/filemanager/fileopctx.c index a118749..2da3072 100644 --- a/src/filemanager/fileopctx.c +++ b/src/filemanager/fileopctx.c @@ -1,7 +1,7 @@ /* File operation contexts for the Midnight Commander - Copyright (C) 1999-2023 + Copyright (C) 1999-2024 Free Software Foundation, Inc. Written by: diff --git a/src/filemanager/find.c b/src/filemanager/find.c index c0d2cf9..93f89b1 100644 --- a/src/filemanager/find.c +++ b/src/filemanager/find.c @@ -1,7 +1,7 @@ /* Find file command for the Midnight Commander - Copyright (C) 1995-2023 + Copyright (C) 1995-2024 Free Software Foundation, Inc. Written by: diff --git a/src/filemanager/hotlist.c b/src/filemanager/hotlist.c index fa04a3b..68406e4 100644 --- a/src/filemanager/hotlist.c +++ b/src/filemanager/hotlist.c @@ -1,7 +1,7 @@ /* Directory hotlist -- for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: diff --git a/src/filemanager/info.c b/src/filemanager/info.c index 790f820..584bc2a 100644 --- a/src/filemanager/info.c +++ b/src/filemanager/info.c @@ -1,7 +1,7 @@ /* Panel managing. - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: diff --git a/src/filemanager/layout.c b/src/filemanager/layout.c index c9d581f..1160772 100644 --- a/src/filemanager/layout.c +++ b/src/filemanager/layout.c @@ -1,7 +1,7 @@ /* Panel layout module for the Midnight Commander - Copyright (C) 1995-2023 + Copyright (C) 1995-2024 Free Software Foundation, Inc. Written by: @@ -1015,8 +1015,7 @@ setup_cmdline (void) #ifdef ENABLE_SUBSHELL if (mc_global.tty.use_subshell) { - subshell_prompt = g_string_new (tmp_prompt); - g_free (tmp_prompt); + subshell_prompt = g_string_new_take (tmp_prompt); mc_prompt = subshell_prompt->str; } #endif diff --git a/src/filemanager/mountlist.c b/src/filemanager/mountlist.c index d7fd734..bab6aa1 100644 --- a/src/filemanager/mountlist.c +++ b/src/filemanager/mountlist.c @@ -1,7 +1,7 @@ /* Return a list of mounted file systems - Copyright (C) 1991-2023 + Copyright (C) 1991-2024 Free Software Foundation, Inc. This file is part of the Midnight Commander. diff --git a/src/filemanager/panel.c b/src/filemanager/panel.c index ec1dbc3..b1174c0 100644 --- a/src/filemanager/panel.c +++ b/src/filemanager/panel.c @@ -1,7 +1,7 @@ /* Panel managing. - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: @@ -2353,8 +2353,7 @@ goto_parent_dir (WPanel * panel) mc_build_filename (vfs_path_as_str (panel->panelized_descr->root_vpath), fname->str, (char *) NULL); - fname = g_string_new (fname2); - g_free (fname2); + fname = g_string_new_take (fname2); } bname = x_basename (fname->str); @@ -2923,6 +2922,7 @@ static gboolean do_enter_on_file_entry (WPanel * panel, file_entry_t * fe) { const char *fname = fe->fname->str; + char *fname_quoted; vfs_path_t *full_name_vpath; gboolean ok; @@ -2973,12 +2973,14 @@ do_enter_on_file_entry (WPanel * panel, file_entry_t * fe) return confirm_execute || (ret == 0); } + fname_quoted = name_quote (fname, FALSE); + if (fname_quoted != NULL) { - char *tmp, *cmd; + char *cmd; + + cmd = g_strconcat ("." PATH_SEP_STR, fname_quoted, (char *) NULL); + g_free (fname_quoted); - tmp = name_quote (fname, FALSE); - cmd = g_strconcat (".", PATH_SEP_STR, tmp, (char *) NULL); - g_free (tmp); shell_execute (cmd, 0); g_free (cmd); } @@ -5240,8 +5242,7 @@ panel_panelize_cd (void) tmp_vpath = vfs_path_append_new (pdescr->root_vpath, plist->list[i].fname->str, (char *) NULL); - list->list[i].fname = g_string_new (vfs_path_as_str (tmp_vpath)); - vfs_path_free (tmp_vpath, TRUE); + list->list[i].fname = g_string_new_take (vfs_path_free (tmp_vpath, FALSE)); } list->list[i].f.link_to_dir = plist->list[i].f.link_to_dir; list->list[i].f.stale_link = plist->list[i].f.stale_link; diff --git a/src/filemanager/panelize.c b/src/filemanager/panelize.c index e90076c..b1c87ca 100644 --- a/src/filemanager/panelize.c +++ b/src/filemanager/panelize.c @@ -1,7 +1,7 @@ /* External panelize - Copyright (C) 1995-2023 + Copyright (C) 1995-2024 Free Software Foundation, Inc. Written by: diff --git a/src/filemanager/tree.c b/src/filemanager/tree.c index fd50407..6f86693 100644 --- a/src/filemanager/tree.c +++ b/src/filemanager/tree.c @@ -6,7 +6,7 @@ created and destroyed. This is required for the future vfs layer, it will be possible to have tree views over virtual file systems. - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: @@ -985,6 +985,16 @@ tree_toggle_navig (WTree * tree) /* --------------------------------------------------------------------------------------------- */ +static void +tree_help (void) +{ + ev_help_t event_data = { NULL, "[Directory Tree]" }; + + mc_event_raise (MCEVENT_GROUP_CORE, "help", &event_data); +} + +/* --------------------------------------------------------------------------------------------- */ + static cb_ret_t tree_execute_cmd (WTree * tree, long command) { @@ -996,10 +1006,7 @@ tree_execute_cmd (WTree * tree, long command) switch (command) { case CK_Help: - { - ev_help_t event_data = { NULL, "[Directory Tree]" }; - mc_event_raise (MCEVENT_GROUP_CORE, "help", &event_data); - } + tree_help (); break; case CK_Forget: tree_forget (tree); diff --git a/src/filemanager/treestore.c b/src/filemanager/treestore.c index 2d23c93..984bb92 100644 --- a/src/filemanager/treestore.c +++ b/src/filemanager/treestore.c @@ -8,7 +8,7 @@ created and destroyed. This is required for the future vfs layer, it will be possible to have tree views over virtual file systems. - Copyright (C) 1999-2023 + Copyright (C) 1999-2024 Free Software Foundation, Inc. Written by: @@ -1,7 +1,7 @@ /* Hypertext file browser. - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. This file is part of the Midnight Commander. @@ -126,21 +126,20 @@ static const char * search_string (const char *start, const char *text) { const char *result = NULL; - char *local_text = g_strdup (text); - char *d = local_text; + char *local_text; + char *d; const char *e = start; + local_text = g_strdup (text); + /* fmt sometimes replaces a space with a newline in the help file */ /* Replace the newlines in the link name with spaces to correct the situation */ - while (*d != '\0') - { + for (d = local_text; *d != '\0'; str_next_char (&d)) if (*d == '\n') *d = ' '; - str_next_char (&d); - } /* Do search */ - for (d = local_text; *e; e++) + for (d = local_text; *e != '\0'; e++) { if (*d == *e) d++; @@ -166,11 +165,12 @@ search_string (const char *start, const char *text) static const char * search_string_node (const char *start, const char *text) { - const char *d = text; - const char *e = start; - if (start != NULL) - for (; *e && *e != CHAR_NODE_END; e++) + { + const char *d = text; + const char *e; + + for (e = start; *e != '\0' && *e != CHAR_NODE_END; e++) { if (*d == *e) d++; @@ -179,6 +179,7 @@ search_string_node (const char *start, const char *text) if (*d == '\0') return e + 1; } + } return NULL; } @@ -271,7 +272,7 @@ move_backward (int i) static void move_to_top (void) { - while (((int) (currentpoint > fdata) > 0) && (*currentpoint != CHAR_NODE_END)) + while (((int) (currentpoint - fdata) > 0) && (*currentpoint != CHAR_NODE_END)) currentpoint--; while (*currentpoint != ']') @@ -301,7 +302,7 @@ help_follow_link (const char *start, const char *lc_selected_item) if (lc_selected_item == NULL) return start; - for (p = lc_selected_item; *p && *p != CHAR_NODE_END && *p != CHAR_LINK_POINTER; p++) + for (p = lc_selected_item; *p != '\0' && *p != CHAR_NODE_END && *p != CHAR_LINK_POINTER; p++) ; if (*p == CHAR_LINK_POINTER) { @@ -309,7 +310,8 @@ help_follow_link (const char *start, const char *lc_selected_item) char link_name[MAXLINKNAME]; link_name[0] = '['; - for (i = 1; *p != CHAR_LINK_END && *p && *p != CHAR_NODE_END && i < MAXLINKNAME - 3;) + for (i = 1; + *p != CHAR_LINK_END && *p != '\0' && *p != CHAR_NODE_END && i < MAXLINKNAME - 3;) link_name[i++] = *++p; link_name[i - 1] = ']'; link_name[i] = '\0'; @@ -447,10 +449,7 @@ help_print_word (WDialog * h, GString * word, int *col, int *line, gboolean add_ static void help_show (WDialog * h, const char *paint_start) { - const char *p, *n; - int col, line, c; gboolean painting = TRUE; - gboolean acs; /* Flag: Alternate character set active? */ gboolean repeat_paint; int active_col, active_line; /* Active link position */ char buff[MB_LEN_MAX + 1]; @@ -461,9 +460,15 @@ help_show (WDialog * h, const char *paint_start) tty_setcolor (HELP_NORMAL_COLOR); do { - line = col = active_col = active_line = 0; + int line = 0; + int col = 0; + gboolean acs = FALSE; /* Flag: Is alternate character set active? */ + const char *p, *n; + + active_col = 0; + active_line = 0; + repeat_paint = FALSE; - acs = FALSE; clear_link_areas (); if ((int) (selected_item - paint_start) < 0) @@ -473,6 +478,8 @@ help_show (WDialog * h, const char *paint_start) n = paint_start; while ((n[0] != '\0') && (n[0] != CHAR_NODE_END) && (line < help_lines)) { + int c; + p = n; n = str_cget_next_char (p); memcpy (buff, p, n - p); @@ -597,7 +604,7 @@ help_show (WDialog * h, const char *paint_start) g_string_free (word, TRUE); /* Position the cursor over a nice link */ - if (active_col) + if (active_col != 0) widget_gotoyx (h, active_line, active_col); } @@ -1143,9 +1150,8 @@ help_interactive_display (const gchar * event_group_name, const gchar * event_na selected_item = search_string_node (main_node, STRING_LINK_START) - 1; currentpoint = main_node + 1; /* Skip the newline following the start of the node */ - for (history_ptr = HISTORY_SIZE; history_ptr;) + for (history_ptr = HISTORY_SIZE - 1; history_ptr >= 0; history_ptr--) { - history_ptr--; history[history_ptr].page = currentpoint; history[history_ptr].link = selected_item; } diff --git a/src/keymap.c b/src/keymap.c index 3f6cce4..e708fb2 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -1,7 +1,7 @@ /* Default values and initialization of keybinding engine - Copyright (C) 2009-2023 + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by: diff --git a/src/learn.c b/src/learn.c index c704ce1..f42aebf 100644 --- a/src/learn.c +++ b/src/learn.c @@ -1,7 +1,7 @@ /* Learn keys - Copyright (C) 1995-2023 + Copyright (C) 1995-2024 Free Software Foundation, Inc. Written by: @@ -1,7 +1,7 @@ /* Main program for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: @@ -279,6 +279,13 @@ main (int argc, char *argv[]) return exit_code; } + /* check terminal type + * $TERM must be set and not empty + * mc_global.tty.xterm_flag is used in init_key() and tty_init() + * Do this after mc_args_parse() where mc_args__force_xterm is set up. + */ + mc_global.tty.xterm_flag = tty_check_term (mc_args__force_xterm); + /* do this before mc_args_show_info () to view paths in the --datadir-info output */ OS_Setup (); @@ -346,13 +353,6 @@ main (int argc, char *argv[]) vfs_path_free (vpath, TRUE); } - /* check terminal type - * $TERM must be set and not empty - * mc_global.tty.xterm_flag is used in init_key() and tty_init() - * Do this after mc_args_handle() where mc_args__force_xterm is set up. - */ - mc_global.tty.xterm_flag = tty_check_term (mc_args__force_xterm); - /* NOTE: This has to be called before tty_init or whatever routine calls any define_sequence */ init_key (); diff --git a/src/man2hlp/Makefile.in b/src/man2hlp/Makefile.in index e2273de..f3d66e5 100644 --- a/src/man2hlp/Makefile.in +++ b/src/man2hlp/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/src/man2hlp/man2hlp.in b/src/man2hlp/man2hlp.in index 8aa7131..16e5e7b 100644 --- a/src/man2hlp/man2hlp.in +++ b/src/man2hlp/man2hlp.in @@ -1,8 +1,7 @@ #! @PERL_FOR_BUILD@ # # Man page to help file converter -# Copyright (C) 1994, 1995, 1998, 2000, 2001, 2002, 2003, 2004, 2005, -# 2007, 2010, 2011 +# Copyright (C) 1994-2024 # The Free Software Foundation, Inc. # # Originally written by: diff --git a/src/selcodepage.c b/src/selcodepage.c index c8a3cdc..067ad67 100644 --- a/src/selcodepage.c +++ b/src/selcodepage.c @@ -3,7 +3,7 @@ Copyright (C) 2001 Walery Studennikov <despair@sama.ru> - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/src/setup.c b/src/setup.c index 68e6f37..9d6e153 100644 --- a/src/setup.c +++ b/src/setup.c @@ -1,7 +1,7 @@ /* Setup loading/saving. - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. This file is part of the Midnight Commander. @@ -44,8 +44,8 @@ #ifdef ENABLE_VFS_FTP #include "src/vfs/ftpfs/ftpfs.h" #endif -#ifdef ENABLE_VFS_FISH -#include "src/vfs/fish/fish.h" +#ifdef ENABLE_VFS_SHELL +#include "src/vfs/shell/shell.h" #endif #ifdef HAVE_CHARSET @@ -227,7 +227,7 @@ GArray *macros_list; /*** file scope variables ************************************************************************/ static char *profile_name = NULL; /* ${XDG_CONFIG_HOME}/mc/ini */ -static char *panels_profile_name = NULL; /* ${XDG_CACHE_HOME}/mc/panels.ini */ +static char *panels_profile_name = NULL; /* ${XDG_CONFIG_HOME}/mc/panels.ini */ /* *INDENT-OFF* */ static const struct @@ -386,9 +386,9 @@ static const struct { "ftpfs_directory_timeout", &ftpfs_directory_timeout }, { "ftpfs_retry_seconds", &ftpfs_retry_seconds }, #endif /* ENABLE_VFS_FTP */ -#ifdef ENABLE_VFS_FISH - { "fish_directory_timeout", &fish_directory_timeout }, -#endif /* ENABLE_VFS_FISH */ +#ifdef ENABLE_VFS_SHELL + { "shell_directory_timeout", &shell_directory_timeout }, +#endif /* ENABLE_VFS_SHELL */ #endif /* ENABLE_VFS */ /* option_tab_spacing is used in internal viewer */ { "editor_tab_spacing", &option_tab_spacing }, diff --git a/src/subshell/Makefile.in b/src/subshell/Makefile.in index 18ef165..2520c6f 100644 --- a/src/subshell/Makefile.in +++ b/src/subshell/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/src/subshell/common.c b/src/subshell/common.c index 3ea4b5f..1c432fd 100644 --- a/src/subshell/common.c +++ b/src/subshell/common.c @@ -1,7 +1,7 @@ /* Concurrent shell support for the Midnight Commander - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: diff --git a/src/subshell/proxyfunc.c b/src/subshell/proxyfunc.c index 3f180d3..b1c20a9 100644 --- a/src/subshell/proxyfunc.c +++ b/src/subshell/proxyfunc.c @@ -1,7 +1,7 @@ /* Proxy functions for getting access to public variables into 'filemanager' module. - Copyright (C) 2015-2023 + Copyright (C) 2015-2024 Free Software Foundation, Inc. Written by: diff --git a/src/textconf.c b/src/textconf.c index e8accd9..0a1f4cc 100644 --- a/src/textconf.c +++ b/src/textconf.c @@ -1,7 +1,7 @@ /* Print features specific for this build - Copyright (C) 2000-2023 + Copyright (C) 2000-2024 Free Software Foundation, Inc. This file is part of the Midnight Commander. @@ -75,8 +75,8 @@ static const char *const vfs_supported[] = { #ifdef ENABLE_VFS_SFTP "sftpfs", #endif -#ifdef ENABLE_VFS_FISH - "fish", +#ifdef ENABLE_VFS_SHELL + "shell", #endif NULL }; @@ -218,15 +218,15 @@ show_datadirs_extended (void) PRINTF_SECTION (_("File extension handlers:"), EXTHELPERSDIR); -#if defined ENABLE_VFS_EXTFS || defined ENABLE_VFS_FISH +#if defined ENABLE_VFS_EXTFS || defined ENABLE_VFS_SHELL PRINTF_SECTION (_("VFS plugins and scripts:"), LIBEXECDIR); #ifdef ENABLE_VFS_EXTFS PRINTF2 ("extfs.d:", LIBEXECDIR, MC_EXTFS_DIR PATH_SEP_STR); #endif -#ifdef ENABLE_VFS_FISH - PRINTF2 ("fish:", LIBEXECDIR, FISH_PREFIX PATH_SEP_STR); +#ifdef ENABLE_VFS_SHELL + PRINTF2 ("shell:", LIBEXECDIR, VFS_SHELL_PREFIX PATH_SEP_STR); #endif -#endif /* ENABLE_VFS_EXTFS || defiined ENABLE_VFS_FISH */ +#endif /* ENABLE_VFS_EXTFS || defiined ENABLE_VFS_SHELL */ (void) puts (""); PRINTF_GROUP (_("User data")); @@ -237,8 +237,8 @@ show_datadirs_extended (void) #ifdef ENABLE_VFS_EXTFS PRINTF ("extfs.d:", mc_config_get_data_path (), MC_EXTFS_DIR PATH_SEP_STR); #endif -#ifdef ENABLE_VFS_FISH - PRINTF ("fish:", mc_config_get_data_path (), FISH_PREFIX PATH_SEP_STR); +#ifdef ENABLE_VFS_SHELL + PRINTF ("shell:", mc_config_get_data_path (), VFS_SHELL_PREFIX PATH_SEP_STR); #endif #ifdef USE_INTERNAL_EDIT PRINTF ("mcedit macros:", mc_config_get_data_path (), MC_MACRO_FILE); diff --git a/src/usermenu.c b/src/usermenu.c index c328871..accd9f2 100644 --- a/src/usermenu.c +++ b/src/usermenu.c @@ -1,7 +1,7 @@ /* User Menu implementation - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: @@ -86,20 +86,24 @@ static char *menu = NULL; static char * strip_ext (char *ss) { - char *s = ss; + char *s; char *e = NULL; - while (*s != '\0') + if (ss == NULL) + return NULL; + + for (s = ss; *s != '\0'; s++) { if (*s == '.') e = s; if (IS_PATH_SEP (*s) && e != NULL) e = NULL; /* '.' in *directory* name */ - s++; } + if (e != NULL) *e = '\0'; - return ss; + + return (*ss == '\0' ? NULL : ss); } /* --------------------------------------------------------------------------------------------- */ @@ -501,8 +505,11 @@ execute_menu_command (const Widget * edit_widget, const char *commands, gboolean char *tmp; tmp = name_quote (parameter, FALSE); - fputs (tmp, cmd_file); - g_free (tmp); + if (tmp != NULL) + { + fputs (tmp, cmd_file); + g_free (tmp); + } } else fputs (parameter, cmd_file); @@ -528,8 +535,11 @@ execute_menu_command (const Widget * edit_widget, const char *commands, gboolean char *text; text = expand_format (edit_widget, *commands, do_quote); - fputs (text, cmd_file); - g_free (text); + if (text != NULL) + { + fputs (text, cmd_file); + g_free (text); + } } } else if (*commands == '%') @@ -779,7 +789,7 @@ expand_format (const Widget * edit_widget, char c, gboolean do_quote) else { if (get_other_type () != view_listing) - return g_strdup (""); + return NULL; panel = other_panel; } @@ -800,7 +810,7 @@ expand_format (const Widget * edit_widget, char c, gboolean do_quote) default: /* other modes don't use formats */ - return g_strdup (""); + return NULL; } if (do_quote) @@ -822,16 +832,13 @@ expand_format (const Widget * edit_widget, char c, gboolean do_quote) case 'd': { const char *cwd; - char *qstr; if (panel != NULL) cwd = vfs_path_as_str (panel->cwd_vpath); else cwd = vfs_get_current_dir (); - qstr = quote_func (cwd, FALSE); - - result = qstr; + result = quote_func (cwd, FALSE); goto ret; } case 'c': @@ -914,31 +921,37 @@ expand_format (const Widget * edit_widget, char c, gboolean do_quote) case 't': case 'u': { - GString *block; + GString *block = NULL; int i; if (panel == NULL) { - result = g_strdup (""); + result = NULL; goto ret; } - block = g_string_sized_new (16); - for (i = 0; i < panel->dir.len; i++) if (panel->dir.list[i].f.marked != 0) { char *tmp; tmp = quote_func (panel->dir.list[i].fname->str, FALSE); - g_string_append (block, tmp); - g_string_append_c (block, ' '); - g_free (tmp); + if (tmp != NULL) + { + if (block == NULL) + block = g_string_new_take (tmp); + else + { + g_string_append (block, tmp); + g_free (tmp); + } + g_string_append_c (block, ' '); + } if (c_lc == 'u') do_file_mark (panel, i, 0); } - result = g_string_free (block, FALSE); + result = block == NULL ? NULL : g_string_free (block, block->len == 0); goto ret; } /* sub case block */ default: @@ -1,7 +1,7 @@ /* Various non-library utilities - Copyright (C) 2003-2023 + Copyright (C) 2003-2024 Free Software Foundation, Inc. Written by: diff --git a/src/vfs/Makefile.am b/src/vfs/Makefile.am index 1441953..4adde8e 100644 --- a/src/vfs/Makefile.am +++ b/src/vfs/Makefile.am @@ -16,9 +16,9 @@ SUBDIRS += extfs libmc_vfs_la_LIBADD += extfs/libvfs-extfs.la endif -if ENABLE_VFS_FISH -SUBDIRS += fish -libmc_vfs_la_LIBADD += fish/libvfs-fish.la +if ENABLE_VFS_SHELL +SUBDIRS += shell +libmc_vfs_la_LIBADD += shell/libvfs-shell.la endif if ENABLE_VFS_FTP diff --git a/src/vfs/Makefile.in b/src/vfs/Makefile.in index a245efe..fc0898d 100644 --- a/src/vfs/Makefile.in +++ b/src/vfs/Makefile.in @@ -92,8 +92,8 @@ host_triplet = @host@ @ENABLE_VFS_CPIO_TRUE@am__append_2 = cpio/libvfs-cpio.la @ENABLE_VFS_EXTFS_TRUE@am__append_3 = extfs @ENABLE_VFS_EXTFS_TRUE@am__append_4 = extfs/libvfs-extfs.la -@ENABLE_VFS_FISH_TRUE@am__append_5 = fish -@ENABLE_VFS_FISH_TRUE@am__append_6 = fish/libvfs-fish.la +@ENABLE_VFS_SHELL_TRUE@am__append_5 = shell +@ENABLE_VFS_SHELL_TRUE@am__append_6 = shell/libvfs-shell.la @ENABLE_VFS_FTP_TRUE@am__append_7 = ftpfs @ENABLE_VFS_FTP_TRUE@am__append_8 = ftpfs/libvfs-ftpfs.la @ENABLE_VFS_SFTP_TRUE@am__append_9 = sftpfs @@ -150,7 +150,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ @@ -252,7 +252,7 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -DIST_SUBDIRS = local cpio extfs fish ftpfs sftpfs sfs tar undelfs +DIST_SUBDIRS = local cpio extfs shell ftpfs sftpfs sfs tar undelfs am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ diff --git a/src/vfs/cpio/Makefile.in b/src/vfs/cpio/Makefile.in index 8534a52..a129146 100644 --- a/src/vfs/cpio/Makefile.in +++ b/src/vfs/cpio/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/src/vfs/cpio/cpio.c b/src/vfs/cpio/cpio.c index 447d1f6..1b904c5 100644 --- a/src/vfs/cpio/cpio.c +++ b/src/vfs/cpio/cpio.c @@ -1,7 +1,7 @@ /* Virtual File System: GNU Tar file system. - Copyright (C) 2000-2023 + Copyright (C) 2000-2024 Free Software Foundation, Inc. Written by: diff --git a/src/vfs/extfs/Makefile.in b/src/vfs/extfs/Makefile.in index 317af30..cce1b12 100644 --- a/src/vfs/extfs/Makefile.in +++ b/src/vfs/extfs/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/src/vfs/extfs/extfs.c b/src/vfs/extfs/extfs.c index d6ef7af..11a9ba5 100644 --- a/src/vfs/extfs/extfs.c +++ b/src/vfs/extfs/extfs.c @@ -1,7 +1,7 @@ /* Virtual File System: External file system. - Copyright (C) 1995-2023 + Copyright (C) 1995-2024 Free Software Foundation, Inc. Written by: @@ -916,10 +916,9 @@ extfs_cmd (const char *str_extfs_cmd, const struct extfs_super_t *archive, { char *file; char *quoted_file; - char *quoted_localname; char *archive_name, *quoted_archive_name; const extfs_plugin_info_t *info; - char *cmd; + char *cmd = NULL; int retval = 0; GError *error = NULL; mc_pipe_t *pip; @@ -928,20 +927,49 @@ extfs_cmd (const char *str_extfs_cmd, const struct extfs_super_t *archive, quoted_file = name_quote (file, FALSE); g_free (file); + if (quoted_file == NULL) + { + message (D_ERROR, MSG_ERROR, _("EXTFS virtual file system:\nwrong file name")); + return (-1); + } + /* 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); + + if (quoted_archive_name == NULL) + { + message (D_ERROR, MSG_ERROR, _("EXTFS virtual file system:\nwrong archive name")); + return (-1); + } + 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, " ", file, " ", quoted_localname, (char *) NULL); + + if (localname == NULL || *localname == '\0') + cmd = g_strconcat (info->path, info->prefix, str_extfs_cmd, quoted_archive_name, " ", + file, (char *) NULL); + else + { + char *quoted_localname; + + quoted_localname = name_quote (localname, FALSE); + cmd = g_strconcat (info->path, info->prefix, str_extfs_cmd, quoted_archive_name, " ", + file, " ", quoted_localname, (char *) NULL); + g_free (quoted_localname); + } + g_free (quoted_file); - g_free (quoted_localname); g_free (quoted_archive_name); + if (cmd == NULL) + { + message (D_ERROR, MSG_ERROR, _("EXTFS virtual file system:\ncannot build command")); + return (-1); + } + /* don't read stdout */ pip = mc_popen (cmd, FALSE, TRUE, &error); g_free (cmd); diff --git a/src/vfs/extfs/helpers/Makefile.in b/src/vfs/extfs/helpers/Makefile.in index 0a240fb..95e5375 100644 --- a/src/vfs/extfs/helpers/Makefile.in +++ b/src/vfs/extfs/helpers/Makefile.in @@ -135,7 +135,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/src/vfs/extfs/helpers/iso9660.in b/src/vfs/extfs/helpers/iso9660.in index 5a6f1d5..f78db61 100644 --- a/src/vfs/extfs/helpers/iso9660.in +++ b/src/vfs/extfs/helpers/iso9660.in @@ -132,6 +132,7 @@ mcisofs_list () { *.lz) MYCAT="lzip -dc";; *.lz4) MYCAT="lz4 -dc";; *.lzma) MYCAT="lzma -dc";; + *.lzo) MYCAT="lzop -dc";; *.xz) MYCAT="xz -dc";; *.zst) MYCAT="zstd -dc";; *.bz2) MYCAT="bzip2 -dc";; diff --git a/src/vfs/extfs/helpers/lslR.in b/src/vfs/extfs/helpers/lslR.in index 69b663b..f568c02 100644 --- a/src/vfs/extfs/helpers/lslR.in +++ b/src/vfs/extfs/helpers/lslR.in @@ -15,6 +15,7 @@ case "$1" in *.lz) MYCAT="lzip -dc";; *.lz4) MYCAT="lz4 -dc";; *.lzma) MYCAT="lzma -dc";; + *.lzo) MYCAT="lzop -dc";; *.xz) MYCAT="xz -dc";; *.zst) MYCAT="zstd -dc";; *.bz2) MYCAT="bzip2 -dc";; diff --git a/src/vfs/extfs/helpers/mailfs.in b/src/vfs/extfs/helpers/mailfs.in index 5bb373b..20cfae3 100644 --- a/src/vfs/extfs/helpers/mailfs.in +++ b/src/vfs/extfs/helpers/mailfs.in @@ -11,6 +11,7 @@ $bzcat="bzip2 -dc"; # bunzip2 to stdout $lzipcat="lzip -dc"; # unlzip to stdout $lz4cat="lz4 -dc"; # unlz4 to stdout $lzcat="lzma -dc"; # unlzma to stdout +$lzocat="lzop -dc"; # unlzo to stdout $xzcat="xz -dc"; # unxz to stdout $zstdcat="zstd -dc"; # unzstd to stdout $file="file"; # "file" command @@ -194,6 +195,8 @@ if (/gzip/) { exit 1 unless (open IN, "$lz4cat $mbox_qname|"); } elsif (/lzma/) { exit 1 unless (open IN, "$lzcat $mbox_qname|"); +} elsif (/lzo/) { + exit 1 unless (open IN, "$lzocat $mbox_qname|"); } elsif (/xz/) { exit 1 unless (open IN, "$xzcat $mbox_qname|"); } elsif (/zst/) { diff --git a/src/vfs/extfs/helpers/patchfs.in b/src/vfs/extfs/helpers/patchfs.in index ee1e651..59fdde1 100644 --- a/src/vfs/extfs/helpers/patchfs.in +++ b/src/vfs/extfs/helpers/patchfs.in @@ -17,6 +17,7 @@ use File::Temp 'tempfile'; my $lzip = 'lzip'; my $lz4 = 'lz4'; my $lzma = 'lzma'; +my $lzo = 'lzop'; my $xz = 'xz'; my $zstd = 'zstd'; my $bzip = 'bzip2'; @@ -88,6 +89,8 @@ sub myin return "$lzip -dc $qfname"; } elsif (/^'*lzma/) { return "$lzma -dc $qfname"; + } elsif (/^'*lzo/) { + return "$lzo -dc $qfname"; } elsif (/^'*xz/) { return "$xz -dc $qfname"; } elsif (/^'*zst/) { @@ -114,6 +117,8 @@ sub myout return "$lzip -c $sep $qfname"; } elsif (/^'*lzma/) { return "$lzma -c $sep $qfname"; + } elsif (/^'*lzo/) { + return "$lzo -c $sep $qfname"; } elsif (/^'*xz/) { return "$xz -c $sep $qfname"; } elsif (/^'*zst/) { diff --git a/src/vfs/extfs/helpers/s3+.in b/src/vfs/extfs/helpers/s3+.in index f5e4b90..6436ba7 100644 --- a/src/vfs/extfs/helpers/s3+.in +++ b/src/vfs/extfs/helpers/s3+.in @@ -153,16 +153,16 @@ def threadmap(fun, iterable, maxthreads=16): Propagates exception safely. """ from threading import Thread - import Queue + import queue items = list(iterable) nitems = len(items) if nitems < 2: - return map(fun, items) + return list(map(fun, items)) # Create and fill input queue - input = Queue.Queue() - output = Queue.Queue() + input = queue.Queue() + output = queue.Queue() for i,item in enumerate(items): input.put( (i,item) ) @@ -181,7 +181,7 @@ def threadmap(fun, iterable, maxthreads=16): output.put( (i,result) ) except: output.put( (None,sys.exc_info()) ) - except Queue.Empty: + except queue.Empty: return # Start threads @@ -196,8 +196,8 @@ def threadmap(fun, iterable, maxthreads=16): try: i,res = output.get() if i == None: - raise res[0],res[1],res[2] - except Queue.Empty: + raise res[0](res[1]).with_traceback(res[2]) + except queue.Empty: break ret.append(res) @@ -241,7 +241,7 @@ def get_bucket(name): b = s3.get_bucket(name, validate=False) b.get_location() # just to raise an exception on error return b - except boto.exception.S3ResponseError, e: + except boto.exception.S3ResponseError as e: # Seems this is the only proper way to switch to the bucket's region. # Requesting of the default region for "?location" does not work unfortunately. m = re.search(r'<Region>(.*?)</Region>', e.body) @@ -340,7 +340,7 @@ if cmd == 'list': expr = re.compile(r'^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})\.\d{3}Z$') def convDate(awsdatetime): m = expr.match(awsdatetime) - ye,mo,da,ho,mi,se = map(int,m.groups()) + ye,mo,da,ho,mi,se = list(map(int,m.groups())) dt = datetime.datetime(ye,mo,da,ho,mi,se, tzinfo=pytz.utc) return dt.astimezone(tz).strftime('%m-%d-%Y %H:%M') diff --git a/src/vfs/extfs/helpers/uc1541 b/src/vfs/extfs/helpers/uc1541 index dc15b42..abb86ea 100755..100644 --- a/src/vfs/extfs/helpers/uc1541 +++ b/src/vfs/extfs/helpers/uc1541 @@ -1,24 +1,25 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ UC1541 Virtual filesystem Author: Roman 'gryf' Dobosz <gryf73@gmail.com> -Date: 2019-09-20 -Version: 3.3 +Date: 2023-10-04 +Version: 3.6 Licence: BSD source: https://bitbucket.org/gryf/uc1541 mirror: https://github.com/gryf/uc1541 """ - -import sys -import re -import os +import argparse import gzip -from subprocess import Popen, PIPE +import logging +import os +import re +import subprocess +import sys + +LOG = logging.getLogger('UC1541') if os.getenv('UC1541_DEBUG'): - import logging - LOG = logging.getLogger('UC1541') LOG.setLevel(logging.DEBUG) FILE_HANDLER = logging.FileHandler("/tmp/uc1541.log") FILE_FORMATTER = logging.Formatter("%(asctime)s %(levelname)-8s " @@ -26,47 +27,11 @@ if os.getenv('UC1541_DEBUG'): FILE_HANDLER.setFormatter(FILE_FORMATTER) FILE_HANDLER.setLevel(logging.DEBUG) LOG.addHandler(FILE_HANDLER) -else: - class LOG(object): - """ - Dummy logger object. Does nothing. - """ - @classmethod - def debug(*args, **kwargs): - pass - - @classmethod - def info(*args, **kwargs): - pass - - @classmethod - def warning(*args, **kwargs): - pass - - @classmethod - def error(*args, **kwargs): - pass - - @classmethod - def critical(*args, **kwargs): - pass SECLEN = 256 -def _ord(string_or_int): - """ - Return an int value for the (possible) string passed in argument. This - function is for compatibility between python2 and python3, where single - element in byte string array is a string or an int respectively. - """ - try: - return ord(string_or_int) - except TypeError: - return string_or_int - - def _get_raw(dimage): """ Try to get contents of the D64 image either it's gzip compressed or not. @@ -160,10 +125,10 @@ class Disk(object): filename = list() for chr_ in string: - if _ord(chr_) == 160: # shift+space character; $a0 + if chr_ == 160: # shift+space character; $a0 break - character = D64.CHAR_MAP.get(_ord(chr_), '?') + character = D64.CHAR_MAP.get(chr_, '?') filename.append(character) # special cases @@ -204,8 +169,8 @@ class Disk(object): if not self.current_sector_data: return False - self.next_track = _ord(self.current_sector_data[0]) - self.next_sector = _ord(self.current_sector_data[1]) + self.next_track = self.current_sector_data[0] + self.next_sector = self.current_sector_data[1] if (self.next_track, self.next_sector) in self._already_done: # Just a failsafe. Endless loop is not what is expected. @@ -239,7 +204,7 @@ class Disk(object): sector = self.current_sector_data for dummy in range(8): entry = sector[:32] - ftype = _ord(entry[2]) + ftype = entry[2] if ftype == 0: # deleted sector = sector[32:] @@ -247,12 +212,12 @@ class Disk(object): type_verbose = self._get_ftype(ftype) - protect = _ord(entry[2]) & 64 and "<" or " " + protect = entry[2] & 64 and "<" or " " fname = entry[5:21] if ftype == 'rel': - size = _ord(entry[23]) + size = entry[23] else: - size = _ord(entry[30]) + _ord(entry[31]) * 226 + size = entry[30] + entry[31] * 226 self._dir_contents.append({'fname': self._map_filename(fname), 'ftype': type_verbose, @@ -392,7 +357,7 @@ class Uc1541(object): """ Class for interact with c1541 program and MC """ - PRG = re.compile(r'(\d+)\s+"([^"]*)".+?\s(del|prg|rel|seq|usr)([\s<])') + PRG = re.compile(r'(\d+)\s+"([^"]*)".+?(del|prg|rel|seq|usr)([\s<])') def __init__(self, archname): self.arch = archname @@ -430,11 +395,7 @@ class Uc1541(object): """ LOG.info("Removing file %s", dst) dst = self._get_masked_fname(dst) - - if not self._call_command('delete', dst=dst): - return self._show_error() - - return 0 + return self._call_command('delete', dst=dst) def copyin(self, dst, src): """ @@ -442,11 +403,7 @@ class Uc1541(object): """ LOG.info("Copy into D64 %s as %s", src, dst) dst = self._correct_fname(dst) - - if not self._call_command('write', src=src, dst=dst): - return self._show_error() - - return 0 + return self._call_command('write', src=src, dst=dst) def copyout(self, src, dst): """ @@ -459,10 +416,7 @@ class Uc1541(object): src = self._get_masked_fname(src) - if not self._call_command('read', src=src, dst=dst): - return self._show_error() - - return 0 + return self._call_command('read', src=src, dst=dst) def mkdir(self, dirname): """Not supported""" @@ -523,8 +477,9 @@ class Uc1541(object): uid = os.getuid() gid = os.getgid() - if not self._call_command('list'): - return self._show_error() + res = self._call_command('list') + if res != 0: + return res idx = 0 for line in self.out.split("\n"): @@ -540,7 +495,7 @@ class Uc1541(object): if '/' in display_name: display_name = display_name.replace('/', '|') - # workaround for space and dash at the beginning of the + # workaround for space and dash at the beggining of the # filename char_map = {' ': '~', '-': '_'} @@ -593,13 +548,16 @@ class Uc1541(object): universal_newlines = True if cmd in ['delete', 'write']: universal_newlines = False - self.out, self.err = Popen(command, - universal_newlines=universal_newlines, - stdout=PIPE, stderr=PIPE).communicate() + (self.out, + self.err) = subprocess.Popen(command, + universal_newlines=universal_newlines, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE).communicate() if self.err: LOG.debug('an err: %s', self.err) - return not self.err + return self._show_error() + return 0 CALL_MAP = {'list': lambda a: Uc1541(a.arch).list(), @@ -612,7 +570,7 @@ CALL_MAP = {'list': lambda a: Uc1541(a.arch).list(), def parse_args(): """Use ArgumentParser to check for script arguments and execute.""" - parser = ArgumentParser() + parser = argparse.ArgumentParser() subparsers = parser.add_subparsers(help='supported commands', dest='subcommand') subparsers.required = True @@ -659,44 +617,6 @@ def parse_args(): return args.func(args) -def no_parse(): - """Failsafe argument "parsing". Note, that it blindly takes positional - arguments without checking them. In case of wrong arguments it will - silently exit""" - try: - if sys.argv[1] not in ('list', 'copyin', 'copyout', 'rm', 'mkdir', - "run"): - sys.exit(2) - except IndexError: - sys.exit(2) - - class Arg(object): - """Mimic argparse object""" - dst = None - src = None - arch = None - - arg = Arg() - - try: - arg.arch = sys.argv[2] - if sys.argv[1] in ('copyin', 'copyout'): - arg.src = sys.argv[3] - arg.dst = sys.argv[4] - elif sys.argv[1] in ('rm', 'run', 'mkdir'): - arg.dst = sys.argv[3] - except IndexError: - sys.exit(2) - - return CALL_MAP[sys.argv[1]](arg) - - if __name__ == "__main__": LOG.debug("Script params: %s", str(sys.argv)) - try: - from argparse import ArgumentParser - PARSE_FUNC = parse_args - except ImportError: - PARSE_FUNC = no_parse - - sys.exit(PARSE_FUNC()) + sys.exit(parse_args()) diff --git a/src/vfs/fish/helpers/Makefile.am b/src/vfs/fish/helpers/Makefile.am deleted file mode 100644 index e3ba15d..0000000 --- a/src/vfs/fish/helpers/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -fishdir = $(libexecdir)/@PACKAGE@/fish - -# Files to install and distribute other than fish scripts -FISH_MISC = README.fish - -# Install and distribute FISH helper scripts w/o shebang & executable bit as data -fish_DATA = $(FISH_MISC) ls mkdir fexists unlink chown chmod rmdir ln mv hardlink get send append info utime -fishconfdir = $(sysconfdir)/@PACKAGE@ - -EXTRA_DIST = $(fish_DATA) diff --git a/src/vfs/fish/helpers/README.fish b/src/vfs/fish/helpers/README.fish deleted file mode 100644 index ac319c8..0000000 --- a/src/vfs/fish/helpers/README.fish +++ /dev/null @@ -1,217 +0,0 @@ - - FIles transferred over SHell protocol (V 0.0.3) - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -This protocol was designed for transferring files over a remote shell -connection (rsh and compatibles). It can be as well used for transfers over -rsh, and there may be other uses. - -Client sends requests of following form: - -#FISH_COMMAND -equivalent shell commands, -which may be multiline - -Only fish commands are defined here, shell equivalents are for your -information only and will probably vary from implementation to -implementation. Fish commands always have priority: server is -expected to execute fish command if it understands it. If it does not, -however, it can try the luck and execute shell command. - -Since version 4.7.3, the scripts that FISH sends to host machines after -a command is transmitted are no longer hardwired in the Midnight -Commander source code. - -First, mc looks for system-wide set of scripts, then it checks whether -current user has host-specific overrides in his per-user mc -configuration directory. User-defined overrides take priority over -sytem-wide scripts if they exist. The order in which the directories are -traversed is as follows: - - /usr/libexec/mc/fish - ~/.local/share/mc/fish/<hostname>/ - -Server's reply is multiline, but always ends with - -### 000<optional text> - -line. ### is prefix to mark this line, 000 is return code. Return -codes are superset to those used in ftp. - -There are few new exit codes defined: - -000 don't know; if there were no previous lines, this marks COMPLETE -success, if they were, it marks failure. - -001 don't know; if there were no previous lines, this marks -PRELIMinary success, if they were, it marks failure - - Connecting - ~~~~~~~~~~ -Client uses "echo FISH:;/bin/sh" as command executed on remote -machine. This should make it possible for server to distinguish FISH -connections from normal rsh/ssh. - - Commands - ~~~~~~~~ -#FISH -echo; start_fish_server; echo '### 200' - -This command is sent at the beginning. It marks that client wishes to -talk via FISH protocol. #VER command must follow. If server -understands FISH protocol, it has option to put FISH server somewhere -on system path and name it start_fish_server. - -#VER 0.0.2 <feature1> <feature2> <...> -echo '### 000' - -This command is the second one. It sends client version and extensions -to the server. Server should reply with protocol version to be used, -and list of extensions accepted. - -VER 0.0.0 <feature2> -### 200 - -#PWD -pwd; echo '### 200' - -Server should reply with current directory (in form /abc/def/ghi) -followed by line indicating success. - -#LIST /directory -ls -lLa $1 | grep '^[^cbt]' | ( while read p x u g s m d y n; do echo "P$p $u.$g -S$s -d$m $d $y -:$n -"; done ) -ls -lLa $1 | grep '^[cb]' | ( while read p x u g a i m d y n; do echo "P$p $u.$g -E$a$i -dD$m $d $y -:$n -"; done ) -echo '### 200' - -This allows client to list directory or get status information about -single file. Output is in following form (any line except :<filename> -may be omitted): - -P<unix permissions> <owner>.<group> -S<size> -d<3-letters month name> <day> <year or HH:MM> -D<year> <month> <day> <hour> <minute> <second>[.1234] -E<major-of-device>,<minor> -:<filename> -L<filename symlink points to> -<blank line to separate items> - -Unix permissions are of form X--------- where X is type of -file. Currently, '-' means regular file, 'd' means directory, 'c', 'b' -means character and block device, 'l' means symbolic link, 'p' means -FIFO and 's' means socket. - -'d' has three fields: month (one of strings Jan Feb Mar Apr May Jun -Jul Aug Sep Oct Nov Dec), day of month, and third is either single -number indicating year, or HH:MM field (assume current year in such -case). As you've probably noticed, this is pretty broken; it is for -compatibility with ls listing. - -#RETR /some/name -ls -l /some/name | ( read a b c d x e; echo $x ); echo '### 100'; cat /some/name; echo '### 200' - -Server sends line with filesize on it, followed by line with ### 100 -indicating partial success, then it sends binary data (exactly -filesize bytes) and follows them with (with no preceding newline) ### -200. - -Note that there's no way to abort running RETR command - except -closing the connection. - -#STOR <size> /file/name -> /file/name; echo '### 001'; ( dd bs=4096 count=<size/4096>; dd bs=<size%4096> count=1 ) 2>/dev/null | ( cat > %s; cat > /dev/null ); echo '### 200' - -This command is for storing /file/name, which is exactly size bytes -big. You probably think I went crazy. Well, I did not: that strange -cat > /dev/null has purpose to discard any extra data which was not -written to disk (due to for example out of space condition). - -[Why? Imagine uploading file with "rm -rf /" line in it.] - -#CWD /somewhere -cd /somewhere; echo '### 000' - -It is specified here, but I'm not sure how wise idea is to use this -one: it breaks stateless-ness of the protocol. - -Following commands should be rather self-explanatory: - -#CHMOD 1234 file -chmod 1234 file; echo '### 000' - -#DELE /some/path -rm -f /some/path; echo '### 000' - -#MKD /some/path -mkdir /some/path; echo '### 000' - -#RMD /some/path -rmdir /some/path; echo '### 000' - -#RENAME /path/a /path/b -mv /path/a /path/b; echo '### 000' - -#LINK /path/a /path/b -ln /path/a /path/b; echo '### 000' - -#SYMLINK /path/a /path/b -ln -s /path/a /path/b; echo '### 000' - -#CHOWN user /file/name -chown user /file/name; echo '### 000' - -#CHGRP group /file/name -chgrp group /file/name; echo '### 000' - -#INFO -...collect info about host into $result ... -echo $result -echo '### 200' - -#READ <offset> <size> /path/and/filename -cat /path/and/filename | ( dd bs=4096 count=<offset/4096> > /dev/null; -dd bs=<offset%4096> count=1 > /dev/null; -dd bs=4096 count=<offset/4096>; -dd bs=<offset%4096> count=1; ) - -Returns ### 200 on successful exit, ### 291 on successful exit when -reading ended at eof, ### 292 on successful exit when reading did not -end at eof. - -#WRITE <offset> <size> /path/and/filename - -Hmm, shall we define these ones if we know our client is not going to -use them? - -you can use follow parameters: -FISH_FILESIZE -FISH_FILENAME -FISH_FILEMODE -FISH_FILEOWNER -FISH_FILEGROUPE -FISH_FILEFROM -FISH_FILETO - -NB: -'FISH_FILESIZE' used if we operate with single file name in 'unlink', 'rmdir', 'chmod', etc... -'FISH_FILEFROM','FISH_FILETO' used if we operate with two files in 'ln', 'hardlink', 'mv' etc... -'FISH_FILEOWNER', 'FISH_FILEGROUPE' is a new user/group in chown - -also flags: -FISH_HAVE_HEAD -FISH_HAVE_SED -FISH_HAVE_AWK -FISH_HAVE_PERL -FISH_HAVE_LSQ -FISH_HAVE_DATE_MDYT - -That's all, folks! - pavel@ucw.cz diff --git a/src/vfs/fish/helpers/append b/src/vfs/fish/helpers/append deleted file mode 100644 index 81ded44..0000000 --- a/src/vfs/fish/helpers/append +++ /dev/null @@ -1,16 +0,0 @@ -#APPE $FISH_FILESIZE $FISH_FILENAME -FILENAME="/${FISH_FILENAME}" -echo "### 001" -{ - bss=4096 - bsl=4095 - if [ $FISH_FILESIZE -lt $bss ]; then - bss=1; - bsl=0; - fi - while [ $FISH_FILESIZE -gt 0 ]; do - cnt=`expr \\( $FISH_FILESIZE + $bsl \\) / $bss` - n=`dd bs=$bss count=$cnt | tee -a "${FILENAME}" | wc -c` - FISH_FILESIZE=`expr $FISH_FILESIZE - $n` - done -}; echo "### 200" diff --git a/src/vfs/fish/helpers/chmod b/src/vfs/fish/helpers/chmod deleted file mode 100644 index a5a88b4..0000000 --- a/src/vfs/fish/helpers/chmod +++ /dev/null @@ -1,6 +0,0 @@ -#CHMOD $FISH_FILEMODE $FISH_FILENAME -if chmod ${FISH_FILEMODE} "/${FISH_FILENAME}" 2>/dev/null; then - echo "### 000" -else - echo "### 500" -fi diff --git a/src/vfs/fish/helpers/chown b/src/vfs/fish/helpers/chown deleted file mode 100644 index 469fdc1..0000000 --- a/src/vfs/fish/helpers/chown +++ /dev/null @@ -1,6 +0,0 @@ -#CHOWN $FISH_FILEOWNER:$FISH_FILEGROUP $FISH_FILENAME -if chown ${FISH_FILEOWNER}:${FISH_FILEGROUP} "/${FISH_FILENAME}" ; then - echo "### 000" -else - echo "### 500" -fi diff --git a/src/vfs/fish/helpers/fexists b/src/vfs/fish/helpers/fexists deleted file mode 100644 index cf03b15..0000000 --- a/src/vfs/fish/helpers/fexists +++ /dev/null @@ -1,3 +0,0 @@ -#ISEXISTS $FISH_FILENAME -ls -l "/${FISH_FILENAME}" >/dev/null 2>/dev/null -echo '### '$? diff --git a/src/vfs/fish/helpers/mkdir b/src/vfs/fish/helpers/mkdir deleted file mode 100644 index b32e995..0000000 --- a/src/vfs/fish/helpers/mkdir +++ /dev/null @@ -1,6 +0,0 @@ -#MKD $FISH_FILENAME -if mkdir "/$FISH_FILENAME" 2>/dev/null; then - echo "### 000" -else - echo "### 500" -fi diff --git a/src/vfs/fish/helpers/mv b/src/vfs/fish/helpers/mv deleted file mode 100644 index c8cf70c..0000000 --- a/src/vfs/fish/helpers/mv +++ /dev/null @@ -1,6 +0,0 @@ -#RENAME $FISH_FILEFROM $FISH_FILETO -if mv "/${FISH_FILEFROM}" "/${FISH_FILETO}" 2>/dev/null; then - echo "### 000" -else - echo "### 500" -fi diff --git a/src/vfs/fish/helpers/rmdir b/src/vfs/fish/helpers/rmdir deleted file mode 100644 index 0f99bf6..0000000 --- a/src/vfs/fish/helpers/rmdir +++ /dev/null @@ -1,6 +0,0 @@ -#RMD $FISH_FILENAME -if rmdir "/${FISH_FILENAME}" 2>/dev/null; then - echo "### 000" -else - echo "### 500" -fi diff --git a/src/vfs/fish/helpers/send b/src/vfs/fish/helpers/send deleted file mode 100644 index 80dd22b..0000000 --- a/src/vfs/fish/helpers/send +++ /dev/null @@ -1,17 +0,0 @@ -#STOR $FISH_FILESIZE $FISH_FILENAME -FILENAME="/${FISH_FILENAME}" -echo "### 001" -{ - > "${FILENAME}" - bss=4096 - bsl=4095 - if [ $FISH_FILESIZE -lt $bss ]; then - bss=1; - bsl=0; - fi - while [ $FISH_FILESIZE -gt 0 ]; do - cnt=`expr \\( $FISH_FILESIZE + $bsl \\) / $bss` - n=`dd bs=$bss count=$cnt | tee -a "${FILENAME}" | wc -c` - FISH_FILESIZE=`expr $FISH_FILESIZE - $n` - done -}; echo "### 200" diff --git a/src/vfs/fish/helpers/unlink b/src/vfs/fish/helpers/unlink deleted file mode 100644 index 79b9ad0..0000000 --- a/src/vfs/fish/helpers/unlink +++ /dev/null @@ -1,6 +0,0 @@ -#DELE $FISH_FILENAME -if rm -f "/${FISH_FILENAME}" 2>/dev/null; then - echo "### 000" -else - echo "### 500" -fi diff --git a/src/vfs/fish/helpers/utime b/src/vfs/fish/helpers/utime deleted file mode 100644 index 94395b4..0000000 --- a/src/vfs/fish/helpers/utime +++ /dev/null @@ -1,13 +0,0 @@ -#UTIME "$FISH_TOUCHATIME_W_NSEC" "$FISH_TOUCHMTIME_W_NSEC" "$FISH_FILENAME" -if TZ=UTC touch -h -m -d "$FISH_TOUCHMTIME_W_NSEC" "/${FISH_FILENAME}" 2>/dev/null && \ - TZ=UTC touch -h -a -d "$FISH_TOUCHATIME_W_NSEC" "/${FISH_FILENAME}" 2>/dev/null; then - echo "### 000" -elif TZ=UTC touch -h -m -t $FISH_TOUCHMTIME "/${FISH_FILENAME}" 2>/dev/null && \ - TZ=UTC touch -h -a -t $FISH_TOUCHATIME "/${FISH_FILENAME}" 2>/dev/null; then - echo "### 000" -elif [ -n "$FISH_HAVE_PERL" ] && - perl -e 'utime '$FISH_FILEATIME','$FISH_FILEMTIME',@ARGV;' "/${FISH_FILENAME}" 2>/dev/null; then - echo "### 000" -else - echo "### 500" -fi diff --git a/src/vfs/ftpfs/Makefile.in b/src/vfs/ftpfs/Makefile.in index e6e561f..2767536 100644 --- a/src/vfs/ftpfs/Makefile.in +++ b/src/vfs/ftpfs/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/src/vfs/ftpfs/ftpfs.c b/src/vfs/ftpfs/ftpfs.c index 549ba32..175bd0d 100644 --- a/src/vfs/ftpfs/ftpfs.c +++ b/src/vfs/ftpfs/ftpfs.c @@ -1,7 +1,7 @@ /* Virtual File System: FTP file system. - Copyright (C) 1995-2023 + Copyright (C) 1995-2024 Free Software Foundation, Inc. Written by: diff --git a/src/vfs/ftpfs/ftpfs_parse_ls.c b/src/vfs/ftpfs/ftpfs_parse_ls.c index 5db79e0..a9ee58c 100644 --- a/src/vfs/ftpfs/ftpfs_parse_ls.c +++ b/src/vfs/ftpfs/ftpfs_parse_ls.c @@ -1,7 +1,7 @@ /* Virtual File System: FTP file system - Copyright (C) 2015-2023 + Copyright (C) 2015-2024 The Free Software Foundation, Inc. Written by: Andrew Borodin <aborodin@vmail.ru>, 2013 diff --git a/src/vfs/local/Makefile.in b/src/vfs/local/Makefile.in index 6d79948..61c6f0e 100644 --- a/src/vfs/local/Makefile.in +++ b/src/vfs/local/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/src/vfs/local/local.c b/src/vfs/local/local.c index a777c84..193fb6b 100644 --- a/src/vfs/local/local.c +++ b/src/vfs/local/local.c @@ -1,7 +1,7 @@ /* Virtual File System: local file system. - Copyright (C) 1995-2023 + Copyright (C) 1995-2024 Free Software Foundation, Inc. This file is part of the Midnight Commander. diff --git a/src/vfs/plugins_init.c b/src/vfs/plugins_init.c index 767e284..da13a12 100644 --- a/src/vfs/plugins_init.c +++ b/src/vfs/plugins_init.c @@ -1,7 +1,7 @@ /* Init VFS plugins. - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: @@ -46,8 +46,8 @@ #include "extfs/extfs.h" #endif -#ifdef ENABLE_VFS_FISH -#include "fish/fish.h" +#ifdef ENABLE_VFS_SHELL +#include "shell/shell.h" #endif #ifdef ENABLE_VFS_FTP @@ -115,9 +115,9 @@ vfs_plugins_init (void) #ifdef ENABLE_VFS_SFTP vfs_init_sftpfs (); #endif /* ENABLE_VFS_SFTP */ -#ifdef ENABLE_VFS_FISH - vfs_init_fish (); -#endif /* ENABLE_VFS_FISH */ +#ifdef ENABLE_VFS_SHELL + vfs_init_shell (); +#endif /* ENABLE_VFS_SHELL */ } /* --------------------------------------------------------------------------------------------- */ diff --git a/src/vfs/sfs/Makefile.in b/src/vfs/sfs/Makefile.in index f9893eb..54392be 100644 --- a/src/vfs/sfs/Makefile.in +++ b/src/vfs/sfs/Makefile.in @@ -135,7 +135,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/src/vfs/sfs/sfs.c b/src/vfs/sfs/sfs.c index fdcc823..58ce5a2 100644 --- a/src/vfs/sfs/sfs.c +++ b/src/vfs/sfs/sfs.c @@ -1,7 +1,7 @@ /* Single File fileSystem - Copyright (C) 1998-2023 + Copyright (C) 1998-2024 Free Software Foundation, Inc. Written by: diff --git a/src/vfs/sfs/sfs.ini b/src/vfs/sfs/sfs.ini index d817dc9..a7b059b 100644 --- a/src/vfs/sfs/sfs.ini +++ b/src/vfs/sfs/sfs.ini @@ -16,6 +16,8 @@ lz4/1 lz4 < %1 > %3 ulz4/1 lz4 -d < %1 > %3 lzma/1 lzma < %1 > %3 ulzma/1 lzma -d < %1 > %3 +lzo/1 lzop < %1 > %3 +ulzo/1 lzop -d < %1 > %3 xz/1 xz < %1 > %3 uxz/1 xz -d < %1 > %3 zst/1 zstd < %1 > %3 diff --git a/src/vfs/sftpfs/Makefile.in b/src/vfs/sftpfs/Makefile.in index e59e875..89bf19f 100644 --- a/src/vfs/sftpfs/Makefile.in +++ b/src/vfs/sftpfs/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/src/vfs/sftpfs/config_parser.c b/src/vfs/sftpfs/config_parser.c index d3e2287..d899e37 100644 --- a/src/vfs/sftpfs/config_parser.c +++ b/src/vfs/sftpfs/config_parser.c @@ -1,7 +1,7 @@ /* Virtual File System: SFTP file system. The SSH config parser - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/src/vfs/sftpfs/connection.c b/src/vfs/sftpfs/connection.c index d2466de..6132675 100644 --- a/src/vfs/sftpfs/connection.c +++ b/src/vfs/sftpfs/connection.c @@ -1,7 +1,7 @@ /* Virtual File System: SFTP file system. The internal functions: connections - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: @@ -74,6 +74,37 @@ static const char *const hostkey_method_ssh_ecdsa_256 = "ecdsa-sha2-nistp256"; static const char *const hostkey_method_ssh_rsa = "ssh-rsa"; static const char *const hostkey_method_ssh_dss = "ssh-dss"; +/* *INDENT-OFF* */ +static const char *default_hostkey_methods = +#ifdef LIBSSH2_KNOWNHOST_KEY_ECDSA_256 + "ecdsa-sha2-nistp256," +#endif +#ifdef LIBSSH2_KNOWNHOST_KEY_ECDSA_384 + "ecdsa-sha2-nistp384," +#endif +#ifdef LIBSSH2_KNOWNHOST_KEY_ECDSA_521 + "ecdsa-sha2-nistp521," +#endif +#ifdef LIBSSH2_KNOWNHOST_KEY_ECDSA_256 + "ecdsa-sha2-nistp256-cert-v01@openssh.com," +#endif +#ifdef LIBSSH2_KNOWNHOST_KEY_ECDSA_384 + "ecdsa-sha2-nistp384-cert-v01@openssh.com," +#endif +#ifdef LIBSSH2_KNOWNHOST_KEY_ECDSA_521 + "ecdsa-sha2-nistp521-cert-v01@openssh.com," +#endif +#ifdef LIBSSH2_KNOWNHOST_KEY_ED25519 + "ssh-ed25519," + "ssh-ed25519-cert-v01@openssh.com," +#endif + "rsa-sha2-256," + "rsa-sha2-512," + "ssh-rsa," + "ssh-rsa-cert-v01@openssh.com," + "ssh-dss"; +/* *INDENT-ON* */ + /** * * The current implementation of know host key checking has following limitations: @@ -257,8 +288,10 @@ sftpfs_read_known_hosts (struct vfs_s_super *super, GError ** mcerror) continue; if (store->name == NULL) - found = TRUE; - else if (store->name[0] != '[') + /* Ignore hashed hostnames. Currently, libssh2 offers no way for us to match it */ + continue; + + if (store->name[0] != '[') found = strcmp (store->name, super->path_element->host) == 0; else { @@ -285,6 +318,7 @@ sftpfs_read_known_hosts (struct vfs_s_super *super, GError ** mcerror) { int mask; const char *hostkey_method = NULL; + char *hostkey_methods; mask = store->typemask & LIBSSH2_KNOWNHOST_KEY_MASK; @@ -326,8 +360,15 @@ sftpfs_read_known_hosts (struct vfs_s_super *super, GError ** mcerror) return FALSE; } + /* Append the default hostkey methods (with lower priority). + * Since we ignored hashed hostnames, the actual matching host + * key might have different type than the one found in + * known_hosts for non-hashed hostname. Methods not supported + * by libssh2 it are ignored. */ + hostkey_methods = g_strdup_printf ("%s,%s", hostkey_method, default_hostkey_methods); rc = libssh2_session_method_pref (sftpfs_super->session, LIBSSH2_METHOD_HOSTKEY, - hostkey_method); + hostkey_methods); + g_free (hostkey_methods); if (rc < 0) goto err; } diff --git a/src/vfs/sftpfs/dir.c b/src/vfs/sftpfs/dir.c index a19a31f..53cb553 100644 --- a/src/vfs/sftpfs/dir.c +++ b/src/vfs/sftpfs/dir.c @@ -1,7 +1,7 @@ /* Virtual File System: SFTP file system. The internal functions: dirs - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/src/vfs/sftpfs/file.c b/src/vfs/sftpfs/file.c index 4146239..ab91b70 100644 --- a/src/vfs/sftpfs/file.c +++ b/src/vfs/sftpfs/file.c @@ -1,7 +1,7 @@ /* Virtual File System: SFTP file system. The internal functions: files - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/src/vfs/sftpfs/internal.c b/src/vfs/sftpfs/internal.c index 9faa76c..dbf15cc 100644 --- a/src/vfs/sftpfs/internal.c +++ b/src/vfs/sftpfs/internal.c @@ -1,7 +1,7 @@ /* Virtual File System: SFTP file system. The internal functions - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/src/vfs/sftpfs/sftpfs.c b/src/vfs/sftpfs/sftpfs.c index f2cc592..ba7d169 100644 --- a/src/vfs/sftpfs/sftpfs.c +++ b/src/vfs/sftpfs/sftpfs.c @@ -1,7 +1,7 @@ /* Virtual File System: SFTP file system. The interface function - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/src/vfs/fish/Makefile.am b/src/vfs/shell/Makefile.am index 4f3ca87..a4cb725 100644 --- a/src/vfs/fish/Makefile.am +++ b/src/vfs/shell/Makefile.am @@ -6,8 +6,8 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ -I$(top_srcdir) -noinst_LTLIBRARIES = libvfs-fish.la +noinst_LTLIBRARIES = libvfs-shell.la -libvfs_fish_la_SOURCES = \ - fish.c fish.h \ - fishdef.h +libvfs_shell_la_SOURCES = \ + shell.c shell.h \ + shelldef.h diff --git a/src/vfs/fish/Makefile.in b/src/vfs/shell/Makefile.in index cd952a8..351aba8 100644 --- a/src/vfs/fish/Makefile.in +++ b/src/vfs/shell/Makefile.in @@ -88,7 +88,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = src/vfs/fish +subdir = src/vfs/shell ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ @@ -151,9 +151,9 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) -libvfs_fish_la_LIBADD = -am_libvfs_fish_la_OBJECTS = fish.lo -libvfs_fish_la_OBJECTS = $(am_libvfs_fish_la_OBJECTS) +libvfs_shell_la_LIBADD = +am_libvfs_shell_la_OBJECTS = shell.lo +libvfs_shell_la_OBJECTS = $(am_libvfs_shell_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -173,7 +173,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/fish.Plo +am__depfiles_remade = ./$(DEPDIR)/shell.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -193,8 +193,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(libvfs_fish_la_SOURCES) -DIST_SOURCES = $(libvfs_fish_la_SOURCES) +SOURCES = $(libvfs_shell_la_SOURCES) +DIST_SOURCES = $(libvfs_shell_la_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ ctags-recursive dvi-recursive html-recursive info-recursive \ install-data-recursive install-dvi-recursive \ @@ -476,10 +476,10 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ -I$(top_srcdir) -noinst_LTLIBRARIES = libvfs-fish.la -libvfs_fish_la_SOURCES = \ - fish.c fish.h \ - fishdef.h +noinst_LTLIBRARIES = libvfs-shell.la +libvfs_shell_la_SOURCES = \ + shell.c shell.h \ + shelldef.h all: all-recursive @@ -494,9 +494,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/vfs/fish/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/vfs/shell/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/vfs/fish/Makefile + $(AUTOMAKE) --gnu src/vfs/shell/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -526,8 +526,8 @@ clean-noinstLTLIBRARIES: rm -f $${locs}; \ } -libvfs-fish.la: $(libvfs_fish_la_OBJECTS) $(libvfs_fish_la_DEPENDENCIES) $(EXTRA_libvfs_fish_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(libvfs_fish_la_OBJECTS) $(libvfs_fish_la_LIBADD) $(LIBS) +libvfs-shell.la: $(libvfs_shell_la_OBJECTS) $(libvfs_shell_la_DEPENDENCIES) $(EXTRA_libvfs_shell_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(libvfs_shell_la_OBJECTS) $(libvfs_shell_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -535,7 +535,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fish.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell.Plo@am__quote@ # am--include-marker $(am__depfiles_remade): @$(MKDIR_P) $(@D) @@ -767,7 +767,7 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-recursive - -rm -f ./$(DEPDIR)/fish.Plo + -rm -f ./$(DEPDIR)/shell.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -813,7 +813,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -f ./$(DEPDIR)/fish.Plo + -rm -f ./$(DEPDIR)/shell.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff --git a/src/vfs/shell/helpers/Makefile.am b/src/vfs/shell/helpers/Makefile.am new file mode 100644 index 0000000..aa0db25 --- /dev/null +++ b/src/vfs/shell/helpers/Makefile.am @@ -0,0 +1,10 @@ +shelldir = $(libexecdir)/@PACKAGE@/shell + +# Files to install and distribute other than shell scripts +SHELL_MISC = README.shell + +# Install and distribute SHELL helper scripts w/o shebang & executable bit as data +shell_DATA = $(SHELL_MISC) ls mkdir fexists unlink chown chmod rmdir ln mv hardlink get send append info utime +shellconfdir = $(sysconfdir)/@PACKAGE@ + +EXTRA_DIST = $(shell_DATA) diff --git a/src/vfs/fish/helpers/Makefile.in b/src/vfs/shell/helpers/Makefile.in index c17efbb..cef7b97 100644 --- a/src/vfs/fish/helpers/Makefile.in +++ b/src/vfs/shell/helpers/Makefile.in @@ -88,7 +88,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = src/vfs/fish/helpers +subdir = src/vfs/shell/helpers ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ @@ -196,8 +196,8 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(fishdir)" -DATA = $(fish_DATA) +am__installdirs = "$(DESTDIR)$(shelldir)" +DATA = $(shell_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -410,15 +410,15 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -fishdir = $(libexecdir)/@PACKAGE@/fish +shelldir = $(libexecdir)/@PACKAGE@/shell -# Files to install and distribute other than fish scripts -FISH_MISC = README.fish +# Files to install and distribute other than shell scripts +SHELL_MISC = README.shell -# Install and distribute FISH helper scripts w/o shebang & executable bit as data -fish_DATA = $(FISH_MISC) ls mkdir fexists unlink chown chmod rmdir ln mv hardlink get send append info utime -fishconfdir = $(sysconfdir)/@PACKAGE@ -EXTRA_DIST = $(fish_DATA) +# Install and distribute SHELL helper scripts w/o shebang & executable bit as data +shell_DATA = $(SHELL_MISC) ls mkdir fexists unlink chown chmod rmdir ln mv hardlink get send append info utime +shellconfdir = $(sysconfdir)/@PACKAGE@ +EXTRA_DIST = $(shell_DATA) all: all-am .SUFFIXES: @@ -431,9 +431,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/vfs/fish/helpers/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/vfs/shell/helpers/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/vfs/fish/helpers/Makefile + $(AUTOMAKE) --gnu src/vfs/shell/helpers/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -457,27 +457,27 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -install-fishDATA: $(fish_DATA) +install-shellDATA: $(shell_DATA) @$(NORMAL_INSTALL) - @list='$(fish_DATA)'; test -n "$(fishdir)" || list=; \ + @list='$(shell_DATA)'; test -n "$(shelldir)" || list=; \ if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(fishdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(fishdir)" || exit 1; \ + echo " $(MKDIR_P) '$(DESTDIR)$(shelldir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(shelldir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ done | $(am__base_list) | \ while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(fishdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(fishdir)" || exit $$?; \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(shelldir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(shelldir)" || exit $$?; \ done -uninstall-fishDATA: +uninstall-shellDATA: @$(NORMAL_UNINSTALL) - @list='$(fish_DATA)'; test -n "$(fishdir)" || list=; \ + @list='$(shell_DATA)'; test -n "$(shelldir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(fishdir)'; $(am__uninstall_files_from_dir) + dir='$(DESTDIR)$(shelldir)'; $(am__uninstall_files_from_dir) tags TAGS: ctags CTAGS: @@ -521,7 +521,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(fishdir)"; do \ + for dir in "$(DESTDIR)$(shelldir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -574,7 +574,7 @@ info: info-am info-am: -install-data-am: install-fishDATA +install-data-am: install-shellDATA install-dvi: install-dvi-am @@ -618,7 +618,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-fishDATA +uninstall-am: uninstall-shellDATA .MAKE: install-am install-strip @@ -626,13 +626,13 @@ uninstall-am: uninstall-fishDATA cscopelist-am ctags-am distclean distclean-generic \ distclean-libtool distdir 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-fishDATA \ - 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 \ + 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-shellDATA install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags-am uninstall uninstall-am uninstall-fishDATA + ps ps-am tags-am uninstall uninstall-am uninstall-shellDATA .PRECIOUS: Makefile diff --git a/src/vfs/shell/helpers/README.shell b/src/vfs/shell/helpers/README.shell new file mode 100644 index 0000000..8cc5347 --- /dev/null +++ b/src/vfs/shell/helpers/README.shell @@ -0,0 +1,227 @@ + + FIles transferred over SSH + ~~~~~~~~~~~~~~~~~~~~~~~~~~ + +This protocol was designed for transferring files over a remote shell +connection (rsh and compatibles). It can be as well used for transfers over +rsh, and there may be other uses. + +Since version 4.8.31 Midnight Commander doesn't support FISH commands with form + +#FISH_COMMAND [arg1] [arg2] ... [argN] + +and sends requests as shell scripts only. + +First, MC looks for system-wide set of scripts, then it checks whether +current user has host-specific overrides in his per-user MC configuration +directory. User-defined overrides take priority over sytem-wide scripts +if they exist. The order in which the directories are traversed is as follows: + + /usr/libexec/mc/shell + ~/.local/share/mc/shell/<hostname>/ + +Server's reply is multiline, but always ends with + +### 000<optional text> + +line. ### is prefix to mark this line, 000 is return code. Return +codes are superset to those used in ftp. + +There are few new exit codes defined: + +000 don't know; if there were no previous lines, this marks COMPLETE +success, if they were, it marks failure. + +001 don't know; if there were no previous lines, this marks +PRELIMinary success, if they were, it marks failure + + Connecting + ~~~~~~~~~~ +MC uses "echo SHELL:;/bin/sh" as command executed on remote machine. + + Actions + ~~~~~~~ + +Get info about host into $result + + echo $result + echo '### 200' + +Script: info + +-------------------------------------------------------------------------------- + +List directory or get status information about single file. + + ls -lLa $1 | grep '^[^cbt]' | ( while read p x u g s m d y n; do echo "P$p $u.$g + S$s + d$m $d $y + :$n + "; done ) + ls -lLa $1 | grep '^[cb]' | ( while read p x u g a i m d y n; do echo "P$p $u.$g + E$a$i + dD$m $d $y + :$n + "; done ) + echo '### 200' + +Output is in following form (any line except :<filename> may be omitted): + +P<unix permissions> <owner>.<group> +S<size> +d<3-letters month name> <day> <year or HH:MM> +D<year> <month> <day> <hour> <minute> <second>[.1234] +E<major-of-device>,<minor> +:<filename> +L<filename symlink points to> +<blank line to separate items> + +Unix permissions are of form X--------- +where X is type of file: + '-' a regular file + 'd' a directory + 'c' a character device + 'b' a block device + 'l' a symbolic link + 'p' a FIFO + 's' a socket. + +'d' has three fields: + month (one of strings Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec) + day of month + single number indicating year, or HH:MM field (assume current year in such + case). As you've probably noticed, this is pretty broken; it is for + compatibility with ls listing. + +Script: ls + +-------------------------------------------------------------------------------- + +Get file + + ls -l /some/name | ( read a b c d x e; echo $x ); echo '### 100'; cat /some/name; echo '### 200' + +Server sends line with filesize on it, followed by line with ### 100 +indicating partial success, then it sends binary data (exactly filesize bytes) +and follows them with (with no preceding newline) ### 200. + +Note that there's no way to abort running RETR command - except closing +the connection. + +Script: get + +-------------------------------------------------------------------------------- + +Put file + + > /file/name; echo '### 001'; ( dd bs=4096 count=<size/4096>; dd bs=<size%4096> count=1 ) 2>/dev/null | ( cat > %s; cat > /dev/null ); echo '### 200' + +This command is for storing /file/name, which is exactly size bytes big. +You probably think I went crazy. Well, I did not: that strange cat > /dev/null +has purpose to discard any extra data which was not written to disk (due to for +example out of space condition). + +[Why? Imagine uploading file with "rm -rf /" line in it.] + +Script: send + +-------------------------------------------------------------------------------- + +Change directory + + cd /somewhere; echo '### 000' + +It is specified here, but I'm not sure how wise idea is to use this one: +it breaks stateless-ness of the protocol. + +-------------------------------------------------------------------------------- + +Change mode + + chmod 1234 file; echo '### 000' + +Script: chmod + +-------------------------------------------------------------------------------- + +Change own + + chown user /file/name; echo '### 000' + +Script: chown + +-------------------------------------------------------------------------------- + +Remove file + + rm -f /some/path; echo '### 000' + +Sctipt: unlink + +-------------------------------------------------------------------------------- + +Make directory: + + mkdir /some/path; echo '### 000' + +Script: mkdir + +-------------------------------------------------------------------------------- + +Remove directory + + rmdir /some/path; echo '### 000' + +Script: rmdir + +-------------------------------------------------------------------------------- + +Rename/move file + + mv /path/a /path/b; echo '### 000' + +Script: mv + +-------------------------------------------------------------------------------- + +Make link + + ln /path/a /path/b; echo '### 000' + +Script: hardlink + +-------------------------------------------------------------------------------- + +Make symbolic link: + + ln -s /path/a /path/b; echo '### 000' + +Script: ln + +-------------------------------------------------------------------------------- + +You can use following parameters: +SHELL_FILESIZE +SHELL_FILENAME +SHELL_FILEMODE +SHELL_FILEOWNER +SHELL_FILEGROUPE +SHELL_FILEFROM +SHELL_FILETO + +NB: +'SHELL_FILESIZE' is used if we operate with single file name in 'unlink', 'rmdir', 'chmod', etc... +'SHELL_FILEFROM','SHELL_FILETO' are used if we operate with two files in 'ln', 'hardlink', 'mv' etc... +'SHELL_FILEOWNER', 'SHELL_FILEGROUPE' are a new user/group in chown + +and flags: +SHELL_HAVE_HEAD +SHELL_HAVE_SED +SHELL_HAVE_AWK +SHELL_HAVE_PERL +SHELL_HAVE_LSQ +SHELL_HAVE_DATE_MDYT + +That's all, folks! + pavel@ucw.cz + aborodin@vmail.ru diff --git a/src/vfs/shell/helpers/append b/src/vfs/shell/helpers/append new file mode 100644 index 0000000..a73d2cd --- /dev/null +++ b/src/vfs/shell/helpers/append @@ -0,0 +1,15 @@ +FILENAME="/${SHELL_FILENAME}" +echo "### 001" +{ + bss=4096 + bsl=4095 + if [ $SHELL_FILESIZE -lt $bss ]; then + bss=1; + bsl=0; + fi + while [ $SHELL_FILESIZE -gt 0 ]; do + cnt=`expr \\( $SHELL_FILESIZE + $bsl \\) / $bss` + n=`dd bs=$bss count=$cnt | tee -a "${FILENAME}" | wc -c` + SHELL_FILESIZE=`expr $SHELL_FILESIZE - $n` + done +}; echo "### 200" diff --git a/src/vfs/shell/helpers/chmod b/src/vfs/shell/helpers/chmod new file mode 100644 index 0000000..75ea024 --- /dev/null +++ b/src/vfs/shell/helpers/chmod @@ -0,0 +1,5 @@ +if chmod ${SHELL_FILEMODE} "/${SHELL_FILENAME}" 2>/dev/null; then + echo "### 000" +else + echo "### 500" +fi diff --git a/src/vfs/shell/helpers/chown b/src/vfs/shell/helpers/chown new file mode 100644 index 0000000..c2fc2b1 --- /dev/null +++ b/src/vfs/shell/helpers/chown @@ -0,0 +1,5 @@ +if chown ${SHELL_FILEOWNER}:${SHELL_FILEGROUP} "/${SHELL_FILENAME}" ; then + echo "### 000" +else + echo "### 500" +fi diff --git a/src/vfs/shell/helpers/fexists b/src/vfs/shell/helpers/fexists new file mode 100644 index 0000000..3d11574 --- /dev/null +++ b/src/vfs/shell/helpers/fexists @@ -0,0 +1,2 @@ +ls -l "/${SHELL_FILENAME}" >/dev/null 2>/dev/null +echo '### '$? diff --git a/src/vfs/fish/helpers/get b/src/vfs/shell/helpers/get index 762267a..b633a45 100644 --- a/src/vfs/fish/helpers/get +++ b/src/vfs/shell/helpers/get @@ -1,7 +1,6 @@ -#RETR $FISH_FILENAME $FISH_START_OFFSET LC_TIME=C export LC_TIME -fish_get_perl () +shell_get_perl () { FILENAME=$1 OFFSET=$2 @@ -35,7 +34,7 @@ exit 0 ' "${FILENAME}" $OFFSET } -fish_get_tail () +shell_get_tail () { FILENAME=$1 OFFSET=$2 @@ -67,7 +66,7 @@ else fi } -fish_get_dd () +shell_get_dd () { FILENAME=$1 OFFSET=$2 @@ -96,10 +95,10 @@ else fi } -if [ -n "${FISH_HAVE_PERL}" ]; then - fish_get_perl "/${FISH_FILENAME}" ${FISH_START_OFFSET} -elif [ -n "${FISH_HAVE_TAIL}" ]; then - fish_get_tail "/${FISH_FILENAME}" ${FISH_START_OFFSET} +if [ -n "${SHELL_HAVE_PERL}" ]; then + shell_get_perl "/${SHELL_FILENAME}" ${SHELL_START_OFFSET} +elif [ -n "${SHELL_HAVE_TAIL}" ]; then + shell_get_tail "/${SHELL_FILENAME}" ${SHELL_START_OFFSET} else - fish_get_dd "/${FISH_FILENAME}" ${FISH_START_OFFSET} + shell_get_dd "/${SHELL_FILENAME}" ${SHELL_START_OFFSET} fi diff --git a/src/vfs/fish/helpers/hardlink b/src/vfs/shell/helpers/hardlink index 4f36b3f..f92b332 100644 --- a/src/vfs/fish/helpers/hardlink +++ b/src/vfs/shell/helpers/hardlink @@ -1,6 +1,5 @@ -#LINK $FISH_FILEFROM $FISH_FILETO -FILEFROM="/${FISH_FILEFROM}" -FILETO="/${FISH_FILETO}" +FILEFROM="/${SHELL_FILEFROM}" +FILETO="/${SHELL_FILETO}" if ln "${FILEFROM}" "${FILETO}" 2>/dev/null; then echo "### 000" else diff --git a/src/vfs/fish/helpers/info b/src/vfs/shell/helpers/info index b85b0a7..053423a 100644 --- a/src/vfs/fish/helpers/info +++ b/src/vfs/shell/helpers/info @@ -1,12 +1,12 @@ LC_TIME=C export LC_TIME -#FISH_HAVE_HEAD 1 -#FISH_HAVE_SED 2 -#FISH_HAVE_AWK 4 -#FISH_HAVE_PERL 8 -#FISH_HAVE_LSQ 16 -#FISH_HAVE_DATE_MDYT 32 -#FISH_HAVE_TAIL 64 +#SHELL_HAVE_HEAD 1 +#SHELL_HAVE_SED 2 +#SHELL_HAVE_AWK 4 +#SHELL_HAVE_PERL 8 +#SHELL_HAVE_LSQ 16 +#SHELL_HAVE_DATE_MDYT 32 +#SHELL_HAVE_TAIL 64 res=0 if `echo yes| head -c 1 > /dev/null 2>&1` ; then res=`expr $res + 1` diff --git a/src/vfs/fish/helpers/ln b/src/vfs/shell/helpers/ln index a8445d8..15a20cd 100644 --- a/src/vfs/fish/helpers/ln +++ b/src/vfs/shell/helpers/ln @@ -1,6 +1,5 @@ -#SYMLINK $FISH_FILEFROM $FISH_FILETO -FILEFROM="${FISH_FILEFROM}" -FILETO="/${FISH_FILETO}" +FILEFROM="${SHELL_FILEFROM}" +FILETO="/${SHELL_FILETO}" if ln -s "${FILEFROM}" "${FILETO}" 2>/dev/null; then echo "### 000" else diff --git a/src/vfs/fish/helpers/ls b/src/vfs/shell/helpers/ls index 7165b51..c7701d6 100644 --- a/src/vfs/fish/helpers/ls +++ b/src/vfs/shell/helpers/ls @@ -1,11 +1,10 @@ -#LIST /${FISH_DIR} LC_TIME=C export LC_TIME perl_res="1" -fish_list_lsq () +shell_list_lsq () { -FISH_DIR="$1" -ls -Qlan "${FISH_DIR}" 2>/dev/null | grep '^[^cbt]' | ( +SHELL_DIR="$1" +ls -Qlan "${SHELL_DIR}" 2>/dev/null | grep '^[^cbt]' | ( while read p l u g s m d y n; do echo "P$p $u.$g" echo "S$s" @@ -15,7 +14,7 @@ while read p l u g s m d y n; do done ) -ls -Qlan "${FISH_DIR}" 2>/dev/null | grep '^[cb]' | ( +ls -Qlan "${SHELL_DIR}" 2>/dev/null | grep '^[cb]' | ( while read p l u g a i m d y n; do echo "P$p $u.$g" echo "E$a$i" @@ -27,13 +26,13 @@ done echo '### 200' } -fish_list_sed () +shell_list_sed () { -FISH_DIR="$1" -ls -lan "${FISH_DIR}" 2>/dev/null | grep '^[^cbt]' | ( +SHELL_DIR="$1" +ls -lan "${SHELL_DIR}" 2>/dev/null | grep '^[^cbt]' | ( while read p l u g s rec; do if [ -n "$g" ]; then - if [ -n "$FISH_HAVE_DATE_MDYT" ]; then + if [ -n "$SHELL_HAVE_DATE_MDYT" ]; then filename=`echo "$rec"| sed 's/[^[:space:]]\+ \+[^[:space:]]\+ \+[^[:space:]]\+ //'` filedate=`echo "$rec"| sed 's/\([^[:space:]]\+ \+[^[:space:]]\+ \+[^[:space:]]\+\) .*/\1/'` else @@ -43,7 +42,7 @@ while read p l u g s rec; do pfile=\"`echo "$filename" | sed -e 's#^\(.*\) -> \(.*\)#\1" -> "\2#'`\" echo "P$p $u.$g" echo "S$s" - if [ -n "$FISH_HAVE_DATE_MDYT" ]; then + if [ -n "$SHELL_HAVE_DATE_MDYT" ]; then echo "d$filedate" else echo "D$filedate" @@ -53,10 +52,10 @@ while read p l u g s rec; do fi done ) -ls -lan "${FISH_DIR}" 2>/dev/null | grep '^[cb]' | ( +ls -lan "${SHELL_DIR}" 2>/dev/null | grep '^[cb]' | ( while read p l u g a i rec; do if [ -n "$g" ]; then - if [ -n "$FISH_HAVE_DATE_MDYT" ]; then + if [ -n "$SHELL_HAVE_DATE_MDYT" ]; then filename=`echo "$rec"| sed 's/[^[:space:]]\+ \+[^[:space:]]\+ \+[^[:space:]]\+ //'` filedate=`echo "$rec"| sed 's/\([^[:space:]]\+ \+[^[:space:]]\+ \+[^[:space:]]\+\) .*/\1/'` else @@ -66,7 +65,7 @@ while read p l u g a i rec; do pfile=\"`echo "$filename" | sed -e 's#^\(.*\) -> \(.*\)#\1" -> "\2#'`\" echo "P$p $u.$g" echo "E$a$i" - if [ -n "$FISH_HAVE_DATE_MDYT" ]; then + if [ -n "$SHELL_HAVE_DATE_MDYT" ]; then echo "d$filedate" else echo "D$filedate" @@ -79,10 +78,10 @@ done echo '### 200' } -fish_list_poor_ls () +shell_list_poor_ls () { -FISH_DIR="$1" -ls -lan "${FISH_DIR}" 2>/dev/null | grep '^[^cbt]' | ( +SHELL_DIR="$1" +ls -lan "${SHELL_DIR}" 2>/dev/null | grep '^[^cbt]' | ( while read p l u g s m d y n n2 n3; do if [ -n "$g" ]; then if [ "$m" = "0" ]; then @@ -98,7 +97,7 @@ while read p l u g s m d y n n2 n3; do fi done ) -ls -lan "${FISH_DIR}" 2>/dev/null | grep '^[cb]' | ( +ls -lan "${SHELL_DIR}" 2>/dev/null | grep '^[cb]' | ( while read p l u g a i m d y n n2 n3; do if [ -n "$g" ]; then if [ "$a" = "0" ]; then @@ -117,15 +116,14 @@ done echo '### 200' } -fish_list_perl () +shell_list_perl () { -FISH_DIR=$1 +SHELL_DIR=$1 perl -e ' use strict; use POSIX; -use Fcntl; -use POSIX ":fcntl_h"; #S_ISLNK was here until 5.6 -import Fcntl ":mode" unless defined &S_ISLNK; #and is now here +use Fcntl ":mode"; # S_ISLNK, S_IFMT, S_IMODE are here +use POSIX ":fcntl_h"; # S_ISLNK might be here as well my $dirname = $ARGV[0]; if (opendir (DIR, $dirname)) { while((my $filename = readdir (DIR))){ @@ -152,19 +150,19 @@ while((my $filename = readdir (DIR))){ printf("### 500\n"); } exit 0 -' "/${FISH_DIR}" +' "/${SHELL_DIR}" perl_res=$? } -if [ -n "${FISH_HAVE_PERL}" ]; then - fish_list_perl "/${FISH_FILENAME}" +if [ -n "${SHELL_HAVE_PERL}" ]; then + shell_list_perl "/${SHELL_FILENAME}" fi if [ "${perl_res}" != "0" ]; then - if [ -n "${FISH_HAVE_LSQ}" ]; then - fish_list_lsq "/${FISH_FILENAME}" - elif [ -n "${FISH_HAVE_SED}" ]; then - fish_list_sed "/${FISH_FILENAME}" + if [ -n "${SHELL_HAVE_LSQ}" ]; then + shell_list_lsq "/${SHELL_FILENAME}" + elif [ -n "${SHELL_HAVE_SED}" ]; then + shell_list_sed "/${SHELL_FILENAME}" else - fish_list_poor_ls "/${FISH_FILENAME}" + shell_list_poor_ls "/${SHELL_FILENAME}" fi fi diff --git a/src/vfs/shell/helpers/mkdir b/src/vfs/shell/helpers/mkdir new file mode 100644 index 0000000..b05f125 --- /dev/null +++ b/src/vfs/shell/helpers/mkdir @@ -0,0 +1,5 @@ +if mkdir "/$SHELL_FILENAME" 2>/dev/null; then + echo "### 000" +else + echo "### 500" +fi diff --git a/src/vfs/shell/helpers/mv b/src/vfs/shell/helpers/mv new file mode 100644 index 0000000..1fd2327 --- /dev/null +++ b/src/vfs/shell/helpers/mv @@ -0,0 +1,5 @@ +if mv "/${SHELL_FILEFROM}" "/${SHELL_FILETO}" 2>/dev/null; then + echo "### 000" +else + echo "### 500" +fi diff --git a/src/vfs/shell/helpers/rmdir b/src/vfs/shell/helpers/rmdir new file mode 100644 index 0000000..88172c4 --- /dev/null +++ b/src/vfs/shell/helpers/rmdir @@ -0,0 +1,5 @@ +if rmdir "/${SHELL_FILENAME}" 2>/dev/null; then + echo "### 000" +else + echo "### 500" +fi diff --git a/src/vfs/shell/helpers/send b/src/vfs/shell/helpers/send new file mode 100644 index 0000000..66c2a1c --- /dev/null +++ b/src/vfs/shell/helpers/send @@ -0,0 +1,16 @@ +FILENAME="/${SHELL_FILENAME}" +echo "### 001" +{ + > "${FILENAME}" + bss=4096 + bsl=4095 + if [ $SHELL_FILESIZE -lt $bss ]; then + bss=1; + bsl=0; + fi + while [ $SHELL_FILESIZE -gt 0 ]; do + cnt=`expr \\( $SHELL_FILESIZE + $bsl \\) / $bss` + n=`dd bs=$bss count=$cnt | tee -a "${FILENAME}" | wc -c` + SHELL_FILESIZE=`expr $SHELL_FILESIZE - $n` + done +}; echo "### 200" diff --git a/src/vfs/shell/helpers/unlink b/src/vfs/shell/helpers/unlink new file mode 100644 index 0000000..f02f4d3 --- /dev/null +++ b/src/vfs/shell/helpers/unlink @@ -0,0 +1,5 @@ +if rm -f "/${SHELL_FILENAME}" 2>/dev/null; then + echo "### 000" +else + echo "### 500" +fi diff --git a/src/vfs/shell/helpers/utime b/src/vfs/shell/helpers/utime new file mode 100644 index 0000000..a563431 --- /dev/null +++ b/src/vfs/shell/helpers/utime @@ -0,0 +1,12 @@ +if TZ=UTC touch -h -m -d "$SHELL_TOUCHMTIME_W_NSEC" "/${SHELL_FILENAME}" 2>/dev/null && \ + TZ=UTC touch -h -a -d "$SHELL_TOUCHATIME_W_NSEC" "/${SHELL_FILENAME}" 2>/dev/null; then + echo "### 000" +elif TZ=UTC touch -h -m -t $SHELL_TOUCHMTIME "/${SHELL_FILENAME}" 2>/dev/null && \ + TZ=UTC touch -h -a -t $SHELL_TOUCHATIME "/${SHELL_FILENAME}" 2>/dev/null; then + echo "### 000" +elif [ -n "$SHELL_HAVE_PERL" ] && + perl -e 'utime '$SHELL_FILEATIME','$SHELL_FILEMTIME',@ARGV;' "/${SHELL_FILENAME}" 2>/dev/null; then + echo "### 000" +else + echo "### 500" +fi diff --git a/src/vfs/fish/fish.c b/src/vfs/shell/shell.c index ec71a41..74788d6 100644 --- a/src/vfs/fish/fish.c +++ b/src/vfs/shell/shell.c @@ -1,8 +1,8 @@ /* - Virtual File System: FISH implementation for transferring files over + Virtual File System: SHELL implementation for transferring files over shell connections. - Copyright (C) 1998-2023 + Copyright (C) 1998-2024 Free Software Foundation, Inc. Written by: @@ -32,20 +32,20 @@ /** * \file - * \brief Source: Virtual File System: FISH implementation for transferring files over + * \brief Source: Virtual File System: SHELL implementation for transferring files over * shell connections * \author Pavel Machek * \author Michal Svec * \date 1998, 2000 * * Derived from ftpfs.c - * Read README.fish for protocol specification. + * Read README.shell for protocol specification. * * Syntax of path is: \verbatim sh://user@host[:Cr]/path \endverbatim * where C means you want compressed connection, * and r means you want to use rsh * - * Namespace: fish_vfs_ops exported. + * Namespace: shell_vfs_ops exported. */ /* Define this if your ssh can take -I option */ @@ -74,12 +74,12 @@ #include "lib/vfs/xdirentry.h" #include "lib/vfs/gc.h" /* vfs_stamp_create */ -#include "fish.h" -#include "fishdef.h" +#include "shell.h" +#include "shelldef.h" /*** global variables ****************************************************************************/ -int fish_directory_timeout = 900; +int shell_directory_timeout = 900; /*** file scope macro definitions ****************************************************************/ @@ -87,8 +87,8 @@ int fish_directory_timeout = 900; #define DO_OPEN 2 #define DO_FREE_RESOURCE 4 -#define FISH_FLAG_COMPRESSED 1 -#define FISH_FLAG_RSH 2 +#define SHELL_FLAG_COMPRESSED 1 +#define SHELL_FLAG_RSH 2 #define OPT_FLUSH 1 #define OPT_IGNORE_ERROR 2 @@ -108,16 +108,16 @@ int fish_directory_timeout = 900; #define WANT_STRING 0x02 /* environment flags */ -#define FISH_HAVE_HEAD 1 -#define FISH_HAVE_SED 2 -#define FISH_HAVE_AWK 4 -#define FISH_HAVE_PERL 8 -#define FISH_HAVE_LSQ 16 -#define FISH_HAVE_DATE_MDYT 32 -#define FISH_HAVE_TAIL 64 +#define SHELL_HAVE_HEAD 1 +#define SHELL_HAVE_SED 2 +#define SHELL_HAVE_AWK 4 +#define SHELL_HAVE_PERL 8 +#define SHELL_HAVE_LSQ 16 +#define SHELL_HAVE_DATE_MDYT 32 +#define SHELL_HAVE_TAIL 64 -#define FISH_SUPER(super) ((fish_super_t *) (super)) -#define FISH_FILE_HANDLER(fh) ((fish_file_handler_t *) fh) +#define SHELL_SUPER(super) ((shell_super_t *) (super)) +#define SHELL_FILE_HANDLER(fh) ((shell_file_handler_t *) fh) /*** file scope type declarations ****************************************************************/ @@ -144,7 +144,7 @@ typedef struct char *scr_info; int host_flags; GString *scr_env; -} fish_super_t; +} shell_super_t; typedef struct { @@ -153,7 +153,7 @@ typedef struct off_t got; off_t total; gboolean append; -} fish_file_handler_t; +} shell_file_handler_t; /*** forward declarations (file scope functions) *************************************************/ @@ -161,15 +161,15 @@ typedef struct static char reply_str[80]; -static struct vfs_s_subclass fish_subclass; -static struct vfs_class *vfs_fish_ops = VFS_CLASS (&fish_subclass); +static struct vfs_s_subclass shell_subclass; +static struct vfs_class *vfs_shell_ops = VFS_CLASS (&shell_subclass); /* --------------------------------------------------------------------------------------------- */ /*** file scope functions ************************************************************************/ /* --------------------------------------------------------------------------------------------- */ static void -fish_set_blksize (struct stat *s) +shell_set_blksize (struct stat *s) { #ifdef HAVE_STRUCT_STAT_ST_BLKSIZE /* redefine block size */ @@ -180,12 +180,12 @@ fish_set_blksize (struct stat *s) /* --------------------------------------------------------------------------------------------- */ static struct stat * -fish_default_stat (struct vfs_class *me) +shell_default_stat (struct vfs_class *me) { struct stat *s; s = vfs_s_default_stat (me, S_IFDIR | 0755); - fish_set_blksize (s); + shell_set_blksize (s); vfs_adjust_stat (s); return s; @@ -194,15 +194,16 @@ fish_default_stat (struct vfs_class *me) /* --------------------------------------------------------------------------------------------- */ static char * -fish_load_script_from_file (const char *hostname, const char *script_name, const char *def_content) +shell_load_script_from_file (const char *hostname, const char *script_name, const char *def_content) { char *scr_filename = NULL; char *scr_content; gsize scr_len = 0; /* 1st: scan user directory */ - scr_filename = g_build_path (PATH_SEP_STR, mc_config_get_data_path (), FISH_PREFIX, hostname, - script_name, (char *) NULL); + scr_filename = + g_build_path (PATH_SEP_STR, mc_config_get_data_path (), VFS_SHELL_PREFIX, hostname, + script_name, (char *) NULL); /* silent about user dir */ g_file_get_contents (scr_filename, &scr_content, &scr_len, NULL); g_free (scr_filename); @@ -210,7 +211,7 @@ fish_load_script_from_file (const char *hostname, const char *script_name, const if (scr_content == NULL) { scr_filename = - g_build_path (PATH_SEP_STR, LIBEXECDIR, FISH_PREFIX, script_name, (char *) NULL); + g_build_path (PATH_SEP_STR, LIBEXECDIR, VFS_SHELL_PREFIX, script_name, (char *) NULL); g_file_get_contents (scr_filename, &scr_content, &scr_len, NULL); g_free (scr_filename); } @@ -224,7 +225,7 @@ fish_load_script_from_file (const char *hostname, const char *script_name, const /* --------------------------------------------------------------------------------------------- */ static int -fish_decode_reply (char *s, gboolean was_garbage) +shell_decode_reply (char *s, gboolean was_garbage) { int code; @@ -243,7 +244,7 @@ fish_decode_reply (char *s, gboolean was_garbage) /* Returns a reply code, check /usr/include/arpa/ftp.h for possible values */ static int -fish_get_reply (struct vfs_class *me, int sock, char *string_buf, int string_len) +shell_get_reply (struct vfs_class *me, int sock, char *string_buf, int string_len) { char answer[BUF_1K]; gboolean was_garbage = FALSE; @@ -258,7 +259,7 @@ fish_get_reply (struct vfs_class *me, int sock, char *string_buf, int string_len } if (strncmp (answer, "### ", 4) == 0) - return fish_decode_reply (answer + 4, was_garbage ? 1 : 0); + return shell_decode_reply (answer + 4, was_garbage ? 1 : 0); was_garbage = TRUE; if (string_buf != NULL) @@ -269,8 +270,8 @@ fish_get_reply (struct vfs_class *me, int sock, char *string_buf, int string_len /* --------------------------------------------------------------------------------------------- */ static int -fish_command (struct vfs_class *me, struct vfs_s_super *super, int wait_reply, const char *cmd, - size_t cmd_len) +shell_command (struct vfs_class *me, struct vfs_s_super *super, int wait_reply, const char *cmd, + size_t cmd_len) { ssize_t status; FILE *logfile = me->logfile; @@ -288,16 +289,16 @@ fish_command (struct vfs_class *me, struct vfs_s_super *super, int wait_reply, c } tty_enable_interrupt_key (); - status = write (FISH_SUPER (super)->sockw, cmd, cmd_len); + status = write (SHELL_SUPER (super)->sockw, cmd, cmd_len); tty_disable_interrupt_key (); if (status < 0) return TRANSIENT; if (wait_reply) - return fish_get_reply (me, FISH_SUPER (super)->sockr, - (wait_reply & WANT_STRING) != 0 ? reply_str : - NULL, sizeof (reply_str) - 1); + return shell_get_reply (me, SHELL_SUPER (super)->sockr, + (wait_reply & WANT_STRING) != 0 ? reply_str : NULL, + sizeof (reply_str) - 1); return COMPLETE; } @@ -305,16 +306,16 @@ fish_command (struct vfs_class *me, struct vfs_s_super *super, int wait_reply, c static int G_GNUC_PRINTF (5, 0) -fish_command_va (struct vfs_class *me, struct vfs_s_super *super, int wait_reply, const char *scr, - const char *vars, va_list ap) +shell_command_va (struct vfs_class *me, struct vfs_s_super *super, int wait_reply, const char *scr, + const char *vars, va_list ap) { int r; GString *command; - command = mc_g_string_dup (FISH_SUPER (super)->scr_env); + command = mc_g_string_dup (SHELL_SUPER (super)->scr_env); g_string_append_vprintf (command, vars, ap); g_string_append (command, scr); - r = fish_command (me, super, wait_reply, command->str, command->len); + r = shell_command (me, super, wait_reply, command->str, command->len); g_string_free (command, TRUE); return r; @@ -324,14 +325,14 @@ fish_command_va (struct vfs_class *me, struct vfs_s_super *super, int wait_reply static int G_GNUC_PRINTF (5, 6) -fish_command_v (struct vfs_class *me, struct vfs_s_super *super, int wait_reply, const char *scr, - const char *vars, ...) +shell_command_v (struct vfs_class *me, struct vfs_s_super *super, int wait_reply, const char *scr, + const char *vars, ...) { int r; va_list ap; va_start (ap, vars); - r = fish_command_va (me, super, wait_reply, scr, vars, ap); + r = shell_command_va (me, super, wait_reply, scr, vars, ap); va_end (ap); return r; @@ -341,16 +342,16 @@ fish_command_v (struct vfs_class *me, struct vfs_s_super *super, int wait_reply, static int G_GNUC_PRINTF (5, 6) -fish_send_command (struct vfs_class *me, struct vfs_s_super *super, int flags, const char *scr, - const char *vars, ...) +shell_send_command (struct vfs_class *me, struct vfs_s_super *super, int flags, const char *scr, + const char *vars, ...) { int r; va_list ap; va_start (ap, vars); - r = fish_command_va (me, super, WAIT_REPLY, scr, vars, ap); + r = shell_command_va (me, super, WAIT_REPLY, scr, vars, ap); va_end (ap); - vfs_stamp_create (vfs_fish_ops, super); + vfs_stamp_create (vfs_shell_ops, super); if (r != COMPLETE) ERRNOR (E_REMOTE, -1); @@ -363,11 +364,11 @@ fish_send_command (struct vfs_class *me, struct vfs_s_super *super, int flags, c /* --------------------------------------------------------------------------------------------- */ static struct vfs_s_super * -fish_new_archive (struct vfs_class *me) +shell_new_archive (struct vfs_class *me) { - fish_super_t *arch; + shell_super_t *arch; - arch = g_new0 (fish_super_t, 1); + arch = g_new0 (shell_super_t, 1); arch->base.me = me; return VFS_SUPER (arch); @@ -376,48 +377,48 @@ fish_new_archive (struct vfs_class *me) /* --------------------------------------------------------------------------------------------- */ static void -fish_free_archive (struct vfs_class *me, struct vfs_s_super *super) +shell_free_archive (struct vfs_class *me, struct vfs_s_super *super) { - fish_super_t *fish_super = FISH_SUPER (super); + shell_super_t *shell_super = SHELL_SUPER (super); - if ((fish_super->sockw != -1) || (fish_super->sockr != -1)) - vfs_print_message (_("fish: Disconnecting from %s"), super->name ? super->name : "???"); + if ((shell_super->sockw != -1) || (shell_super->sockr != -1)) + vfs_print_message (_("shell: Disconnecting from %s"), super->name ? super->name : "???"); - if (fish_super->sockw != -1) + if (shell_super->sockw != -1) { - fish_command (me, super, NONE, "#BYE\nexit\n", -1); - close (fish_super->sockw); - fish_super->sockw = -1; + shell_command (me, super, NONE, "exit\n", -1); + close (shell_super->sockw); + shell_super->sockw = -1; } - if (fish_super->sockr != -1) + if (shell_super->sockr != -1) { - close (fish_super->sockr); - fish_super->sockr = -1; + close (shell_super->sockr); + shell_super->sockr = -1; } - g_free (fish_super->scr_ls); - g_free (fish_super->scr_exists); - g_free (fish_super->scr_mkdir); - g_free (fish_super->scr_unlink); - g_free (fish_super->scr_chown); - g_free (fish_super->scr_chmod); - g_free (fish_super->scr_utime); - g_free (fish_super->scr_rmdir); - g_free (fish_super->scr_ln); - g_free (fish_super->scr_mv); - g_free (fish_super->scr_hardlink); - g_free (fish_super->scr_get); - g_free (fish_super->scr_send); - g_free (fish_super->scr_append); - g_free (fish_super->scr_info); - g_string_free (fish_super->scr_env, TRUE); + g_free (shell_super->scr_ls); + g_free (shell_super->scr_exists); + g_free (shell_super->scr_mkdir); + g_free (shell_super->scr_unlink); + g_free (shell_super->scr_chown); + g_free (shell_super->scr_chmod); + g_free (shell_super->scr_utime); + g_free (shell_super->scr_rmdir); + g_free (shell_super->scr_ln); + g_free (shell_super->scr_mv); + g_free (shell_super->scr_hardlink); + g_free (shell_super->scr_get); + g_free (shell_super->scr_send); + g_free (shell_super->scr_append); + g_free (shell_super->scr_info); + g_string_free (shell_super->scr_env, TRUE); } /* --------------------------------------------------------------------------------------------- */ static void -fish_pipeopen (struct vfs_s_super *super, const char *path, const char *argv[]) +shell_pipeopen (struct vfs_s_super *super, const char *path, const char *argv[]) { int fileset1[2], fileset2[2]; int res; @@ -433,9 +434,9 @@ fish_pipeopen (struct vfs_s_super *super, const char *path, const char *argv[]) vfs_die ("Cannot fork(): %m."); /* We are the parent */ close (fileset1[0]); - FISH_SUPER (super)->sockw = fileset1[1]; + SHELL_SUPER (super)->sockw = fileset1[1]; close (fileset2[1]); - FISH_SUPER (super)->sockr = fileset2[0]; + SHELL_SUPER (super)->sockr = fileset2[0]; } else { @@ -456,32 +457,32 @@ fish_pipeopen (struct vfs_s_super *super, const char *path, const char *argv[]) /* --------------------------------------------------------------------------------------------- */ static GString * -fish_set_env (int flags) +shell_set_env (int flags) { GString *ret; ret = g_string_sized_new (256); - if ((flags & FISH_HAVE_HEAD) != 0) - g_string_append (ret, "FISH_HAVE_HEAD=1 export FISH_HAVE_HEAD; "); + if ((flags & SHELL_HAVE_HEAD) != 0) + g_string_append (ret, "SHELL_HAVE_HEAD=1 export SHELL_HAVE_HEAD; "); - if ((flags & FISH_HAVE_SED) != 0) - g_string_append (ret, "FISH_HAVE_SED=1 export FISH_HAVE_SED; "); + if ((flags & SHELL_HAVE_SED) != 0) + g_string_append (ret, "SHELL_HAVE_SED=1 export SHELL_HAVE_SED; "); - if ((flags & FISH_HAVE_AWK) != 0) - g_string_append (ret, "FISH_HAVE_AWK=1 export FISH_HAVE_AWK; "); + if ((flags & SHELL_HAVE_AWK) != 0) + g_string_append (ret, "SHELL_HAVE_AWK=1 export SHELL_HAVE_AWK; "); - if ((flags & FISH_HAVE_PERL) != 0) - g_string_append (ret, "FISH_HAVE_PERL=1 export FISH_HAVE_PERL; "); + if ((flags & SHELL_HAVE_PERL) != 0) + g_string_append (ret, "SHELL_HAVE_PERL=1 export SHELL_HAVE_PERL; "); - if ((flags & FISH_HAVE_LSQ) != 0) - g_string_append (ret, "FISH_HAVE_LSQ=1 export FISH_HAVE_LSQ; "); + if ((flags & SHELL_HAVE_LSQ) != 0) + g_string_append (ret, "SHELL_HAVE_LSQ=1 export SHELL_HAVE_LSQ; "); - if ((flags & FISH_HAVE_DATE_MDYT) != 0) - g_string_append (ret, "FISH_HAVE_DATE_MDYT=1 export FISH_HAVE_DATE_MDYT; "); + if ((flags & SHELL_HAVE_DATE_MDYT) != 0) + g_string_append (ret, "SHELL_HAVE_DATE_MDYT=1 export SHELL_HAVE_DATE_MDYT; "); - if ((flags & FISH_HAVE_TAIL) != 0) - g_string_append (ret, "FISH_HAVE_TAIL=1 export FISH_HAVE_TAIL; "); + if ((flags & SHELL_HAVE_TAIL) != 0) + g_string_append (ret, "SHELL_HAVE_TAIL=1 export SHELL_HAVE_TAIL; "); return ret; } @@ -489,23 +490,23 @@ fish_set_env (int flags) /* --------------------------------------------------------------------------------------------- */ static gboolean -fish_info (struct vfs_class *me, struct vfs_s_super *super) +shell_info (struct vfs_class *me, struct vfs_s_super *super) { - fish_super_t *fish_super = FISH_SUPER (super); + shell_super_t *shell_super = SHELL_SUPER (super); - if (fish_command (me, super, NONE, fish_super->scr_info, -1) == COMPLETE) + if (shell_command (me, super, NONE, shell_super->scr_info, -1) == COMPLETE) { while (TRUE) { int res; char buffer[BUF_8K] = ""; - res = vfs_s_get_line_interruptible (me, buffer, sizeof (buffer), fish_super->sockr); + res = vfs_s_get_line_interruptible (me, buffer, sizeof (buffer), shell_super->sockr); if ((res == 0) || (res == EINTR)) ERRNOR (ECONNRESET, FALSE); if (strncmp (buffer, "### ", 4) == 0) break; - fish_super->host_flags = atol (buffer); + shell_super->host_flags = atol (buffer); } return TRUE; } @@ -515,18 +516,18 @@ fish_info (struct vfs_class *me, struct vfs_s_super *super) /* --------------------------------------------------------------------------------------------- */ static void -fish_open_archive_pipeopen (struct vfs_s_super *super) +shell_open_archive_pipeopen (struct vfs_s_super *super) { char gbuf[10]; const char *argv[10]; /* All of 10 is used now */ - const char *xsh = (super->path_element->port == FISH_FLAG_RSH ? "rsh" : "ssh"); + const char *xsh = (super->path_element->port == SHELL_FLAG_RSH ? "rsh" : "ssh"); int i = 0; argv[i++] = xsh; - if (super->path_element->port == FISH_FLAG_COMPRESSED) + if (super->path_element->port == SHELL_FLAG_COMPRESSED) argv[i++] = "-C"; - if (super->path_element->port > FISH_FLAG_RSH) + if (super->path_element->port > SHELL_FLAG_RSH) { argv[i++] = "-p"; g_snprintf (gbuf, sizeof (gbuf), "%d", super->path_element->port); @@ -552,23 +553,23 @@ fish_open_archive_pipeopen (struct vfs_s_super *super) } argv[i++] = super->path_element->host; - argv[i++] = "echo FISH:; /bin/sh"; + argv[i++] = "echo SHELL:; /bin/sh"; argv[i++] = NULL; - fish_pipeopen (super, xsh, argv); + shell_pipeopen (super, xsh, argv); } /* --------------------------------------------------------------------------------------------- */ static gboolean -fish_open_archive_talk (struct vfs_class *me, struct vfs_s_super *super) +shell_open_archive_talk (struct vfs_class *me, struct vfs_s_super *super) { - fish_super_t *fish_super = FISH_SUPER (super); + shell_super_t *shell_super = SHELL_SUPER (super); char answer[2048]; - printf ("\n%s\n", _("fish: Waiting for initial line...")); + printf ("\n%s\n", _("shell: Waiting for initial line...")); - if (vfs_s_get_line (me, fish_super->sockr, answer, sizeof (answer), ':') == 0) + if (vfs_s_get_line (me, shell_super->sockr, answer, sizeof (answer), ':') == 0) return FALSE; if (strstr (answer, "assword") != NULL) @@ -584,7 +585,8 @@ fish_open_archive_talk (struct vfs_class *me, struct vfs_s_super *super) { char *p, *op; - p = g_strdup_printf (_("fish: Password is required for %s"), super->path_element->user); + p = g_strdup_printf (_("shell: Password is required for %s"), + super->path_element->user); op = vfs_get_password (p); g_free (p); if (op == NULL) @@ -592,14 +594,14 @@ fish_open_archive_talk (struct vfs_class *me, struct vfs_s_super *super) super->path_element->password = op; } - printf ("\n%s\n", _("fish: Sending password...")); + printf ("\n%s\n", _("shell: Sending password...")); { size_t str_len; str_len = strlen (super->path_element->password); - if ((write (fish_super.sockw, super->path_element->password, str_len) != - (ssize_t) str_len) || (write (fish_super->sockw, "\n", 1) != 1)) + if ((write (shell_super.sockw, super->path_element->password, str_len) != + (ssize_t) str_len) || (write (shell_super->sockw, "\n", 1) != 1)) return FALSE; } #endif @@ -610,7 +612,7 @@ fish_open_archive_talk (struct vfs_class *me, struct vfs_s_super *super) /* --------------------------------------------------------------------------------------------- */ static int -fish_open_archive_int (struct vfs_class *me, struct vfs_s_super *super) +shell_open_archive_int (struct vfs_class *me, struct vfs_s_super *super) { gboolean ftalk; @@ -618,10 +620,10 @@ fish_open_archive_int (struct vfs_class *me, struct vfs_s_super *super) pre_exec (); /* open pipe */ - fish_open_archive_pipeopen (super); + shell_open_archive_pipeopen (super); /* Start talk with ssh-server (password prompt, etc ) */ - ftalk = fish_open_archive_talk (me, super); + ftalk = shell_open_archive_talk (me, super); /* show panels */ post_exec (); @@ -629,31 +631,18 @@ fish_open_archive_int (struct vfs_class *me, struct vfs_s_super *super) if (!ftalk) ERRNOR (E_PROTO, -1); - vfs_print_message ("%s", _("fish: Sending initial line...")); - /* - * Run 'start_fish_server'. If it doesn't exist - no problem, - * we'll talk directly to the shell. - */ - - if (fish_command - (me, super, WAIT_REPLY, "#FISH\necho; start_fish_server 2>&1; echo '### 200'\n", - -1) != COMPLETE) - ERRNOR (E_PROTO, -1); - - vfs_print_message ("%s", _("fish: Handshaking version...")); - if (fish_command (me, super, WAIT_REPLY, "#VER 0.0.3\necho '### 000'\n", -1) != COMPLETE) - ERRNOR (E_PROTO, -1); + vfs_print_message ("%s", _("shell: Sending initial line...")); /* Set up remote locale to C, otherwise dates cannot be recognized */ - if (fish_command + if (shell_command (me, super, WAIT_REPLY, "LANG=C LC_ALL=C LC_TIME=C; export LANG LC_ALL LC_TIME;\n" "echo '### 200'\n", -1) != COMPLETE) ERRNOR (E_PROTO, -1); - vfs_print_message ("%s", _("fish: Getting host info...")); - if (fish_info (me, super)) - FISH_SUPER (super)->scr_env = fish_set_env (FISH_SUPER (super)->host_flags); + vfs_print_message ("%s", _("shell: Getting host info...")); + if (shell_info (me, super)) + SHELL_SUPER (super)->scr_env = shell_set_env (SHELL_SUPER (super)->host_flags); #if 0 super->name = @@ -663,7 +652,7 @@ fish_open_archive_int (struct vfs_class *me, struct vfs_s_super *super) super->name = g_strdup (PATH_SEP_STR); #endif - super->root = vfs_s_new_inode (me, super, fish_default_stat (me)); + super->root = vfs_s_new_inode (me, super, shell_default_stat (me)); return 0; } @@ -671,68 +660,72 @@ fish_open_archive_int (struct vfs_class *me, struct vfs_s_super *super) /* --------------------------------------------------------------------------------------------- */ static int -fish_open_archive (struct vfs_s_super *super, - const vfs_path_t * vpath, const vfs_path_element_t * vpath_element) +shell_open_archive (struct vfs_s_super *super, + const vfs_path_t * vpath, const vfs_path_element_t * vpath_element) { - fish_super_t *fish_super = FISH_SUPER (super); + shell_super_t *shell_super = SHELL_SUPER (super); (void) vpath; super->path_element = vfs_path_element_clone (vpath_element); if (strncmp (vpath_element->vfs_prefix, "rsh", 3) == 0) - super->path_element->port = FISH_FLAG_RSH; - - fish_super->scr_ls = - fish_load_script_from_file (super->path_element->host, FISH_LS_FILE, FISH_LS_DEF_CONTENT); - fish_super->scr_exists = - fish_load_script_from_file (super->path_element->host, FISH_EXISTS_FILE, - FISH_EXISTS_DEF_CONTENT); - fish_super->scr_mkdir = - fish_load_script_from_file (super->path_element->host, FISH_MKDIR_FILE, - FISH_MKDIR_DEF_CONTENT); - fish_super->scr_unlink = - fish_load_script_from_file (super->path_element->host, FISH_UNLINK_FILE, - FISH_UNLINK_DEF_CONTENT); - fish_super->scr_chown = - fish_load_script_from_file (super->path_element->host, FISH_CHOWN_FILE, - FISH_CHOWN_DEF_CONTENT); - fish_super->scr_chmod = - fish_load_script_from_file (super->path_element->host, FISH_CHMOD_FILE, - FISH_CHMOD_DEF_CONTENT); - fish_super->scr_utime = - fish_load_script_from_file (super->path_element->host, FISH_UTIME_FILE, - FISH_UTIME_DEF_CONTENT); - fish_super->scr_rmdir = - fish_load_script_from_file (super->path_element->host, FISH_RMDIR_FILE, - FISH_RMDIR_DEF_CONTENT); - fish_super->scr_ln = - fish_load_script_from_file (super->path_element->host, FISH_LN_FILE, FISH_LN_DEF_CONTENT); - fish_super->scr_mv = - fish_load_script_from_file (super->path_element->host, FISH_MV_FILE, FISH_MV_DEF_CONTENT); - fish_super->scr_hardlink = - fish_load_script_from_file (super->path_element->host, FISH_HARDLINK_FILE, - FISH_HARDLINK_DEF_CONTENT); - fish_super->scr_get = - fish_load_script_from_file (super->path_element->host, FISH_GET_FILE, FISH_GET_DEF_CONTENT); - fish_super->scr_send = - fish_load_script_from_file (super->path_element->host, FISH_SEND_FILE, - FISH_SEND_DEF_CONTENT); - fish_super->scr_append = - fish_load_script_from_file (super->path_element->host, FISH_APPEND_FILE, - FISH_APPEND_DEF_CONTENT); - fish_super->scr_info = - fish_load_script_from_file (super->path_element->host, FISH_INFO_FILE, - FISH_INFO_DEF_CONTENT); - - return fish_open_archive_int (vpath_element->class, super); + super->path_element->port = SHELL_FLAG_RSH; + + shell_super->scr_ls = + shell_load_script_from_file (super->path_element->host, VFS_SHELL_LS_FILE, + VFS_SHELL_LS_DEF_CONTENT); + shell_super->scr_exists = + shell_load_script_from_file (super->path_element->host, VFS_SHELL_EXISTS_FILE, + VFS_SHELL_EXISTS_DEF_CONTENT); + shell_super->scr_mkdir = + shell_load_script_from_file (super->path_element->host, VFS_SHELL_MKDIR_FILE, + VFS_SHELL_MKDIR_DEF_CONTENT); + shell_super->scr_unlink = + shell_load_script_from_file (super->path_element->host, VFS_SHELL_UNLINK_FILE, + VFS_SHELL_UNLINK_DEF_CONTENT); + shell_super->scr_chown = + shell_load_script_from_file (super->path_element->host, VFS_SHELL_CHOWN_FILE, + VFS_SHELL_CHOWN_DEF_CONTENT); + shell_super->scr_chmod = + shell_load_script_from_file (super->path_element->host, VFS_SHELL_CHMOD_FILE, + VFS_SHELL_CHMOD_DEF_CONTENT); + shell_super->scr_utime = + shell_load_script_from_file (super->path_element->host, VFS_SHELL_UTIME_FILE, + VFS_SHELL_UTIME_DEF_CONTENT); + shell_super->scr_rmdir = + shell_load_script_from_file (super->path_element->host, VFS_SHELL_RMDIR_FILE, + VFS_SHELL_RMDIR_DEF_CONTENT); + shell_super->scr_ln = + shell_load_script_from_file (super->path_element->host, VFS_SHELL_LN_FILE, + VFS_SHELL_LN_DEF_CONTENT); + shell_super->scr_mv = + shell_load_script_from_file (super->path_element->host, VFS_SHELL_MV_FILE, + VFS_SHELL_MV_DEF_CONTENT); + shell_super->scr_hardlink = + shell_load_script_from_file (super->path_element->host, VFS_SHELL_HARDLINK_FILE, + VFS_SHELL_HARDLINK_DEF_CONTENT); + shell_super->scr_get = + shell_load_script_from_file (super->path_element->host, VFS_SHELL_GET_FILE, + VFS_SHELL_GET_DEF_CONTENT); + shell_super->scr_send = + shell_load_script_from_file (super->path_element->host, VFS_SHELL_SEND_FILE, + VFS_SHELL_SEND_DEF_CONTENT); + shell_super->scr_append = + shell_load_script_from_file (super->path_element->host, VFS_SHELL_APPEND_FILE, + VFS_SHELL_APPEND_DEF_CONTENT); + shell_super->scr_info = + shell_load_script_from_file (super->path_element->host, VFS_SHELL_INFO_FILE, + VFS_SHELL_INFO_DEF_CONTENT); + + return shell_open_archive_int (vpath_element->class, super); } /* --------------------------------------------------------------------------------------------- */ static int -fish_archive_same (const vfs_path_element_t * vpath_element, struct vfs_s_super *super, - const vfs_path_t * vpath, void *cookie) +shell_archive_same (const vfs_path_element_t * vpath_element, struct vfs_s_super *super, + const vfs_path_t * vpath, void *cookie) { vfs_path_element_t *path_element; int result; @@ -757,7 +750,7 @@ fish_archive_same (const vfs_path_element_t * vpath_element, struct vfs_s_super /* --------------------------------------------------------------------------------------------- */ static void -fish_parse_ls (char *buffer, struct vfs_s_entry *ent) +shell_parse_ls (char *buffer, struct vfs_s_entry *ent) { #define ST ent->ino->st @@ -914,7 +907,7 @@ fish_parse_ls (char *buffer, struct vfs_s_entry *ent) /* --------------------------------------------------------------------------------------------- */ static int -fish_dir_load (struct vfs_class *me, struct vfs_s_inode *dir, const char *remote_path) +shell_dir_load (struct vfs_class *me, struct vfs_s_inode *dir, const char *remote_path) { struct vfs_s_super *super = dir->super; char buffer[BUF_8K] = "\0"; @@ -923,20 +916,20 @@ fish_dir_load (struct vfs_class *me, struct vfs_s_inode *dir, const char *remote int reply_code; /* - * Simple FISH debug interface :] + * Simple SHELL debug interface :] */ #if 0 if (me->logfile == NULL) - me->logfile = fopen ("/tmp/mc-FISH.sh", "w"); + me->logfile = fopen ("/tmp/mc-SHELL.sh", "w"); #endif - vfs_print_message (_("fish: Reading directory %s..."), remote_path); + vfs_print_message (_("shell: Reading directory %s..."), remote_path); - dir->timestamp = g_get_monotonic_time () + fish_directory_timeout * G_USEC_PER_SEC; + dir->timestamp = g_get_monotonic_time () + shell_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", - quoted_path); + (void) shell_command_v (me, super, NONE, SHELL_SUPER (super)->scr_ls, "SHELL_FILENAME=%s;\n", + quoted_path); g_free (quoted_path); ent = vfs_s_generate_entry (me, NULL, dir, 0); @@ -945,7 +938,8 @@ fish_dir_load (struct vfs_class *me, struct vfs_s_inode *dir, const char *remote { int res; - res = vfs_s_get_line_interruptible (me, buffer, sizeof (buffer), FISH_SUPER (super)->sockr); + res = + vfs_s_get_line_interruptible (me, buffer, sizeof (buffer), SHELL_SUPER (super)->sockr); if ((res == 0) || (res == EINTR)) { @@ -963,7 +957,7 @@ fish_dir_load (struct vfs_class *me, struct vfs_s_inode *dir, const char *remote break; if (buffer[0] != '\0') - fish_parse_ls (buffer, ent); + shell_parse_ls (buffer, ent); else if (ent->name != NULL) { vfs_s_insert_entry (me, dir, ent); @@ -972,7 +966,7 @@ fish_dir_load (struct vfs_class *me, struct vfs_s_inode *dir, const char *remote } vfs_s_free_entry (me, ent); - reply_code = fish_decode_reply (buffer + 4, 0); + reply_code = shell_decode_reply (buffer + 4, 0); if (reply_code == COMPLETE) { vfs_print_message (_("%s: done."), me->name); @@ -989,11 +983,11 @@ fish_dir_load (struct vfs_class *me, struct vfs_s_inode *dir, const char *remote /* --------------------------------------------------------------------------------------------- */ static int -fish_file_store (struct vfs_class *me, vfs_file_handler_t * fh, char *name, char *localname) +shell_file_store (struct vfs_class *me, vfs_file_handler_t * fh, char *name, char *localname) { - fish_file_handler_t *fish = FISH_FILE_HANDLER (fh); + shell_file_handler_t *shell = SHELL_FILE_HANDLER (fh); struct vfs_s_super *super = VFS_FILE_HANDLER_SUPER (fh); - fish_super_t *fish_super = FISH_SUPER (super); + shell_super_t *shell_super = SHELL_SUPER (super); int code; off_t total = 0; char buffer[BUF_8K]; @@ -1040,14 +1034,14 @@ fish_file_store (struct vfs_class *me, vfs_file_handler_t * fh, char *name, char */ quoted_name = strutils_shell_escape (name); - vfs_print_message (_("fish: store %s: sending command..."), quoted_name); + vfs_print_message (_("shell: store %s: sending command..."), quoted_name); /* FIXME: File size is limited to ULONG_MAX */ code = - fish_command_v (me, super, WAIT_REPLY, - fish->append ? fish_super->scr_append : fish_super->scr_send, - "FISH_FILENAME=%s FISH_FILESIZE=%" PRIuMAX ";\n", quoted_name, - (uintmax_t) s.st_size); + shell_command_v (me, super, WAIT_REPLY, + shell->append ? shell_super->scr_append : shell_super->scr_send, + "SHELL_FILENAME=%s SHELL_FILESIZE=%" PRIuMAX ";\n", quoted_name, + (uintmax_t) s.st_size); g_free (quoted_name); if (code != PRELIM) @@ -1064,7 +1058,7 @@ fish_file_store (struct vfs_class *me, vfs_file_handler_t * fh, char *name, char { if ((errno == EINTR) && tty_got_interrupt ()) continue; - vfs_print_message ("%s", _("fish: Local read failed, sending zeros")); + vfs_print_message ("%s", _("shell: Local read failed, sending zeros")); close (h); h = open ("/dev/zero", O_RDONLY); } @@ -1072,7 +1066,7 @@ fish_file_store (struct vfs_class *me, vfs_file_handler_t * fh, char *name, char if (n == 0) break; - t = write (fish_super->sockw, buffer, n); + t = write (shell_super->sockw, buffer, n); if (t != n) { if (t == -1) @@ -1083,27 +1077,27 @@ fish_file_store (struct vfs_class *me, vfs_file_handler_t * fh, char *name, char } tty_disable_interrupt_key (); total += n; - vfs_print_message ("%s: %" PRIuMAX "/%" PRIuMAX, _("fish: storing file"), + vfs_print_message ("%s: %" PRIuMAX "/%" PRIuMAX, _("shell: storing file"), (uintmax_t) total, (uintmax_t) s.st_size); } close (h); - if (fish_get_reply (me, fish_super->sockr, NULL, 0) != COMPLETE) + if (shell_get_reply (me, shell_super->sockr, NULL, 0) != COMPLETE) ERRNOR (E_REMOTE, -1); return 0; error_return: close (h); - fish_get_reply (me, fish_super->sockr, NULL, 0); + shell_get_reply (me, shell_super->sockr, NULL, 0); return -1; } /* --------------------------------------------------------------------------------------------- */ static int -fish_linear_start (struct vfs_class *me, vfs_file_handler_t * fh, off_t offset) +shell_linear_start (struct vfs_class *me, vfs_file_handler_t * fh, off_t offset) { - fish_file_handler_t *fish = FISH_FILE_HANDLER (fh); + shell_file_handler_t *shell = SHELL_FILE_HANDLER (fh); struct vfs_s_super *super = VFS_FILE_HANDLER_SUPER (fh); char *name; char *quoted_name; @@ -1113,7 +1107,7 @@ fish_linear_start (struct vfs_class *me, vfs_file_handler_t * fh, off_t offset) return 0; quoted_name = strutils_shell_escape (name); g_free (name); - fish->append = FALSE; + shell->append = FALSE; /* * Check whether the remote file is readable by using 'dd' to copy @@ -1123,20 +1117,20 @@ fish_linear_start (struct vfs_class *me, vfs_file_handler_t * fh, off_t offset) */ offset = - fish_command_v (me, super, WANT_STRING, FISH_SUPER (super)->scr_get, - "FISH_FILENAME=%s FISH_START_OFFSET=%" PRIuMAX ";\n", quoted_name, - (uintmax_t) offset); + shell_command_v (me, super, WANT_STRING, SHELL_SUPER (super)->scr_get, + "SHELL_FILENAME=%s SHELL_START_OFFSET=%" PRIuMAX ";\n", quoted_name, + (uintmax_t) offset); g_free (quoted_name); if (offset != PRELIM) ERRNOR (E_REMOTE, 0); fh->linear = LS_LINEAR_OPEN; - fish->got = 0; + shell->got = 0; errno = 0; #if SIZEOF_OFF_T == SIZEOF_LONG - fish->total = (off_t) strtol (reply_str, NULL, 10); + shell->total = (off_t) strtol (reply_str, NULL, 10); #else - fish->total = (off_t) g_ascii_strtoll (reply_str, NULL, 10); + shell->total = (off_t) g_ascii_strtoll (reply_str, NULL, 10); #endif if (errno != 0) ERRNOR (E_REMOTE, 0); @@ -1146,9 +1140,9 @@ fish_linear_start (struct vfs_class *me, vfs_file_handler_t * fh, off_t offset) /* --------------------------------------------------------------------------------------------- */ static void -fish_linear_abort (struct vfs_class *me, vfs_file_handler_t * fh) +shell_linear_abort (struct vfs_class *me, vfs_file_handler_t * fh) { - fish_file_handler_t *fish = FISH_FILE_HANDLER (fh); + shell_file_handler_t *shell = SHELL_FILE_HANDLER (fh); struct vfs_s_super *super = VFS_FILE_HANDLER_SUPER (fh); char buffer[BUF_8K]; ssize_t n; @@ -1157,18 +1151,18 @@ fish_linear_abort (struct vfs_class *me, vfs_file_handler_t * fh) do { - n = MIN ((off_t) sizeof (buffer), (fish->total - fish->got)); + n = MIN ((off_t) sizeof (buffer), (shell->total - shell->got)); if (n != 0) { - n = read (FISH_SUPER (super)->sockr, buffer, n); + n = read (SHELL_SUPER (super)->sockr, buffer, n); if (n < 0) return; - fish->got += n; + shell->got += n; } } while (n != 0); - if (fish_get_reply (me, FISH_SUPER (super)->sockr, NULL, 0) != COMPLETE) + if (shell_get_reply (me, SHELL_SUPER (super)->sockr, NULL, 0) != COMPLETE) vfs_print_message ("%s", _("Error reported after abort.")); else vfs_print_message ("%s", _("Aborted transfer would be successful.")); @@ -1177,15 +1171,15 @@ fish_linear_abort (struct vfs_class *me, vfs_file_handler_t * fh) /* --------------------------------------------------------------------------------------------- */ static ssize_t -fish_linear_read (struct vfs_class *me, vfs_file_handler_t * fh, void *buf, size_t len) +shell_linear_read (struct vfs_class *me, vfs_file_handler_t * fh, void *buf, size_t len) { - fish_file_handler_t *fish = FISH_FILE_HANDLER (fh); + shell_file_handler_t *shell = SHELL_FILE_HANDLER (fh); struct vfs_s_super *super = VFS_FILE_HANDLER_SUPER (fh); ssize_t n = 0; - len = MIN ((size_t) (fish->total - fish->got), len); + len = MIN ((size_t) (shell->total - shell->got), len); tty_disable_interrupt_key (); - while (len != 0 && ((n = read (FISH_SUPER (super)->sockr, buf, len)) < 0)) + while (len != 0 && ((n = read (SHELL_SUPER (super)->sockr, buf, len)) < 0)) { if ((errno == EINTR) && !tty_got_interrupt ()) continue; @@ -1194,10 +1188,10 @@ fish_linear_read (struct vfs_class *me, vfs_file_handler_t * fh, void *buf, size tty_enable_interrupt_key (); if (n > 0) - fish->got += n; + shell->got += n; else if (n < 0) - fish_linear_abort (me, fh); - else if (fish_get_reply (me, FISH_SUPER (super)->sockr, NULL, 0) != COMPLETE) + shell_linear_abort (me, fh); + else if (shell_get_reply (me, SHELL_SUPER (super)->sockr, NULL, 0) != COMPLETE) ERRNOR (E_REMOTE, -1); ERRNOR (errno, n); } @@ -1205,18 +1199,18 @@ fish_linear_read (struct vfs_class *me, vfs_file_handler_t * fh, void *buf, size /* --------------------------------------------------------------------------------------------- */ static void -fish_linear_close (struct vfs_class *me, vfs_file_handler_t * fh) +shell_linear_close (struct vfs_class *me, vfs_file_handler_t * fh) { - fish_file_handler_t *fish = FISH_FILE_HANDLER (fh); + shell_file_handler_t *shell = SHELL_FILE_HANDLER (fh); - if (fish->total != fish->got) - fish_linear_abort (me, fh); + if (shell->total != shell->got) + shell_linear_abort (me, fh); } /* --------------------------------------------------------------------------------------------- */ static int -fish_ctl (void *fh, int ctlop, void *arg) +shell_ctl (void *fh, int ctlop, void *arg) { (void) arg; (void) fh; @@ -1237,7 +1231,7 @@ fish_ctl (void *fh, int ctlop, void *arg) if (file->linear == LS_LINEAR_CLOSED || file->linear == LS_LINEAR_PREOPEN) return 0; - v = vfs_s_select_on_two (VFS_FILE_HANDLER_SUPER (fh)->u.fish.sockr, 0); + v = vfs_s_select_on_two (VFS_FILE_HANDLER_SUPER (fh)->u.shell.sockr, 0); return (((v < 0) && (errno == EINTR)) || v == 0) ? 1 : 0; } @@ -1250,7 +1244,7 @@ fish_ctl (void *fh, int ctlop, void *arg) /* --------------------------------------------------------------------------------------------- */ static int -fish_rename (const vfs_path_t * vpath1, const vfs_path_t * vpath2) +shell_rename (const vfs_path_t * vpath1, const vfs_path_t * vpath2) { const char *crpath1, *crpath2; char *rpath1, *rpath2; @@ -1272,8 +1266,8 @@ fish_rename (const vfs_path_t * vpath1, const vfs_path_t * vpath2) me = VFS_CLASS (vfs_path_get_last_path_vfs (vpath1)); ret = - fish_send_command (me, super2, OPT_FLUSH, FISH_SUPER (super)->scr_mv, - "FISH_FILEFROM=%s FISH_FILETO=%s;\n", rpath1, rpath2); + shell_send_command (me, super2, OPT_FLUSH, SHELL_SUPER (super)->scr_mv, + "SHELL_FILEFROM=%s SHELL_FILETO=%s;\n", rpath1, rpath2); g_free (rpath1); g_free (rpath2); @@ -1284,7 +1278,7 @@ fish_rename (const vfs_path_t * vpath1, const vfs_path_t * vpath2) /* --------------------------------------------------------------------------------------------- */ static int -fish_link (const vfs_path_t * vpath1, const vfs_path_t * vpath2) +shell_link (const vfs_path_t * vpath1, const vfs_path_t * vpath2) { const char *crpath1, *crpath2; char *rpath1, *rpath2; @@ -1306,8 +1300,8 @@ fish_link (const vfs_path_t * vpath1, const vfs_path_t * vpath2) me = VFS_CLASS (vfs_path_get_last_path_vfs (vpath1)); ret = - fish_send_command (me, super2, OPT_FLUSH, FISH_SUPER (super)->scr_hardlink, - "FISH_FILEFROM=%s FISH_FILETO=%s;\n", rpath1, rpath2); + shell_send_command (me, super2, OPT_FLUSH, SHELL_SUPER (super)->scr_hardlink, + "SHELL_FILEFROM=%s SHELL_FILETO=%s;\n", rpath1, rpath2); g_free (rpath1); g_free (rpath2); @@ -1318,7 +1312,7 @@ fish_link (const vfs_path_t * vpath1, const vfs_path_t * vpath2) /* --------------------------------------------------------------------------------------------- */ static int -fish_symlink (const vfs_path_t * vpath1, const vfs_path_t * vpath2) +shell_symlink (const vfs_path_t * vpath1, const vfs_path_t * vpath2) { char *qsetto; const char *crpath; @@ -1337,8 +1331,8 @@ fish_symlink (const vfs_path_t * vpath1, const vfs_path_t * vpath2) me = VFS_CLASS (vfs_path_get_last_path_vfs (vpath2)); ret = - fish_send_command (me, super, OPT_FLUSH, FISH_SUPER (super)->scr_ln, - "FISH_FILEFROM=%s FISH_FILETO=%s;\n", qsetto, rpath); + shell_send_command (me, super, OPT_FLUSH, SHELL_SUPER (super)->scr_ln, + "SHELL_FILEFROM=%s SHELL_FILETO=%s;\n", qsetto, rpath); g_free (qsetto); g_free (rpath); @@ -1349,43 +1343,43 @@ fish_symlink (const vfs_path_t * vpath1, const vfs_path_t * vpath2) /* --------------------------------------------------------------------------------------------- */ static int -fish_stat (const vfs_path_t * vpath, struct stat *buf) +shell_stat (const vfs_path_t * vpath, struct stat *buf) { int ret; ret = vfs_s_stat (vpath, buf); - fish_set_blksize (buf); + shell_set_blksize (buf); return ret; } /* --------------------------------------------------------------------------------------------- */ static int -fish_lstat (const vfs_path_t * vpath, struct stat *buf) +shell_lstat (const vfs_path_t * vpath, struct stat *buf) { int ret; ret = vfs_s_lstat (vpath, buf); - fish_set_blksize (buf); + shell_set_blksize (buf); return ret; } /* --------------------------------------------------------------------------------------------- */ static int -fish_fstat (void *vfs_info, struct stat *buf) +shell_fstat (void *vfs_info, struct stat *buf) { int ret; ret = vfs_s_fstat (vfs_info, buf); - fish_set_blksize (buf); + shell_set_blksize (buf); return ret; } /* --------------------------------------------------------------------------------------------- */ static int -fish_chmod (const vfs_path_t * vpath, mode_t mode) +shell_chmod (const vfs_path_t * vpath, mode_t mode) { const char *crpath; char *rpath; @@ -1402,9 +1396,9 @@ fish_chmod (const vfs_path_t * vpath, mode_t mode) me = VFS_CLASS (vfs_path_get_last_path_vfs (vpath)); ret = - fish_send_command (me, super, OPT_FLUSH, FISH_SUPER (super)->scr_chmod, - "FISH_FILENAME=%s FISH_FILEMODE=%4.4o;\n", rpath, - (unsigned int) (mode & 07777)); + shell_send_command (me, super, OPT_FLUSH, SHELL_SUPER (super)->scr_chmod, + "SHELL_FILENAME=%s SHELL_FILEMODE=%4.4o;\n", rpath, + (unsigned int) (mode & 07777)); g_free (rpath); @@ -1414,7 +1408,7 @@ fish_chmod (const vfs_path_t * vpath, mode_t mode) /* --------------------------------------------------------------------------------------------- */ static int -fish_chown (const vfs_path_t * vpath, uid_t owner, gid_t group) +shell_chown (const vfs_path_t * vpath, uid_t owner, gid_t group) { char *sowner, *sgroup; struct passwd *pw; @@ -1446,9 +1440,9 @@ fish_chown (const vfs_path_t * vpath, uid_t owner, gid_t group) /* FIXME: what should we report if chgrp succeeds but chown fails? */ ret = - fish_send_command (me, super, OPT_FLUSH, FISH_SUPER (super)->scr_chown, - "FISH_FILENAME=%s FISH_FILEOWNER=%s FISH_FILEGROUP=%s;\n", rpath, sowner, - sgroup); + shell_send_command (me, super, OPT_FLUSH, SHELL_SUPER (super)->scr_chown, + "SHELL_FILENAME=%s SHELL_FILEOWNER=%s SHELL_FILEGROUP=%s;\n", rpath, + sowner, sgroup); g_free (rpath); @@ -1458,7 +1452,7 @@ fish_chown (const vfs_path_t * vpath, uid_t owner, gid_t group) /* --------------------------------------------------------------------------------------------- */ static void -fish_get_atime (mc_timesbuf_t * times, time_t * sec, long *nsec) +shell_get_atime (mc_timesbuf_t * times, time_t * sec, long *nsec) { #ifdef HAVE_UTIMENSAT *sec = (*times)[0].tv_sec; @@ -1472,7 +1466,7 @@ fish_get_atime (mc_timesbuf_t * times, time_t * sec, long *nsec) /* --------------------------------------------------------------------------------------------- */ static void -fish_get_mtime (mc_timesbuf_t * times, time_t * sec, long *nsec) +shell_get_mtime (mc_timesbuf_t * times, time_t * sec, long *nsec) { #ifdef HAVE_UTIMENSAT *sec = (*times)[1].tv_sec; @@ -1486,7 +1480,7 @@ fish_get_mtime (mc_timesbuf_t * times, time_t * sec, long *nsec) /* --------------------------------------------------------------------------------------------- */ static int -fish_utime (const vfs_path_t * vpath, mc_timesbuf_t * times) +shell_utime (const vfs_path_t * vpath, mc_timesbuf_t * times) { char utcatime[16], utcmtime[16]; char utcatime_w_nsec[30], utcmtime_w_nsec[30]; @@ -1505,7 +1499,7 @@ fish_utime (const vfs_path_t * vpath, mc_timesbuf_t * times) rpath = strutils_shell_escape (crpath); - fish_get_atime (times, &atime, &atime_nsec); + shell_get_atime (times, &atime, &atime_nsec); gmt = gmtime (&atime); g_snprintf (utcatime, sizeof (utcatime), "%04d%02d%02d%02d%02d.%02d", gmt->tm_year + 1900, gmt->tm_mon + 1, gmt->tm_mday, @@ -1514,7 +1508,7 @@ fish_utime (const vfs_path_t * vpath, mc_timesbuf_t * times) gmt->tm_year + 1900, gmt->tm_mon + 1, gmt->tm_mday, gmt->tm_hour, gmt->tm_min, gmt->tm_sec, atime_nsec); - fish_get_mtime (times, &mtime, &mtime_nsec); + shell_get_mtime (times, &mtime, &mtime_nsec); gmt = gmtime (&mtime); g_snprintf (utcmtime, sizeof (utcmtime), "%04d%02d%02d%02d%02d.%02d", gmt->tm_year + 1900, gmt->tm_mon + 1, gmt->tm_mday, @@ -1525,11 +1519,11 @@ fish_utime (const vfs_path_t * vpath, mc_timesbuf_t * times) me = VFS_CLASS (vfs_path_get_last_path_vfs (vpath)); - ret = fish_send_command (me, super, OPT_FLUSH, FISH_SUPER (super)->scr_utime, - "FISH_FILENAME=%s FISH_FILEATIME=%ld FISH_FILEMTIME=%ld " - "FISH_TOUCHATIME=%s FISH_TOUCHMTIME=%s FISH_TOUCHATIME_W_NSEC=\"%s\" " - "FISH_TOUCHMTIME_W_NSEC=\"%s\";\n", rpath, (long) atime, (long) mtime, - utcatime, utcmtime, utcatime_w_nsec, utcmtime_w_nsec); + ret = shell_send_command (me, super, OPT_FLUSH, SHELL_SUPER (super)->scr_utime, + "SHELL_FILENAME=%s SHELL_FILEATIME=%ld SHELL_FILEMTIME=%ld " + "SHELL_TOUCHATIME=%s SHELL_TOUCHMTIME=%s SHELL_TOUCHATIME_W_NSEC=\"%s\" " + "SHELL_TOUCHMTIME_W_NSEC=\"%s\";\n", rpath, (long) atime, + (long) mtime, utcatime, utcmtime, utcatime_w_nsec, utcmtime_w_nsec); g_free (rpath); @@ -1539,7 +1533,7 @@ fish_utime (const vfs_path_t * vpath, mc_timesbuf_t * times) /* --------------------------------------------------------------------------------------------- */ static int -fish_unlink (const vfs_path_t * vpath) +shell_unlink (const vfs_path_t * vpath) { const char *crpath; char *rpath; @@ -1556,8 +1550,8 @@ fish_unlink (const vfs_path_t * vpath) me = VFS_CLASS (vfs_path_get_last_path_vfs (vpath)); ret = - fish_send_command (me, super, OPT_FLUSH, FISH_SUPER (super)->scr_unlink, - "FISH_FILENAME=%s;\n", rpath); + shell_send_command (me, super, OPT_FLUSH, SHELL_SUPER (super)->scr_unlink, + "SHELL_FILENAME=%s;\n", rpath); g_free (rpath); @@ -1567,7 +1561,7 @@ fish_unlink (const vfs_path_t * vpath) /* --------------------------------------------------------------------------------------------- */ static int -fish_exists (const vfs_path_t * vpath) +shell_exists (const vfs_path_t * vpath) { const char *crpath; char *rpath; @@ -1584,8 +1578,8 @@ fish_exists (const vfs_path_t * vpath) me = VFS_CLASS (vfs_path_get_last_path_vfs (vpath)); ret = - fish_send_command (me, super, OPT_FLUSH, FISH_SUPER (super)->scr_exists, - "FISH_FILENAME=%s;\n", rpath); + shell_send_command (me, super, OPT_FLUSH, SHELL_SUPER (super)->scr_exists, + "SHELL_FILENAME=%s;\n", rpath); g_free (rpath); @@ -1595,7 +1589,7 @@ fish_exists (const vfs_path_t * vpath) /* --------------------------------------------------------------------------------------------- */ static int -fish_mkdir (const vfs_path_t * vpath, mode_t mode) +shell_mkdir (const vfs_path_t * vpath, mode_t mode) { const char *crpath; char *rpath; @@ -1614,14 +1608,14 @@ fish_mkdir (const vfs_path_t * vpath, mode_t mode) me = VFS_CLASS (vfs_path_get_last_path_vfs (vpath)); ret = - fish_send_command (me, super, OPT_FLUSH, FISH_SUPER (super)->scr_mkdir, - "FISH_FILENAME=%s;\n", rpath); + shell_send_command (me, super, OPT_FLUSH, SHELL_SUPER (super)->scr_mkdir, + "SHELL_FILENAME=%s;\n", rpath); g_free (rpath); if (ret != 0) return ret; - if (fish_exists (vpath) == 0) + if (shell_exists (vpath) == 0) { me->verrno = EACCES; return -1; @@ -1632,7 +1626,7 @@ fish_mkdir (const vfs_path_t * vpath, mode_t mode) /* --------------------------------------------------------------------------------------------- */ static int -fish_rmdir (const vfs_path_t * vpath) +shell_rmdir (const vfs_path_t * vpath) { const char *crpath; char *rpath; @@ -1649,8 +1643,8 @@ fish_rmdir (const vfs_path_t * vpath) me = VFS_CLASS (vfs_path_get_last_path_vfs (vpath)); ret = - fish_send_command (me, super, OPT_FLUSH, FISH_SUPER (super)->scr_rmdir, - "FISH_FILENAME=%s;\n", rpath); + shell_send_command (me, super, OPT_FLUSH, SHELL_SUPER (super)->scr_rmdir, + "SHELL_FILENAME=%s;\n", rpath); g_free (rpath); @@ -1660,11 +1654,11 @@ fish_rmdir (const vfs_path_t * vpath) /* --------------------------------------------------------------------------------------------- */ static vfs_file_handler_t * -fish_fh_new (struct vfs_s_inode *ino, gboolean changed) +shell_fh_new (struct vfs_s_inode *ino, gboolean changed) { - fish_file_handler_t *fh; + shell_file_handler_t *fh; - fh = g_new0 (fish_file_handler_t, 1); + fh = g_new0 (shell_file_handler_t, 1); vfs_s_init_fh (VFS_FILE_HANDLER (fh), ino, changed); return VFS_FILE_HANDLER (fh); @@ -1673,9 +1667,9 @@ fish_fh_new (struct vfs_s_inode *ino, gboolean changed) /* --------------------------------------------------------------------------------------------- */ static int -fish_fh_open (struct vfs_class *me, vfs_file_handler_t * fh, int flags, mode_t mode) +shell_fh_open (struct vfs_class *me, vfs_file_handler_t * fh, int flags, mode_t mode) { - fish_file_handler_t *fish = FISH_FILE_HANDLER (fh); + shell_file_handler_t *shell = SHELL_FILE_HANDLER (fh); (void) mode; @@ -1684,7 +1678,7 @@ fish_fh_open (struct vfs_class *me, vfs_file_handler_t * fh, int flags, mode_t m { /* user pressed the button [ Append ] in the "Copy" dialog */ if ((flags & O_APPEND) != 0) - fish->append = TRUE; + shell->append = TRUE; if (fh->ino->localname == NULL) { @@ -1712,7 +1706,7 @@ fish_fh_open (struct vfs_class *me, vfs_file_handler_t * fh, int flags, mode_t m /* --------------------------------------------------------------------------------------------- */ static void -fish_fill_names (struct vfs_class *me, fill_names_f func) +shell_fill_names (struct vfs_class *me, fill_names_f func) { GList *iter; @@ -1726,14 +1720,14 @@ fish_fill_names (struct vfs_class *me, fill_names_f func) switch (super->path_element->port) { - case FISH_FLAG_RSH: + case SHELL_FLAG_RSH: flags = ":r"; break; - case FISH_FLAG_COMPRESSED: + case SHELL_FLAG_COMPRESSED: flags = ":C"; break; default: - if (super->path_element->port > FISH_FLAG_RSH) + if (super->path_element->port > SHELL_FLAG_RSH) { g_snprintf (gbuf, sizeof (gbuf), ":%d", super->path_element->port); flags = gbuf; @@ -1742,7 +1736,7 @@ fish_fill_names (struct vfs_class *me, fill_names_f func) } name = - g_strconcat (vfs_fish_ops->prefix, VFS_PATH_URL_DELIMITER, + g_strconcat (vfs_shell_ops->prefix, VFS_PATH_URL_DELIMITER, super->path_element->user, "@", super->path_element->host, flags, PATH_SEP_STR, super->path_element->path, (char *) NULL); func (name); @@ -1753,11 +1747,11 @@ fish_fill_names (struct vfs_class *me, fill_names_f func) /* --------------------------------------------------------------------------------------------- */ static void * -fish_open (const vfs_path_t * vpath, int flags, mode_t mode) +shell_open (const vfs_path_t * vpath, int flags, mode_t mode) { /* sorry, i've places hack here - cause fish don't able to open files with O_EXCL flag + cause shell don't able to open files with O_EXCL flag */ flags &= ~O_EXCL; return vfs_s_open (vpath, flags, mode); @@ -1768,38 +1762,38 @@ fish_open (const vfs_path_t * vpath, int flags, mode_t mode) /* --------------------------------------------------------------------------------------------- */ void -vfs_init_fish (void) +vfs_init_shell (void) { tcp_init (); - vfs_init_subclass (&fish_subclass, "fish", VFSF_REMOTE | VFSF_USETMP, "sh"); - vfs_fish_ops->fill_names = fish_fill_names; - vfs_fish_ops->stat = fish_stat; - vfs_fish_ops->lstat = fish_lstat; - vfs_fish_ops->fstat = fish_fstat; - vfs_fish_ops->chmod = fish_chmod; - vfs_fish_ops->chown = fish_chown; - vfs_fish_ops->utime = fish_utime; - vfs_fish_ops->open = fish_open; - vfs_fish_ops->symlink = fish_symlink; - vfs_fish_ops->link = fish_link; - vfs_fish_ops->unlink = fish_unlink; - vfs_fish_ops->rename = fish_rename; - vfs_fish_ops->mkdir = fish_mkdir; - vfs_fish_ops->rmdir = fish_rmdir; - vfs_fish_ops->ctl = fish_ctl; - fish_subclass.archive_same = fish_archive_same; - fish_subclass.new_archive = fish_new_archive; - fish_subclass.open_archive = fish_open_archive; - fish_subclass.free_archive = fish_free_archive; - fish_subclass.fh_new = fish_fh_new; - fish_subclass.fh_open = fish_fh_open; - fish_subclass.dir_load = fish_dir_load; - fish_subclass.file_store = fish_file_store; - fish_subclass.linear_start = fish_linear_start; - fish_subclass.linear_read = fish_linear_read; - fish_subclass.linear_close = fish_linear_close; - vfs_register_class (vfs_fish_ops); + vfs_init_subclass (&shell_subclass, "shell", VFSF_REMOTE | VFSF_USETMP, "sh"); + vfs_shell_ops->fill_names = shell_fill_names; + vfs_shell_ops->stat = shell_stat; + vfs_shell_ops->lstat = shell_lstat; + vfs_shell_ops->fstat = shell_fstat; + vfs_shell_ops->chmod = shell_chmod; + vfs_shell_ops->chown = shell_chown; + vfs_shell_ops->utime = shell_utime; + vfs_shell_ops->open = shell_open; + vfs_shell_ops->symlink = shell_symlink; + vfs_shell_ops->link = shell_link; + vfs_shell_ops->unlink = shell_unlink; + vfs_shell_ops->rename = shell_rename; + vfs_shell_ops->mkdir = shell_mkdir; + vfs_shell_ops->rmdir = shell_rmdir; + vfs_shell_ops->ctl = shell_ctl; + shell_subclass.archive_same = shell_archive_same; + shell_subclass.new_archive = shell_new_archive; + shell_subclass.open_archive = shell_open_archive; + shell_subclass.free_archive = shell_free_archive; + shell_subclass.fh_new = shell_fh_new; + shell_subclass.fh_open = shell_fh_open; + shell_subclass.dir_load = shell_dir_load; + shell_subclass.file_store = shell_file_store; + shell_subclass.linear_start = shell_linear_start; + shell_subclass.linear_read = shell_linear_read; + shell_subclass.linear_close = shell_linear_close; + vfs_register_class (vfs_shell_ops); } /* --------------------------------------------------------------------------------------------- */ diff --git a/src/vfs/fish/fish.h b/src/vfs/shell/shell.h index 3c1fa06..e485d69 100644 --- a/src/vfs/fish/fish.h +++ b/src/vfs/shell/shell.h @@ -1,13 +1,13 @@ /** * \file - * \brief Header: Virtual File System: FISH implementation for transferring files over + * \brief Header: Virtual File System: SHELL implementation for transferring files over * shell connections */ -#ifndef MC__VFS_FISH_H -#define MC__VFS_FISH_H +#ifndef MC__VFS_SHELL_H +#define MC__VFS_SHELL_H /*** typedefs(not structures) and defined constants **********************************************/ @@ -17,12 +17,12 @@ /*** global variables defined in .c file *********************************************************/ -extern int fish_directory_timeout; +extern int shell_directory_timeout; /*** declarations of public functions ************************************************************/ -void vfs_init_fish (void); +void vfs_init_shell (void); /*** inline functions ****************************************************************************/ -#endif +#endif /* MC__VFS_SHELL_H */ diff --git a/src/vfs/fish/fishdef.h b/src/vfs/shell/shelldef.h index 129d2b9..37244d9 100644 --- a/src/vfs/fish/fishdef.h +++ b/src/vfs/shell/shelldef.h @@ -1,19 +1,18 @@ /** * \file - * \brief Header: FISH script defaults + * \brief Header: SHELL script defaults */ -#ifndef MC__FISH_DEF_H -#define MC__FISH_DEF_H +#ifndef MC__VFS_SHELL_DEF_H +#define MC__VFS_SHELL_DEF_H /*** typedefs(not structures) and defined constants **********************************************/ /* default 'ls' script */ -#define FISH_LS_DEF_CONTENT "" \ -"#LIST /${FISH_FILENAME}\n" \ +#define VFS_SHELL_LS_DEF_CONTENT "" \ "export LC_TIME=C\n" \ -"ls -Qlan \"/${FISH_FILENAME}\" 2>/dev/null | grep '^[^cbt]' | (\n" \ +"ls -Qlan \"/${SHELL_FILENAME}\" 2>/dev/null | grep '^[^cbt]' | (\n" \ "while read p l u g s m d y n; do\n" \ " echo \"P$p $u.$g\"\n" \ " echo \"S$s\"\n" \ @@ -22,7 +21,7 @@ " echo\n" \ "done\n" \ ")\n" \ -"ls -Qlan \"/${FISH_FILENAME}\" 2>/dev/null | grep '^[cb]' | (\n" \ +"ls -Qlan \"/${SHELL_FILENAME}\" 2>/dev/null | grep '^[cb]' | (\n" \ "while read p l u g a i m d y n; do\n" \ " echo \"P$p $u.$g\"\n" \ " echo \"E$a$i\"\n" \ @@ -34,120 +33,109 @@ "echo \"### 200\"\n" /* default file exists script */ -#define FISH_EXISTS_DEF_CONTENT "" \ -"#ISEXISTS $FISH_FILENAME\n" \ -"ls -l \"/${FISH_FILENAME}\" >/dev/null 2>/dev/null\n" \ +#define VFS_SHELL_EXISTS_DEF_CONTENT "" \ +"ls -l \"/${SHELL_FILENAME}\" >/dev/null 2>/dev/null\n" \ "echo '### '$?\n" /* default 'mkdir' script */ -#define FISH_MKDIR_DEF_CONTENT "" \ -"#MKD $FISH_FILENAME\n" \ -"if mkdir \"/${FISH_FILENAME}\" 2>/dev/null; then\n" \ +#define VFS_SHELL_MKDIR_DEF_CONTENT "" \ +"if mkdir \"/${SHELL_FILENAME}\" 2>/dev/null; then\n" \ " echo \"### 000\"\n" \ "else\n" \ " echo \"### 500\"\n" \ "fi\n" /* default 'unlink' script */ -#define FISH_UNLINK_DEF_CONTENT "" \ -"#DELE $FISH_FILENAME\n" \ -"if rm -f \"/${FISH_FILENAME}\" 2>/dev/null; then\n" \ +#define VFS_SHELL_UNLINK_DEF_CONTENT "" \ +"if rm -f \"/${SHELL_FILENAME}\" 2>/dev/null; then\n" \ " echo \"### 000\"\n" \ "else\n" \ " echo \"### 500\"\n" \ "fi\n" + /* default 'chown' script */ -#define FISH_CHOWN_DEF_CONTENT "" \ -"#CHOWN $FISH_FILEOWNER:$FISH_FILEGROUP $FISH_FILENAME\n" \ -"if chown ${FISH_FILEOWNER}:${FISH_FILEGROUP} \"/${FISH_FILENAME}\"; then\n"\ -" echo \"### 000\"\n" \ -"else\n" \ -" echo \"### 500\"\n" \ +#define VFS_SHELL_CHOWN_DEF_CONTENT "" \ +"if chown ${SHELL_FILEOWNER}:${SHELL_FILEGROUP} \"/${SHELL_FILENAME}\"; then\n" \ +" echo \"### 000\"\n" \ +"else\n" \ +" echo \"### 500\"\n" \ "fi\n" /* default 'chmod' script */ -#define FISH_CHMOD_DEF_CONTENT "" \ -"#CHMOD $FISH_FILEMODE $FISH_FILENAME\n" \ -"if chmod ${FISH_FILEMODE} \"/${FISH_FILENAME}\" 2>/dev/null; then\n" \ +#define VFS_SHELL_CHMOD_DEF_CONTENT "" \ +"if chmod ${SHELL_FILEMODE} \"/${SHELL_FILENAME}\" 2>/dev/null; then\n" \ " echo \"### 000\"\n" \ "else\n" \ " echo \"### 500\"\n" \ "fi\n" /* default 'utime' script */ -#define FISH_UTIME_DEF_CONTENT "" \ -"#UTIME \"$FISH_TOUCHATIME_W_NSEC\" \"$FISH_TOUCHMTIME_W_NSEC\" $FISH_FILENAME\n" \ -"if TZ=UTC touch -h -m -d \"$FISH_TOUCHMTIME_W_NSEC\" \"/${FISH_FILENAME}\" 2>/dev/null && \\\n" \ -" TZ=UTC touch -h -a -d \"$FISH_TOUCHATIME_W_NSEC\" \"/${FISH_FILENAME}\" 2>/dev/null; then\n" \ -" echo \"### 000\"\n" \ -"elif TZ=UTC touch -h -m -t $FISH_TOUCHMTIME \"/${FISH_FILENAME}\" 2>/dev/null && \\\n" \ -" TZ=UTC touch -h -a -t $FISH_TOUCHATIME \"/${FISH_FILENAME}\" 2>/dev/null; then\n" \ -" echo \"### 000\"\n" \ -"elif [ -n \"$FISH_HAVE_PERL\" ] && \\\n" \ -" perl -e 'utime '$FISH_FILEATIME','$FISH_FILEMTIME',@ARGV;' \"/${FISH_FILENAME}\" 2>/dev/null; then\n" \ -" echo \"### 000\"\n" \ -"else\n" \ -" echo \"### 500\"\n" \ +#define VFS_SHELL_UTIME_DEF_CONTENT "" \ +"#UTIME \"$SHELL_TOUCHATIME_W_NSEC\" \"$SHELL_TOUCHMTIME_W_NSEC\" $SHELL_FILENAME\n" \ +"if TZ=UTC touch -h -m -d \"$SHELL_TOUCHMTIME_W_NSEC\" \"/${SHELL_FILENAME}\" 2>/dev/null && \\\n" \ +" TZ=UTC touch -h -a -d \"$SHELL_TOUCHATIME_W_NSEC\" \"/${SHELL_FILENAME}\" 2>/dev/null; then\n" \ +" echo \"### 000\"\n" \ +"elif TZ=UTC touch -h -m -t $SHELL_TOUCHMTIME \"/${SHELL_FILENAME}\" 2>/dev/null && \\\n" \ +" TZ=UTC touch -h -a -t $SHELL_TOUCHATIME \"/${SHELL_FILENAME}\" 2>/dev/null; then\n" \ +" echo \"### 000\"\n" \ +"elif [ -n \"$SHELL_HAVE_PERL\" ] && \\\n" \ +" perl -e 'utime '$SHELL_FILEATIME','$SHELL_FILEMTIME',@ARGV;' \"/${SHELL_FILENAME}\" 2>/dev/null; then\n" \ +" echo \"### 000\"\n" \ +"else\n" \ +" echo \"### 500\"\n" \ "fi\n" - /* default 'rmdir' script */ -#define FISH_RMDIR_DEF_CONTENT "" \ -"#RMD $FISH_FILENAME\n" \ -"if rmdir \"/${FISH_FILENAME}\" 2>/dev/null; then\n" \ +#define VFS_SHELL_RMDIR_DEF_CONTENT "" \ +"if rmdir \"/${SHELL_FILENAME}\" 2>/dev/null; then\n" \ " echo \"### 000\"\n" \ "else\n" \ " echo \"### 500\"\n" \ "fi\n" /* default 'ln -s' symlink script */ -#define FISH_LN_DEF_CONTENT "" \ -"#SYMLINK $FISH_FILEFROM $FISH_FILETO\n" \ -"if ln -s \"/${FISH_FILEFROM}\" \"/${FISH_FILETO}\" 2>/dev/null; then\n" \ +#define VFS_SHELL_LN_DEF_CONTENT "" \ +"if ln -s \"/${SHELL_FILEFROM}\" \"/${SHELL_FILETO}\" 2>/dev/null; then\n" \ " echo \"### 000\"\n" \ "else\n" \ " echo \"### 500\"\n" \ "fi\n" /* default 'mv' script */ -#define FISH_MV_DEF_CONTENT "" \ -"#RENAME $FISH_FILEFROM $FISH_FILETO\n" \ -"if mv \"/${FISH_FILEFROM}\" \"/${FISH_FILETO}\" 2>/dev/null; then\n" \ +#define VFS_SHELL_MV_DEF_CONTENT "" \ +"if mv \"/${SHELL_FILEFROM}\" \"/${SHELL_FILETO}\" 2>/dev/null; then\n" \ " echo \"### 000\"\n" \ "else\n" \ " echo \"### 500\"\n" \ "fi\n" /* default 'ln' hardlink script */ -#define FISH_HARDLINK_DEF_CONTENT "" \ -"#LINK $FISH_FILEFROM $FISH_FILETO\n" \ -"if ln \"/${FISH_FILEFROM}\" \"/${FISH_FILETO}\" 2>/dev/null; then\n" \ +#define VFS_SHELL_HARDLINK_DEF_CONTENT "" \ +"if ln \"/${SHELL_FILEFROM}\" \"/${SHELL_FILETO}\" 2>/dev/null; then\n" \ " echo \"### 000\"\n" \ "else\n" \ " echo \"### 500\"\n" \ "fi\n" /* default 'retr' script */ -#define FISH_GET_DEF_CONTENT "" \ -"export LC_TIME=C\n" \ -"#RETR $FISH_FILENAME\n" \ -"if dd if=\"/${FISH_FILENAME}\" of=/dev/null bs=1 count=1 2>/dev/null ; then\n" \ -" ls -ln \"/${FISH_FILENAME}\" 2>/dev/null | (\n" \ -" read p l u g s r\n" \ -" echo $s\n" \ -" )\n" \ -" echo \"### 100\"\n" \ -" cat \"/${FISH_FILENAME}\"\n" \ -" echo \"### 200\"\n" \ -"else\n" \ -" echo \"### 500\"\n" \ +#define VFS_SHELL_GET_DEF_CONTENT "" \ +"export LC_TIME=C\n" \ +"if dd if=\"/${SHELL_FILENAME}\" of=/dev/null bs=1 count=1 2>/dev/null ; then\n" \ +" ls -ln \"/${SHELL_FILENAME}\" 2>/dev/null | (\n" \ +" read p l u g s r\n" \ +" echo $s\n" \ +" )\n" \ +" echo \"### 100\"\n" \ +" cat \"/${SHELL_FILENAME}\"\n" \ +" echo \"### 200\"\n" \ +"else\n" \ +" echo \"### 500\"\n" \ "fi\n" /* default 'stor' script */ -#define FISH_SEND_DEF_CONTENT "" \ -"FILENAME=\"/${FISH_FILENAME}\"\n" \ -"FILESIZE=${FISH_FILESIZE}\n" \ -"#STOR $FILESIZE $FILENAME\n" \ +#define VFS_SHELL_SEND_DEF_CONTENT "" \ +"FILENAME=\"/${SHELL_FILENAME}\"\n" \ +"FILESIZE=${SHELL_FILESIZE}\n" \ "echo \"### 001\"\n" \ "{\n" \ " while [ $FILESIZE -gt 0 ]; do\n" \ @@ -158,10 +146,9 @@ "}; echo \"### 200\"\n" /* default 'appe' script */ -#define FISH_APPEND_DEF_CONTENT "" \ -"FILENAME=\"/${FISH_FILENAME}\"\n" \ -"FILESIZE=${FISH_FILESIZE}\n" \ -"#APPE $FILESIZE $FILENAME\n" \ +#define VFS_SHELL_APPEND_DEF_CONTENT "" \ +"FILENAME=\"/${SHELL_FILENAME}\"\n" \ +"FILESIZE=${SHELL_FILESIZE}\n" \ "echo \"### 001\"\n" \ "res=`exec 3>&1\n" \ "(\n" \ @@ -180,15 +167,15 @@ "}; echo \"### 200\"\n" /* default 'info' script */ -#define FISH_INFO_DEF_CONTENT "" \ +#define VFS_SHELL_INFO_DEF_CONTENT "" \ "export LC_TIME=C\n" \ -"#FISH_HAVE_HEAD 1\n" \ -"#FISH_HAVE_SED 2\n" \ -"#FISH_HAVE_AWK 4\n" \ -"#FISH_HAVE_PERL 8\n" \ -"#FISH_HAVE_LSQ 16\n" \ -"#FISH_HAVE_DATE_MDYT 32\n" \ -"#FISH_HAVE_TAIL 64\n" \ +"#SHELL_HAVE_HEAD 1\n" \ +"#SHELL_HAVE_SED 2\n" \ +"#SHELL_HAVE_AWK 4\n" \ +"#SHELL_HAVE_PERL 8\n" \ +"#SHELL_HAVE_LSQ 16\n" \ +"#SHELL_HAVE_DATE_MDYT 32\n" \ +"#SHELL_HAVE_TAIL 64\n" \ "res=0\n" \ "if `echo yes| head -c 1 > /dev/null 2>&1` ; then\n" \ " res=`expr $res + 1`\n" \ @@ -233,4 +220,5 @@ /*** declarations of public functions ************************************************************/ /*** inline functions ****************************************************************************/ -#endif + +#endif /* MC__VFS_SHELL_DEF_H */ diff --git a/src/vfs/tar/Makefile.in b/src/vfs/tar/Makefile.in index c89786e..79cd3e1 100644 --- a/src/vfs/tar/Makefile.in +++ b/src/vfs/tar/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/src/vfs/tar/tar-internal.c b/src/vfs/tar/tar-internal.c index f77b1b3..2c4a0ad 100644 --- a/src/vfs/tar/tar-internal.c +++ b/src/vfs/tar/tar-internal.c @@ -1,7 +1,7 @@ /* Virtual File System: GNU Tar file system. - Copyright (C) 2023 + Copyright (C) 2023-2024 Free Software Foundation, Inc. Written by: @@ -32,7 +32,6 @@ #include <config.h> -#include <ctype.h> /* isspace() */ #include <inttypes.h> /* uintmax_t */ #include <stdint.h> /* UINTMAX_MAX, etc */ @@ -184,6 +183,14 @@ tar_seek_archive (tar_super_t * archive, off_t size) /*** public functions ****************************************************************************/ /* --------------------------------------------------------------------------------------------- */ +gboolean +is_octal_digit (char c) +{ + return '0' <= c && c <= '7'; +} + +/* --------------------------------------------------------------------------------------------- */ + void tar_base64_init (void) { @@ -262,13 +269,13 @@ tar_from_header (const char *where0, size_t digs, char const *type, intmax_t min if (where == lim) return (-1); - if (!isspace ((unsigned char) *where)) + if (!g_ascii_isspace (*where)) break; where++; } - if (isodigit (*where)) + if (is_octal_digit (*where)) { char const *where1 = where; gboolean overflow = FALSE; @@ -276,7 +283,7 @@ tar_from_header (const char *where0, size_t digs, char const *type, intmax_t min while (TRUE) { value += *where++ - '0'; - if (where == lim || !isodigit (*where)) + if (where == lim || !is_octal_digit (*where)) break; overflow |= value != (value << LG_8 >> LG_8); value <<= LG_8; @@ -301,7 +308,7 @@ tar_from_header (const char *where0, size_t digs, char const *type, intmax_t min { value += 7 - digit; where++; - if (where == lim || !isodigit (*where)) + if (where == lim || !is_octal_digit (*where)) break; digit = *where - '0'; overflow |= value != (value << LG_8 >> LG_8); @@ -373,7 +380,7 @@ tar_from_header (const char *where0, size_t digs, char const *type, intmax_t min value = -value; } - if (where != lim && *where != '\0' && !isspace ((unsigned char) *where)) + if (where != lim && *where != '\0' && !g_ascii_isspace (*where)) return (-1); if (value <= (negative ? minus_minval : maxval)) diff --git a/src/vfs/tar/tar-internal.h b/src/vfs/tar/tar-internal.h index 7b3bb53..e0ce577 100644 --- a/src/vfs/tar/tar-internal.h +++ b/src/vfs/tar/tar-internal.h @@ -65,8 +65,6 @@ #define OFF_FROM_HEADER(where) off_from_header (where, sizeof (where)) -#define isodigit(c) ( ((c) >= '0') && ((c) <= '7') ) - /*** enums ***************************************************************************************/ /*** structures declarations (and typedefs of structures)*****************************************/ @@ -302,6 +300,7 @@ extern struct tar_stat_info current_stat_info; /*** declarations of public functions ************************************************************/ /* tar-internal.c */ +gboolean is_octal_digit (char c); void tar_base64_init (void); void tar_assign_string (char **string, char *value); void tar_assign_string_dup (char **string, const char *value); diff --git a/src/vfs/tar/tar-sparse.c b/src/vfs/tar/tar-sparse.c index 0bc169b..9795d15 100644 --- a/src/vfs/tar/tar-sparse.c +++ b/src/vfs/tar/tar-sparse.c @@ -1,7 +1,7 @@ /* Virtual File System: GNU Tar file system. - Copyright (C) 2003-2023 + Copyright (C) 2003-2024 Free Software Foundation, Inc. Written by: @@ -547,8 +547,8 @@ oldgnu_get_sparse_info (tar_super_t * archive, struct tar_sparse_file *file) { size_t i; union block *h = current_header; - int ext_p; - enum oldgnu_add_status rc; + gboolean ext_p; + enum oldgnu_add_status rc = add_fail; if (file->stat_info->sparse_map != NULL) g_array_set_size (file->stat_info->sparse_map, 0); @@ -560,8 +560,8 @@ oldgnu_get_sparse_info (tar_super_t * archive, struct tar_sparse_file *file) break; } - for (ext_p = h->oldgnu_header.isextended ? 1 : 0; rc == add_ok && ext_p != 0; - ext_p = h->sparse_header.isextended ? 1 : 0) + for (ext_p = h->oldgnu_header.isextended != 0; rc == add_ok && ext_p; + ext_p = h->sparse_header.isextended != 0) { h = tar_find_next_block (archive); if (h == NULL) @@ -612,7 +612,7 @@ star_get_sparse_info (tar_super_t * archive, struct tar_sparse_file *file) { size_t i; union block *h = current_header; - int ext_p = 1; + gboolean ext_p = TRUE; enum oldgnu_add_status rc = add_ok; if (file->stat_info->sparse_map != NULL) @@ -628,10 +628,10 @@ star_get_sparse_info (tar_super_t * archive, struct tar_sparse_file *file) break; } - ext_p = h->star_in_header.isextended ? 1 : 0; + ext_p = h->star_in_header.isextended != 0; } - for (; rc == add_ok && ext_p != 0; ext_p = h->star_ext_header.isextended ? 1 : 0) + for (; rc == add_ok && ext_p; ext_p = h->star_ext_header.isextended != 0) { h = tar_find_next_block (archive); if (h == NULL) diff --git a/src/vfs/tar/tar-xheader.c b/src/vfs/tar/tar-xheader.c index 5062ed1..c4c79de 100644 --- a/src/vfs/tar/tar-xheader.c +++ b/src/vfs/tar/tar-xheader.c @@ -1,7 +1,7 @@ /* Virtual File System: GNU Tar file system. - Copyright (C) 1995-2023 + Copyright (C) 1995-2024 Free Software Foundation, Inc. Written by: diff --git a/src/vfs/tar/tar.c b/src/vfs/tar/tar.c index 2d32111..4ce6494 100644 --- a/src/vfs/tar/tar.c +++ b/src/vfs/tar/tar.c @@ -1,7 +1,7 @@ /* Virtual File System: GNU Tar file system. - Copyright (C) 1995-2023 + Copyright (C) 1995-2024 Free Software Foundation, Inc. Written by: @@ -87,6 +87,8 @@ struct tar_stat_info current_stat_info; #define XGLTYPE 'g' /* Global extended header */ /* Values used in typeflag field. */ +#define REGTYPE '0' /* regular file */ +#define AREGTYPE '\0' /* regular file */ #define LNKTYPE '1' /* link */ #define SYMTYPE '2' /* symbolic link */ #define CHRTYPE '3' /* character special */ @@ -123,7 +125,6 @@ struct tar_stat_info current_stat_info; #define MODE_FROM_HEADER(where,hbits) mode_from_header (where, sizeof (where), hbits) #define TIME_FROM_HEADER(where) time_from_header (where, sizeof (where)) #define UID_FROM_HEADER(where) uid_from_header (where, sizeof (where)) -#define UINTMAX_FROM_HEADER(where) uintmax_from_header (where, sizeof (where)) /*** file scope type declarations ****************************************************************/ @@ -247,14 +248,6 @@ uid_from_header (const char *p, size_t s) /* --------------------------------------------------------------------------------------------- */ -static inline uintmax_t -uintmax_from_header (const char *p, size_t s) -{ - return tar_from_header (p, s, "uintmax_t", 0, UINTMAX_MAX, FALSE); -} - -/* --------------------------------------------------------------------------------------------- */ - static void tar_calc_sparse_offsets (struct vfs_s_inode *inode) { @@ -304,7 +297,7 @@ tar_skip_member (tar_super_t * archive, struct vfs_s_inode *inode) } else if (save_typeflag != DIRTYPE) { - if (inode != NULL) + if (inode != NULL && (save_typeflag == REGTYPE || save_typeflag == AREGTYPE)) inode->data_offset = BLOCKSIZE * tar_current_block_ordinal (archive); return tar_skip_file (archive, current_stat_info.stat.st_size); @@ -390,8 +383,10 @@ tar_decode_header (union block *header, tar_super_t * arch) { if (strcmp (header->header.magic, TMAGIC) == 0) { - if (header->star_header.prefix[130] == 0 && isodigit (header->star_header.atime[0]) - && header->star_header.atime[11] == ' ' && isodigit (header->star_header.ctime[0]) + if (header->star_header.prefix[130] == 0 + && is_octal_digit (header->star_header.atime[0]) + && header->star_header.atime[11] == ' ' + && is_octal_digit (header->star_header.ctime[0]) && header->star_header.ctime[11] == ' ') arch->type = TAR_STAR; else if (current_stat_info.xhdr.buffer != NULL) @@ -588,7 +583,6 @@ tar_insert_entry (struct vfs_class *me, struct vfs_s_super *archive, union block (*inode)->st.st_mtime = current_stat_info.mtime.tv_sec; (*inode)->st.st_atime = current_stat_info.atime.tv_sec; (*inode)->st.st_ctime = current_stat_info.ctime.tv_sec; - (*inode)->data_offset = BLOCKSIZE * tar_current_block_ordinal (TAR_SUPER (archive)); if (link_name != NULL && *link_name != '\0') (*inode)->linkname = g_strdup (link_name); diff --git a/src/vfs/undelfs/Makefile.in b/src/vfs/undelfs/Makefile.in index 4f258d7..9734ce2 100644 --- a/src/vfs/undelfs/Makefile.in +++ b/src/vfs/undelfs/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/src/vfs/undelfs/undelfs.c b/src/vfs/undelfs/undelfs.c index de54440..e480040 100644 --- a/src/vfs/undelfs/undelfs.c +++ b/src/vfs/undelfs/undelfs.c @@ -7,7 +7,7 @@ Parts of this program were taken from the lsdel.c and dump.c files written by Ted Ts'o (tytso@mit.edu) for the ext2fs package. - Copyright (C) 1995-2023 + Copyright (C) 1995-2024 Free Software Foundation, Inc. Written by: diff --git a/src/viewer/Makefile.in b/src/viewer/Makefile.in index 26ff9c6..dc77f67 100644 --- a/src/viewer/Makefile.in +++ b/src/viewer/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/src/viewer/actions_cmd.c b/src/viewer/actions_cmd.c index 465f0f0..453eb78 100644 --- a/src/viewer/actions_cmd.c +++ b/src/viewer/actions_cmd.c @@ -2,7 +2,7 @@ Internal file viewer for the Midnight Commander Callback function for some actions (hotkeys, menu) - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: @@ -57,13 +57,13 @@ #include "lib/charsets.h" #endif #include "lib/event.h" /* mc_event_raise() */ -#include "lib/mcconfig.h" /* mc_config_history_get() */ +#include "lib/mcconfig.h" /* mc_config_history_get_recent_item() */ #include "src/filemanager/layout.h" #include "src/filemanager/filemanager.h" /* current_panel */ #include "src/filemanager/ext.h" /* regex_command_for() */ -#include "src/history.h" +#include "src/history.h" /* MC_HISTORY_SHARED_SEARCH */ #include "src/file_history.h" /* show_file_history() */ #include "src/execute.h" #include "src/keymap.h" @@ -139,16 +139,12 @@ mcview_continue_search_cmd (WView * view) else { /* find last search string in history */ - GList *history; + char *s; - history = mc_config_history_get (MC_HISTORY_SHARED_SEARCH); - if (history != NULL) + s = mc_config_history_get_recent_item (MC_HISTORY_SHARED_SEARCH); + if (s != NULL) { - /* FIXME: is it possible that history->data == NULL? */ - view->last_search_string = (gchar *) history->data; - history->data = NULL; - history = g_list_first (history); - g_list_free_full (history, g_free); + view->last_search_string = s; if (mcview_search_init (view)) { @@ -405,12 +401,6 @@ mcview_execute_cmd (WView * view, long command) switch (command) { - case CK_Help: - { - ev_help_t event_data = { NULL, "[Internal File Viewer]" }; - mc_event_raise (MCEVENT_GROUP_CORE, "help", &event_data); - } - break; case CK_HexMode: /* Toggle between hex view and text view */ mcview_toggle_hex_mode (view); diff --git a/src/viewer/ascii.c b/src/viewer/ascii.c index f786dcc..c406feb 100644 --- a/src/viewer/ascii.c +++ b/src/viewer/ascii.c @@ -2,7 +2,7 @@ Internal file viewer for the Midnight Commander Function for plain view - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: diff --git a/src/viewer/coord_cache.c b/src/viewer/coord_cache.c index 190dbd5..2ea23c2 100644 --- a/src/viewer/coord_cache.c +++ b/src/viewer/coord_cache.c @@ -2,7 +2,7 @@ Internal file viewer for the Midnight Commander Function for work with coordinate cache (ccache) - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: diff --git a/src/viewer/datasource.c b/src/viewer/datasource.c index ea4199c..94c8099 100644 --- a/src/viewer/datasource.c +++ b/src/viewer/datasource.c @@ -2,7 +2,7 @@ Internal file viewer for the Midnight Commander Functions for datasources - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: diff --git a/src/viewer/dialogs.c b/src/viewer/dialogs.c index f15c2ff..4a2fe39 100644 --- a/src/viewer/dialogs.c +++ b/src/viewer/dialogs.c @@ -2,7 +2,7 @@ Internal file viewer for the Midnight Commander Function for paint dialogs - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: diff --git a/src/viewer/display.c b/src/viewer/display.c index e76c4dd..08fdb64 100644 --- a/src/viewer/display.c +++ b/src/viewer/display.c @@ -2,7 +2,7 @@ Internal file viewer for the Midnight Commander Function for whow info on display - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: diff --git a/src/viewer/growbuf.c b/src/viewer/growbuf.c index e18a527..f1fbb9b 100644 --- a/src/viewer/growbuf.c +++ b/src/viewer/growbuf.c @@ -2,7 +2,7 @@ Internal file viewer for the Midnight Commander Function for work with growing buffers - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: diff --git a/src/viewer/hex.c b/src/viewer/hex.c index c0cf7d0..de037cd 100644 --- a/src/viewer/hex.c +++ b/src/viewer/hex.c @@ -2,7 +2,7 @@ Internal file viewer for the Midnight Commander Function for hex view - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: diff --git a/src/viewer/lib.c b/src/viewer/lib.c index 5f2eb52..b427987 100644 --- a/src/viewer/lib.c +++ b/src/viewer/lib.c @@ -2,7 +2,7 @@ Internal file viewer for the Midnight Commander Common finctions (used from some other mcviewer functions) - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: diff --git a/src/viewer/mcviewer.c b/src/viewer/mcviewer.c index 36d31c0..1ec75c3 100644 --- a/src/viewer/mcviewer.c +++ b/src/viewer/mcviewer.c @@ -2,7 +2,7 @@ Internal file viewer for the Midnight Commander Interface functions - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc Written by: diff --git a/src/viewer/move.c b/src/viewer/move.c index 4f15b7c..0bdf38f 100644 --- a/src/viewer/move.c +++ b/src/viewer/move.c @@ -2,7 +2,7 @@ Internal file viewer for the Midnight Commander Functions for handle cursor movement - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: diff --git a/src/viewer/nroff.c b/src/viewer/nroff.c index 14dacd5..a7c7fe2 100644 --- a/src/viewer/nroff.c +++ b/src/viewer/nroff.c @@ -2,7 +2,7 @@ Internal file viewer for the Midnight Commander Functions for searching in nroff-like view - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: diff --git a/src/viewer/search.c b/src/viewer/search.c index f470a36..9fce398 100644 --- a/src/viewer/search.c +++ b/src/viewer/search.c @@ -2,7 +2,7 @@ Internal file viewer for the Midnight Commander Function for search data - Copyright (C) 1994-2023 + Copyright (C) 1994-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/Makefile.in b/tests/Makefile.in index 5556f5e..f5505ad 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -133,7 +133,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/tests/lib/Makefile.in b/tests/lib/Makefile.in index c67254f..09eb6fa 100644 --- a/tests/lib/Makefile.in +++ b/tests/lib/Makefile.in @@ -145,7 +145,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/tests/lib/library_independ.c b/tests/lib/library_independ.c index aa3a2a1..b9e2c1c 100644 --- a/tests/lib/library_independ.c +++ b/tests/lib/library_independ.c @@ -1,7 +1,7 @@ /* libmc - check if library is independent to $(topsrc)/src directory - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/mc_build_filename.c b/tests/lib/mc_build_filename.c index 780676b..9025a30 100644 --- a/tests/lib/mc_build_filename.c +++ b/tests/lib/mc_build_filename.c @@ -1,7 +1,7 @@ /* lib - mc_build_filename() function testing - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/mc_realpath.c b/tests/lib/mc_realpath.c index f00873c..a552cdf 100644 --- a/tests/lib/mc_realpath.c +++ b/tests/lib/mc_realpath.c @@ -1,7 +1,7 @@ /* lib - realpath - Copyright (C) 2017-2023 + Copyright (C) 2017-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/mcconfig/Makefile.in b/tests/lib/mcconfig/Makefile.in index 260196a..39c05bb 100644 --- a/tests/lib/mcconfig/Makefile.in +++ b/tests/lib/mcconfig/Makefile.in @@ -138,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/tests/lib/mcconfig/config_string.c b/tests/lib/mcconfig/config_string.c index 4a3a68d..535cc6a 100644 --- a/tests/lib/mcconfig/config_string.c +++ b/tests/lib/mcconfig/config_string.c @@ -1,7 +1,7 @@ /* libmc - check mcconfig submodule. read and write config files - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/mcconfig/user_configs_path.c b/tests/lib/mcconfig/user_configs_path.c index 6140c12..96b0205 100644 --- a/tests/lib/mcconfig/user_configs_path.c +++ b/tests/lib/mcconfig/user_configs_path.c @@ -1,7 +1,7 @@ /* libmc - check mcconfig submodule. Get full paths to user's config files. - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: @@ -118,7 +118,7 @@ static const struct test_user_config_paths_ds }, { /* 10. */ CONF_DATA, - FISH_PREFIX + VFS_SHELL_PREFIX }, { /* 11. */ CONF_DATA, diff --git a/tests/lib/name_quote.c b/tests/lib/name_quote.c index e86a608..f59c234 100644 --- a/tests/lib/name_quote.c +++ b/tests/lib/name_quote.c @@ -1,7 +1,7 @@ /* lib - Quote file names - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: @@ -91,6 +91,8 @@ static const struct data_source2 const char *expected_string; } data_source2[] = { + {NULL, NULL}, + {"", NULL}, {"-", "./-"}, {"blabla-", "blabla-"}, {"\r\n\t", "\\\r\\\n\\\t"}, diff --git a/tests/lib/search/Makefile.in b/tests/lib/search/Makefile.in index 2b94a7f..9a38372 100644 --- a/tests/lib/search/Makefile.in +++ b/tests/lib/search/Makefile.in @@ -140,7 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/tests/lib/search/glob_prepare_replace_str.c b/tests/lib/search/glob_prepare_replace_str.c index 6cc5020..0732980 100644 --- a/tests/lib/search/glob_prepare_replace_str.c +++ b/tests/lib/search/glob_prepare_replace_str.c @@ -1,7 +1,7 @@ /* libmc - checks for processing esc sequences in replace string - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: @@ -77,7 +77,7 @@ START_PARAMETRIZED_TEST (test_glob_prepare_replace_str, test_glob_prepare_replac /* when */ mc_search_run (s, data->input_value, 0, strlen (data->input_value), NULL); - dest_str = mc_search_prepare_replace_str2 (s, (char *) data->replace_str); + dest_str = mc_search_prepare_replace_str2 (s, data->replace_str); /* then */ mctest_assert_str_eq (dest_str, data->expected_result); diff --git a/tests/lib/search/glob_translate_to_regex.c b/tests/lib/search/glob_translate_to_regex.c index a15df94..15b4073 100644 --- a/tests/lib/search/glob_translate_to_regex.c +++ b/tests/lib/search/glob_translate_to_regex.c @@ -1,7 +1,7 @@ /* libmc - checks for processing esc sequences in replace string - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/search/hex_translate_to_regex.c b/tests/lib/search/hex_translate_to_regex.c index a250bc0..c71490d 100644 --- a/tests/lib/search/hex_translate_to_regex.c +++ b/tests/lib/search/hex_translate_to_regex.c @@ -1,7 +1,7 @@ /* libmc - checks for hex pattern parsing - Copyright (C) 2017-2023 + Copyright (C) 2017-2024 Free Software Foundation, Inc. This file is part of the Midnight Commander. diff --git a/tests/lib/search/regex_process_escape_sequence.c b/tests/lib/search/regex_process_escape_sequence.c index c7d7785..1296d13 100644 --- a/tests/lib/search/regex_process_escape_sequence.c +++ b/tests/lib/search/regex_process_escape_sequence.c @@ -1,7 +1,7 @@ /* libmc - checks for processing esc sequences in replace string - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/search/regex_replace_esc_seq.c b/tests/lib/search/regex_replace_esc_seq.c index 7d5cd3e..39298d7 100644 --- a/tests/lib/search/regex_replace_esc_seq.c +++ b/tests/lib/search/regex_replace_esc_seq.c @@ -1,7 +1,7 @@ /* libmc - checks for processing esc sequences in replace string - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/search/translate_replace_glob_to_regex.c b/tests/lib/search/translate_replace_glob_to_regex.c index 4933adf..535bcb2 100644 --- a/tests/lib/search/translate_replace_glob_to_regex.c +++ b/tests/lib/search/translate_replace_glob_to_regex.c @@ -1,7 +1,7 @@ /* libmc - checks for processing esc sequences in replace string - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/serialize.c b/tests/lib/serialize.c index f150727..e1b3551 100644 --- a/tests/lib/serialize.c +++ b/tests/lib/serialize.c @@ -1,7 +1,7 @@ /* lib - common serialize/deserialize functions - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/strutil/Makefile.in b/tests/lib/strutil/Makefile.in index c3f2299..bb7b5f7 100644 --- a/tests/lib/strutil/Makefile.in +++ b/tests/lib/strutil/Makefile.in @@ -137,7 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/tests/lib/strutil/filevercmp.c b/tests/lib/strutil/filevercmp.c index ba7f775..2933963 100644 --- a/tests/lib/strutil/filevercmp.c +++ b/tests/lib/strutil/filevercmp.c @@ -1,7 +1,7 @@ /* lib/strutil - tests for lib/strutil/fileverscmp function. - Copyright (C) 2019-2023 + Copyright (C) 2019-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/strutil/parse_integer.c b/tests/lib/strutil/parse_integer.c index 4e25fa4..45520d1 100644 --- a/tests/lib/strutil/parse_integer.c +++ b/tests/lib/strutil/parse_integer.c @@ -1,7 +1,7 @@ /* lib/strutil - tests for lib/strutil/parse_integer function. - Copyright (C) 2013-2023 + Copyright (C) 2013-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/strutil/str_replace_all.c b/tests/lib/strutil/str_replace_all.c index 1a1cb89..836b68d 100644 --- a/tests/lib/strutil/str_replace_all.c +++ b/tests/lib/strutil/str_replace_all.c @@ -1,7 +1,7 @@ /* lib/strutil - tests for lib/strutil/replace.c:str_replace_all() function. - Copyright (C) 2013-2023 + Copyright (C) 2013-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/strutil/str_verscmp.c b/tests/lib/strutil/str_verscmp.c index df11975..1ae5549 100644 --- a/tests/lib/strutil/str_verscmp.c +++ b/tests/lib/strutil/str_verscmp.c @@ -2,7 +2,7 @@ lib/strutil - tests for lib/strutil/str_verscmp function. Testcases are taken from Gnulib. - Copyright (C) 2019-2023 + Copyright (C) 2019-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/utilunix__mc_pstream_get_string.c b/tests/lib/utilunix__mc_pstream_get_string.c index db5233e..5ba2285 100644 --- a/tests/lib/utilunix__mc_pstream_get_string.c +++ b/tests/lib/utilunix__mc_pstream_get_string.c @@ -1,7 +1,7 @@ /* lib - Read string from mc_pipe_stream - Copyright (C) 2021-2023 + Copyright (C) 2021-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/utilunix__my_system-common.c b/tests/lib/utilunix__my_system-common.c index e639107..db46299 100644 --- a/tests/lib/utilunix__my_system-common.c +++ b/tests/lib/utilunix__my_system-common.c @@ -1,7 +1,7 @@ /* lib - common code for testing lib/utilinux:my_system() function - Copyright (C) 2013-2023 + Copyright (C) 2013-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/utilunix__my_system-fork_child.c b/tests/lib/utilunix__my_system-fork_child.c index b34217b..46c1fa2 100644 --- a/tests/lib/utilunix__my_system-fork_child.c +++ b/tests/lib/utilunix__my_system-fork_child.c @@ -1,7 +1,7 @@ /* lib - tests lib/utilinux:my_system() function - Copyright (C) 2013-2023 + Copyright (C) 2013-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/utilunix__my_system-fork_child_shell.c b/tests/lib/utilunix__my_system-fork_child_shell.c index 4c062bf..6c9cb89 100644 --- a/tests/lib/utilunix__my_system-fork_child_shell.c +++ b/tests/lib/utilunix__my_system-fork_child_shell.c @@ -1,7 +1,7 @@ /* lib - tests lib/utilinux:my_system() function - Copyright (C) 2013-2023 + Copyright (C) 2013-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/utilunix__my_system-fork_fail.c b/tests/lib/utilunix__my_system-fork_fail.c index 638c952..975045d 100644 --- a/tests/lib/utilunix__my_system-fork_fail.c +++ b/tests/lib/utilunix__my_system-fork_fail.c @@ -1,7 +1,7 @@ /* lib - tests lib/utilinux:my_system() function - Copyright (C) 2013-2023 + Copyright (C) 2013-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/vfs/Makefile.in b/tests/lib/vfs/Makefile.in index e88f2af..1c9b4ef 100644 --- a/tests/lib/vfs/Makefile.in +++ b/tests/lib/vfs/Makefile.in @@ -148,7 +148,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/tests/lib/vfs/canonicalize_pathname.c b/tests/lib/vfs/canonicalize_pathname.c index 8d890c4..16712fd 100644 --- a/tests/lib/vfs/canonicalize_pathname.c +++ b/tests/lib/vfs/canonicalize_pathname.c @@ -1,7 +1,7 @@ /* lib - canonicalize path - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/vfs/current_dir.c b/tests/lib/vfs/current_dir.c index 3814886..80784bf 100644 --- a/tests/lib/vfs/current_dir.c +++ b/tests/lib/vfs/current_dir.c @@ -1,7 +1,7 @@ /* lib/vfs - manipulate with current directory - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/vfs/path_cmp.c b/tests/lib/vfs/path_cmp.c index 9df1e0e..b2db3d2 100644 --- a/tests/lib/vfs/path_cmp.c +++ b/tests/lib/vfs/path_cmp.c @@ -1,6 +1,6 @@ /* lib/vfs - vfs_path_t compare functions - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/vfs/path_len.c b/tests/lib/vfs/path_len.c index cb6a782..6bab6f5 100644 --- a/tests/lib/vfs/path_len.c +++ b/tests/lib/vfs/path_len.c @@ -1,6 +1,6 @@ /* lib/vfs - tests for vfspath_len() function. - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/vfs/path_manipulations.c b/tests/lib/vfs/path_manipulations.c index 9857e82..f379d91 100644 --- a/tests/lib/vfs/path_manipulations.c +++ b/tests/lib/vfs/path_manipulations.c @@ -1,6 +1,6 @@ /* lib/vfs - test vfs_path_t manipulation functions - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/vfs/path_recode.c b/tests/lib/vfs/path_recode.c index da31f1c..a6f6abe 100644 --- a/tests/lib/vfs/path_recode.c +++ b/tests/lib/vfs/path_recode.c @@ -1,7 +1,7 @@ /* lib/vfs - vfs_path_t charset recode functions - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/vfs/path_serialize.c b/tests/lib/vfs/path_serialize.c index a56db8d..442a3b2 100644 --- a/tests/lib/vfs/path_serialize.c +++ b/tests/lib/vfs/path_serialize.c @@ -1,7 +1,7 @@ /* lib/vfs - vfs_path_t serialize/deserialize functions - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/vfs/relative_cd.c b/tests/lib/vfs/relative_cd.c index 8eaa1ff..29f4221 100644 --- a/tests/lib/vfs/relative_cd.c +++ b/tests/lib/vfs/relative_cd.c @@ -1,6 +1,6 @@ /* lib/vfs - test vfs_path_t manipulation functions - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/vfs/tempdir.c b/tests/lib/vfs/tempdir.c index 7795e9b..2a499d1 100644 --- a/tests/lib/vfs/tempdir.c +++ b/tests/lib/vfs/tempdir.c @@ -1,7 +1,7 @@ /* lib/vfs - manipulations with temp files and dirs - Copyright (C) 2012-2023 + Copyright (C) 2012-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/vfs/vfs_adjust_stat.c b/tests/lib/vfs/vfs_adjust_stat.c index 9fb56ee..19b5e09 100644 --- a/tests/lib/vfs/vfs_adjust_stat.c +++ b/tests/lib/vfs/vfs_adjust_stat.c @@ -1,7 +1,7 @@ /* lib/vfs - test vfs_adjust_stat() functionality - Copyright (C) 2017-2023 + Copyright (C) 2017-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/vfs/vfs_get_encoding.c b/tests/lib/vfs/vfs_get_encoding.c index a7503ca..d599cdf 100644 --- a/tests/lib/vfs/vfs_get_encoding.c +++ b/tests/lib/vfs/vfs_get_encoding.c @@ -1,7 +1,7 @@ /* lib/vfs - test vfs_get_encoding() functionality - Copyright (C) 2013-2023 + Copyright (C) 2013-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/vfs/vfs_parse_ls_lga.c b/tests/lib/vfs/vfs_parse_ls_lga.c index 3d51f82..316de8f 100644 --- a/tests/lib/vfs/vfs_parse_ls_lga.c +++ b/tests/lib/vfs/vfs_parse_ls_lga.c @@ -1,7 +1,7 @@ /* lib/vfs - test vfs_parse_ls_lga() functionality - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/vfs/vfs_path_from_str_flags.c b/tests/lib/vfs/vfs_path_from_str_flags.c index 1f1c29d..9a68f43 100644 --- a/tests/lib/vfs/vfs_path_from_str_flags.c +++ b/tests/lib/vfs/vfs_path_from_str_flags.c @@ -1,6 +1,6 @@ /* lib/vfs - test vfs_path_from_str_flags() function - Copyright (C) 2013-2023 + Copyright (C) 2013-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/vfs/vfs_path_string_convert.c b/tests/lib/vfs/vfs_path_string_convert.c index 4a79249..b062a83 100644 --- a/tests/lib/vfs/vfs_path_string_convert.c +++ b/tests/lib/vfs/vfs_path_string_convert.c @@ -1,7 +1,7 @@ /* lib/vfs - get vfs_path_t from string - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/vfs/vfs_prefix_to_class.c b/tests/lib/vfs/vfs_prefix_to_class.c index 414d52d..482c6db 100644 --- a/tests/lib/vfs/vfs_prefix_to_class.c +++ b/tests/lib/vfs/vfs_prefix_to_class.c @@ -1,7 +1,7 @@ /* lib/vfs - test vfs_prefix_to_class() functionality - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/vfs/vfs_s_get_path.c b/tests/lib/vfs/vfs_s_get_path.c index 382b6ef..51812e6 100644 --- a/tests/lib/vfs/vfs_s_get_path.c +++ b/tests/lib/vfs/vfs_s_get_path.c @@ -1,7 +1,7 @@ /* lib/vfs - test vfs_s_get_path() function - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/vfs/vfs_setup_cwd.c b/tests/lib/vfs/vfs_setup_cwd.c index 9acfb92..2722d81 100644 --- a/tests/lib/vfs/vfs_setup_cwd.c +++ b/tests/lib/vfs/vfs_setup_cwd.c @@ -1,7 +1,7 @@ /* lib/vfs - test vfs_setup_cwd() functionality - Copyright (C) 2013-2023 + Copyright (C) 2013-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/vfs/vfs_split.c b/tests/lib/vfs/vfs_split.c index cafa855..a7fe7a4 100644 --- a/tests/lib/vfs/vfs_split.c +++ b/tests/lib/vfs/vfs_split.c @@ -1,7 +1,7 @@ /* lib/vfs - test vfs_split() functionality - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/widget/Makefile.in b/tests/lib/widget/Makefile.in index 8e08664..5f38761 100644 --- a/tests/lib/widget/Makefile.in +++ b/tests/lib/widget/Makefile.in @@ -138,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/tests/lib/widget/complete_engine.c b/tests/lib/widget/complete_engine.c index b16a4d9..d723b34 100644 --- a/tests/lib/widget/complete_engine.c +++ b/tests/lib/widget/complete_engine.c @@ -1,7 +1,7 @@ /* lib/widget - tests for autocomplete feature - Copyright (C) 2013-2023 + Copyright (C) 2013-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/widget/group_init_destroy.c b/tests/lib/widget/group_init_destroy.c index 0da2821..32d0184 100644 --- a/tests/lib/widget/group_init_destroy.c +++ b/tests/lib/widget/group_init_destroy.c @@ -1,7 +1,7 @@ /* libmc - checks for initialization and deinitialization of WGroup widget - Copyright (C) 2020-2023 + Copyright (C) 2020-2024 The Free Software Foundation, Inc. Written by: diff --git a/tests/lib/widget/hotkey_equal.c b/tests/lib/widget/hotkey_equal.c index a455d84..8375bc0 100644 --- a/tests/lib/widget/hotkey_equal.c +++ b/tests/lib/widget/hotkey_equal.c @@ -1,7 +1,7 @@ /* lib/widget - tests for hotkey comparison - Copyright (C) 2019-2023 + Copyright (C) 2019-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/lib/widget/widget_find_by_id.c b/tests/lib/widget/widget_find_by_id.c index 2477c02..88229e4 100644 --- a/tests/lib/widget/widget_find_by_id.c +++ b/tests/lib/widget/widget_find_by_id.c @@ -1,7 +1,7 @@ /* libmc - checks for search widget with requested ID - Copyright (C) 2020-2023 + Copyright (C) 2020-2024 The Free Software Foundation, Inc. Written by: diff --git a/tests/lib/widget/widget_make_global_local.c b/tests/lib/widget/widget_make_global_local.c index 379746d..e4a92e4 100644 --- a/tests/lib/widget/widget_make_global_local.c +++ b/tests/lib/widget/widget_make_global_local.c @@ -1,7 +1,7 @@ /* libmc - checks for search widget with requested ID - Copyright (C) 2021-2023 + Copyright (C) 2021-2024 The Free Software Foundation, Inc. Written by: diff --git a/tests/lib/x_basename.c b/tests/lib/x_basename.c index 2adce3b..6137cd9 100644 --- a/tests/lib/x_basename.c +++ b/tests/lib/x_basename.c @@ -1,7 +1,7 @@ /* lib - x_basename() function testing - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/src/Makefile.in b/tests/src/Makefile.in index 4bb3983..7f0169f 100644 --- a/tests/src/Makefile.in +++ b/tests/src/Makefile.in @@ -139,7 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/tests/src/editor/Makefile.in b/tests/src/editor/Makefile.in index d16c560..b8d7d74 100644 --- a/tests/src/editor/Makefile.in +++ b/tests/src/editor/Makefile.in @@ -136,7 +136,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/tests/src/editor/edit_complete_word_cmd.c b/tests/src/editor/edit_complete_word_cmd.c index 77bb4d0..a75c98d 100644 --- a/tests/src/editor/edit_complete_word_cmd.c +++ b/tests/src/editor/edit_complete_word_cmd.c @@ -1,7 +1,7 @@ /* src/editor - tests for edit_complete_word_cmd() function - Copyright (C) 2013-2023 + Copyright (C) 2013-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/src/execute__common.c b/tests/src/execute__common.c index 598b3d0..0ca5dc0 100644 --- a/tests/src/execute__common.c +++ b/tests/src/execute__common.c @@ -1,7 +1,7 @@ /* Common code for testing functions in src/execute.c file. - Copyright (C) 2013-2023 + Copyright (C) 2013-2024 Free Software Foundation, Inc. diff --git a/tests/src/execute__execute_external_editor_or_viewer.c b/tests/src/execute__execute_external_editor_or_viewer.c index e659477..7fb8d96 100644 --- a/tests/src/execute__execute_external_editor_or_viewer.c +++ b/tests/src/execute__execute_external_editor_or_viewer.c @@ -1,7 +1,7 @@ /* src - tests for execute_external_editor_or_viewer() function - Copyright (C) 2013-2023 + Copyright (C) 2013-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/src/execute__execute_get_external_cmd_opts_from_config.c b/tests/src/execute__execute_get_external_cmd_opts_from_config.c index bf7f77d..87643cf 100644 --- a/tests/src/execute__execute_get_external_cmd_opts_from_config.c +++ b/tests/src/execute__execute_get_external_cmd_opts_from_config.c @@ -1,7 +1,7 @@ /* src - tests for execute_external_editor_or_viewer() function - Copyright (C) 2013-2023 + Copyright (C) 2013-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/src/execute__execute_with_vfs_arg.c b/tests/src/execute__execute_with_vfs_arg.c index 528586b..232132e 100644 --- a/tests/src/execute__execute_with_vfs_arg.c +++ b/tests/src/execute__execute_with_vfs_arg.c @@ -1,7 +1,7 @@ /* src - tests for execute_with_vfs_arg() function - Copyright (C) 2013-2023 + Copyright (C) 2013-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/src/filemanager/Makefile.in b/tests/src/filemanager/Makefile.in index fdc647f..8cf1de7 100644 --- a/tests/src/filemanager/Makefile.in +++ b/tests/src/filemanager/Makefile.in @@ -138,7 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/tests/src/filemanager/cd_to.c b/tests/src/filemanager/cd_to.c index 37156d5..96a04e6 100644 --- a/tests/src/filemanager/cd_to.c +++ b/tests/src/filemanager/cd_to.c @@ -1,7 +1,7 @@ /* src/filemanager - tests for cd_to() function - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/src/filemanager/examine_cd.c b/tests/src/filemanager/examine_cd.c index bbb92f9..7298c26 100644 --- a/tests/src/filemanager/examine_cd.c +++ b/tests/src/filemanager/examine_cd.c @@ -1,7 +1,7 @@ /* src/filemanager - examine_cd() function testing - Copyright (C) 2012-2023 + Copyright (C) 2012-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/src/filemanager/exec_get_export_variables_ext.c b/tests/src/filemanager/exec_get_export_variables_ext.c index dea05a1..6f6901b 100644 --- a/tests/src/filemanager/exec_get_export_variables_ext.c +++ b/tests/src/filemanager/exec_get_export_variables_ext.c @@ -1,7 +1,7 @@ /* src/filemanager - filemanager functions - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/src/filemanager/filegui_is_wildcarded.c b/tests/src/filemanager/filegui_is_wildcarded.c index 28a11fd..7d6d4ce 100644 --- a/tests/src/filemanager/filegui_is_wildcarded.c +++ b/tests/src/filemanager/filegui_is_wildcarded.c @@ -1,7 +1,7 @@ /* src/filemanager - tests for is_wildcarded() function - Copyright (C) 2011-2023 + Copyright (C) 2011-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/src/filemanager/get_random_hint.c b/tests/src/filemanager/get_random_hint.c index 80dd1a7..8370619 100644 --- a/tests/src/filemanager/get_random_hint.c +++ b/tests/src/filemanager/get_random_hint.c @@ -2,7 +2,7 @@ src/filemanager - filemanager functions. Tests for getting random hints. - Copyright (C) 2013-2023 + Copyright (C) 2013-2024 Free Software Foundation, Inc. Written by: diff --git a/tests/src/vfs/Makefile.in b/tests/src/vfs/Makefile.in index 3cc55a3..0aeb345 100644 --- a/tests/src/vfs/Makefile.in +++ b/tests/src/vfs/Makefile.in @@ -135,7 +135,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/tests/src/vfs/extfs/Makefile.in b/tests/src/vfs/extfs/Makefile.in index f7d69e5..c203a25 100644 --- a/tests/src/vfs/extfs/Makefile.in +++ b/tests/src/vfs/extfs/Makefile.in @@ -133,7 +133,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/tests/src/vfs/extfs/helpers-list/Makefile.in b/tests/src/vfs/extfs/helpers-list/Makefile.in index 9dfaaef..d60222a 100644 --- a/tests/src/vfs/extfs/helpers-list/Makefile.in +++ b/tests/src/vfs/extfs/helpers-list/Makefile.in @@ -135,7 +135,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/tests/src/vfs/extfs/helpers-list/mc_parse_ls_l.c b/tests/src/vfs/extfs/helpers-list/mc_parse_ls_l.c index 7c6ef18..8c1889e 100644 --- a/tests/src/vfs/extfs/helpers-list/mc_parse_ls_l.c +++ b/tests/src/vfs/extfs/helpers-list/mc_parse_ls_l.c @@ -1,7 +1,7 @@ /* A parser for file-listings formatted like 'ls -l'. - Copyright (C) 2016-2023 + Copyright (C) 2016-2024 Free Software Foundation, Inc. This file is part of the Midnight Commander. diff --git a/tests/src/vfs/extfs/helpers-list/misc/Makefile.in b/tests/src/vfs/extfs/helpers-list/misc/Makefile.in index d3e051d..131fc7a 100644 --- a/tests/src/vfs/extfs/helpers-list/misc/Makefile.in +++ b/tests/src/vfs/extfs/helpers-list/misc/Makefile.in @@ -133,7 +133,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/tests/src/vfs/ftpfs/Makefile.in b/tests/src/vfs/ftpfs/Makefile.in index 12b61ea..d325e96 100644 --- a/tests/src/vfs/ftpfs/Makefile.in +++ b/tests/src/vfs/ftpfs/Makefile.in @@ -136,7 +136,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \ - $(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \ + $(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \ $(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \ diff --git a/tests/src/vfs/ftpfs/ftpfs_parse_long_list.c b/tests/src/vfs/ftpfs/ftpfs_parse_long_list.c index 2943364..840c57d 100644 --- a/tests/src/vfs/ftpfs/ftpfs_parse_long_list.c +++ b/tests/src/vfs/ftpfs/ftpfs_parse_long_list.c @@ -1,6 +1,6 @@ /* src/vfs/ftpfs - tests for ftpfs_parse_long_list() function. - Copyright (C) 2021-2023 + Copyright (C) 2021-2024 Free Software Foundation, Inc. Written by: |