diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 3fa259212..0dbd7ff28 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -3,7 +3,15 @@ if USE_NLS
 SUBDIRS = $(DOC_LINGUAS)
 endif
 
-man_MANS = mc.1 mcedit.1 mcview.1 mcdiff.1
+man_MANS = mc.1 mcview.1
+
+if USE_INTERNAL_EDIT
+man_MANS += mcedit.1
+endif
+
+if USE_DIFF
+man_MANS += mcdiff.1
+endif
 
 CLEANFILES = $(man_MANS)
 
diff --git a/doc/man/date-of-man-include.am b/doc/man/date-of-man-include.am
index 4b0c9ec53..ede02e478 100644
--- a/doc/man/date-of-man-include.am
+++ b/doc/man/date-of-man-include.am
@@ -15,14 +15,18 @@ mc.1: $(srcdir)/mc.1.in
 	MAN_FILE='$(srcdir)/mc.1.in'; MAN_DATE=$$($(MAN_DATE_CMD)); \
 	$(SED) $(SED_PARAMETERS) '$(srcdir)/mc.1.in' > '$@'
 
-mcdiff.1: $(srcdir)/mcdiff.1.in
-	MAN_FILE='$(srcdir)/mcdiff.1.in'; MAN_DATE=$$($(MAN_DATE_CMD)); \
-	$(SED) $(SED_PARAMETERS) '$(srcdir)/mcdiff.1.in' > '$@'
-
-mcedit.1: $(srcdir)/mcedit.1.in
-	MAN_FILE='$(srcdir)/mcedit.1.in'; MAN_DATE=$$($(MAN_DATE_CMD)); \
-	$(SED) $(SED_PARAMETERS) '$(srcdir)/mcedit.1.in' > '$@'
-
 mcview.1: $(srcdir)/mcview.1.in
 	MAN_FILE='$(srcdir)/mcview.1.in'; MAN_DATE=$$($(MAN_DATE_CMD)); \
 	$(SED) $(SED_PARAMETERS) '$(srcdir)/mcview.1.in' > '$@'
+
+if USE_INTERNAL_EDIT
+mcedit.1: $(srcdir)/mcedit.1.in
+	MAN_FILE='$(srcdir)/mcedit.1.in'; MAN_DATE=$$($(MAN_DATE_CMD)); \
+	$(SED) $(SED_PARAMETERS) '$(srcdir)/mcedit.1.in' > '$@'
+endif
+
+if USE_DIFF
+mcdiff.1: $(srcdir)/mcdiff.1.in
+	MAN_FILE='$(srcdir)/mcdiff.1.in'; MAN_DATE=$$($(MAN_DATE_CMD)); \
+	$(SED) $(SED_PARAMETERS) '$(srcdir)/mcdiff.1.in' > '$@'
+endif
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a466599c9..e9c39a6c2 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -19,12 +19,11 @@ SUBLIB_includes = \
 	mcconfig.h \
 	search.h \
 	skin.h \
-	strescape.h \
 	strutil.h \
 	widget.h
 
 SRC_mc_utils = \
-	utilunix.c utilunix.h \
+	utilunix.c \
 	unixcompat.h \
 	util.c util.h
 
diff --git a/lib/charsets.c b/lib/charsets.c
index c5ccaea57..ddd113cfe 100644
--- a/lib/charsets.c
+++ b/lib/charsets.c
@@ -135,8 +135,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);
+                *list = g_ptr_array_new_full (16, free_codepage_desc);
                 g_ptr_array_add (*list, new_codepage_desc (id, p));
             }
             else
diff --git a/lib/filehighlight/ini-file-read.c b/lib/filehighlight/ini-file-read.c
index 69b13a733..249c143b9 100644
--- a/lib/filehighlight/ini-file-read.c
+++ b/lib/filehighlight/ini-file-read.c
@@ -29,7 +29,7 @@
 
 #include "lib/global.h"
 #include "lib/fileloc.h"
-#include "lib/strescape.h"
+#include "lib/strutil.h"
 #include "lib/skin.h"
 #include "lib/util.h"           /* exist_file() */
 
@@ -154,7 +154,7 @@ mc_fhl_parse_get_extensions (mc_fhl_t * fhl, const gchar * group_name)
     {
         char *esc_ext;
 
-        esc_ext = strutils_regex_escape (*exts);
+        esc_ext = str_regex_escape (*exts);
         if (buf->len != 0)
             g_string_append_c (buf, '|');
         g_string_append (buf, esc_ext);
diff --git a/lib/glibcompat.c b/lib/glibcompat.c
index 0d58e4934..27d81a247 100644
--- a/lib/glibcompat.c
+++ b/lib/glibcompat.c
@@ -44,12 +44,87 @@
 
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
+
+#if ! GLIB_CHECK_VERSION (2, 54, 0)
+/**
+ * g_direct_equal:
+ * @v1: (nullable): a key
+ * @v2: (nullable): a key to compare with @v1
+ *
+ * Compares two #gpointer arguments and returns %TRUE if they are equal.
+ * It can be passed to g_hash_table_new() as the @key_equal_func
+ * parameter, when using opaque pointers compared by pointer value as
+ * keys in a #GHashTable.
+ *
+ * This equality function is also appropriate for keys that are integers
+ * stored in pointers, such as `GINT_TO_POINTER (n)`.
+ *
+ * Returns: %TRUE if the two keys match.
+ */
+
+static gboolean
+g_direct_equal (gconstpointer v1, gconstpointer v2)
+{
+    return v1 == v2;
+}
+#endif /* ! GLIB_CHECK_VERSION (2, 54, 0) */
 
 /* --------------------------------------------------------------------------------------------- */
 /*** public functions ****************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 
+#if ! GLIB_CHECK_VERSION (2, 54, 0)
+/**
+ * g_ptr_array_find_with_equal_func: (skip)
+ * @haystack: pointer array to be searched
+ * @needle: pointer to look for
+ * @equal_func: (nullable): the function to call for each element, which should
+ *    return %TRUE when the desired element is found; or %NULL to use pointer
+ *    equality
+ * @index_: (optional) (out): return location for the index of
+ *    the element, if found
+ *
+ * Checks whether @needle exists in @haystack, using the given @equal_func.
+ * If the element is found, %TRUE is returned and the element^A^A^As index is
+ * returned in @index_ (if non-%NULL). Otherwise, %FALSE is returned and @index_
+ * is undefined. If @needle exists multiple times in @haystack, the index of
+ * the first instance is returned.
+ *
+ * @equal_func is called with the element from the array as its first parameter,
+ * and @needle as its second parameter. If @equal_func is %NULL, pointer
+ * equality is used.
+ *
+ * Returns: %TRUE if @needle is one of the elements of @haystack
+ * Since: 2.54
+ */
+gboolean
+g_ptr_array_find_with_equal_func (GPtrArray * haystack, gconstpointer needle, GEqualFunc equal_func,
+                                  guint * index_)
+{
+    guint i;
+
+    g_return_val_if_fail (haystack != NULL, FALSE);
+
+    if (equal_func == NULL)
+        equal_func = g_direct_equal;
+
+    for (i = 0; i < haystack->len; i++)
+        if (equal_func (g_ptr_array_index (haystack, i), needle))
+        {
+            if (index_ != NULL)
+                *index_ = i;
+            return TRUE;
+        }
+
+    return FALSE;
+}
+#endif /* ! GLIB_CHECK_VERSION (2, 54, 0) */
+
+/* --------------------------------------------------------------------------------------------- */
+
 #if ! GLIB_CHECK_VERSION (2, 63, 3)
 /**
  * g_clear_slist: (skip)
diff --git a/lib/glibcompat.h b/lib/glibcompat.h
index 4f0b4d634..e2f84f5d9 100644
--- a/lib/glibcompat.h
+++ b/lib/glibcompat.h
@@ -16,6 +16,11 @@
 
 /*** declarations of public functions ************************************************************/
 
+#if ! GLIB_CHECK_VERSION (2, 54, 0)
+gboolean g_ptr_array_find_with_equal_func (GPtrArray * haystack, gconstpointer needle,
+                                           GEqualFunc equal_func, guint * index_);
+#endif /* ! GLIB_CHECK_VERSION (2, 54, 0) */
+
 #if ! GLIB_CHECK_VERSION (2, 63, 3)
 void g_clear_slist (GSList ** slist_ptr, GDestroyNotify destroy);
 void g_clear_list (GList ** list_ptr, GDestroyNotify destroy);
diff --git a/lib/global.h b/lib/global.h
index 9b245377a..e4afd9f10 100644
--- a/lib/global.h
+++ b/lib/global.h
@@ -7,69 +7,16 @@
 #ifndef MC_GLOBAL_H
 #define MC_GLOBAL_H
 
-#if defined(HAVE_STRING_H)
-#include <string.h>
-   /* An ANSI string.h and pre-ANSI memory.h might conflict */
-#elif defined(HAVE_MEMORY_H)
-#include <memory.h>
-#else
-#include <strings.h>
-    /* memory and strings.h conflict on other systems */
-#endif /* !STDC_HEADERS & !HAVE_STRING_H */
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
-/* for O_* macros */
-#include <fcntl.h>
-
-/* for sig_atomic_t */
-#include <signal.h>
-
-#ifdef HAVE_FUNC_ATTRIBUTE_FALLTHROUGH
-#define MC_FALLTHROUGH __attribute__((fallthrough))
-#else
-#define MC_FALLTHROUGH
-#endif
-
-/*** typedefs(not structures) and defined constants **********************************************/
-
-/* The O_BINARY definition was taken from gettext */
-#if !defined O_BINARY && defined _O_BINARY
-  /* For MSC-compatible compilers.  */
-#define O_BINARY _O_BINARY
-#endif
-#ifdef __BEOS__
-  /* BeOS 5 has O_BINARY, but is has no effect.  */
-#undef O_BINARY
-#endif
-/* On reasonable systems, binary I/O is the default.  */
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
-/* Replacement for O_NONBLOCK */
-#ifndef O_NONBLOCK
-#ifdef O_NDELAY                 /* SYSV */
-#define O_NONBLOCK O_NDELAY
-#else /* BSD */
-#define O_NONBLOCK FNDELAY
-#endif /* !O_NDELAY */
-#endif /* !O_NONBLOCK */
-
-#if defined(__QNX__) && !defined(__QNXNTO__)
-/* exec*() from <process.h> */
-#include <unix.h>
-#endif
-
 #include <glib.h>
 #include "glibcompat.h"
 
-/* Solaris9 doesn't have PRIXMAX */
-#ifndef PRIXMAX
-#define PRIXMAX PRIxMAX
-#endif
+#include "unixcompat.h"
+
+#include "fs.h"
+#include "shell.h"
+#include "mcconfig.h"
+
+/*** typedefs(not structures) and defined constants **********************************************/
 
 #ifdef ENABLE_NLS
 #include <libintl.h>
@@ -90,9 +37,11 @@
 #define N_(String) (String)
 #endif /* !ENABLE_NLS */
 
-#include "fs.h"
-#include "shell.h"
-#include "mcconfig.h"
+#ifdef HAVE_FUNC_ATTRIBUTE_FALLTHROUGH
+#define MC_FALLTHROUGH __attribute__((fallthrough))
+#else
+#define MC_FALLTHROUGH
+#endif
 
 #ifdef USE_MAINTAINER_MODE
 #include "lib/logging.h"
@@ -109,32 +58,8 @@
 #define BUF_SMALL 128
 #define BUF_TINY 64
 
-/* ESC_CHAR is defined in /usr/include/langinfo.h in some systems */
-#ifdef ESC_CHAR
-#undef ESC_CHAR
-#endif
-/* AIX compiler doesn't understand '\e' */
-#define ESC_CHAR '\033'
-#define ESC_STR  "\033"
-
-/* OS specific defines */
-#define PATH_SEP '/'
-#define PATH_SEP_STR "/"
-#define IS_PATH_SEP(c) ((c) == PATH_SEP)
-#define PATH_ENV_SEP ':'
-#define TMPDIR_DEFAULT "/tmp"
-#define SCRIPT_SUFFIX ""
-#define get_default_editor() "vi"
-#define OS_SORT_CASE_SENSITIVE_DEFAULT TRUE
 #define UTF8_CHAR_LEN 6
 
-/* struct stat members */
-#ifdef __APPLE__
-#define st_atim st_atimespec
-#define st_ctim st_ctimespec
-#define st_mtim st_mtimespec
-#endif
-
 /* Used to distinguish between a normal MC termination and */
 /* one caused by typing 'exit' or 'logout' in the subshell */
 #define SUBSHELL_EXIT 128
diff --git a/lib/lock.c b/lib/lock.c
index 75996ebee..204b17b03 100644
--- a/lib/lock.c
+++ b/lib/lock.c
@@ -56,7 +56,7 @@
 
 #include "lib/global.h"
 #include "lib/vfs/vfs.h"
-#include "lib/util.h"           /* tilde_expand() */
+#include "lib/util.h"
 #include "lib/lock.h"
 #include "lib/widget.h"         /* query_dialog() */
 
diff --git a/lib/search/glob.c b/lib/search/glob.c
index a0326d0ef..c2c711672 100644
--- a/lib/search/glob.c
+++ b/lib/search/glob.c
@@ -29,7 +29,6 @@
 #include "lib/global.h"
 #include "lib/strutil.h"
 #include "lib/search.h"
-#include "lib/strescape.h"
 
 #include "internal.h"
 
@@ -62,28 +61,28 @@ mc_search__glob_translate_to_regex (const GString * astr)
         switch (str[loop])
         {
         case '*':
-            if (!strutils_is_char_escaped (str, &(str[loop])))
+            if (!str_is_char_escaped (str, &(str[loop])))
             {
                 g_string_append (buff, inside_group ? ".*" : "(.*)");
                 continue;
             }
             break;
         case '?':
-            if (!strutils_is_char_escaped (str, &(str[loop])))
+            if (!str_is_char_escaped (str, &(str[loop])))
             {
                 g_string_append (buff, inside_group ? "." : "(.)");
                 continue;
             }
             break;
         case ',':
-            if (!strutils_is_char_escaped (str, &(str[loop])))
+            if (!str_is_char_escaped (str, &(str[loop])))
             {
                 g_string_append_c (buff, inside_group ? '|' : ',');
                 continue;
             }
             break;
         case '{':
-            if (!strutils_is_char_escaped (str, &(str[loop])))
+            if (!str_is_char_escaped (str, &(str[loop])))
             {
                 g_string_append_c (buff, '(');
                 inside_group = TRUE;
@@ -91,7 +90,7 @@ mc_search__glob_translate_to_regex (const GString * astr)
             }
             break;
         case '}':
-            if (!strutils_is_char_escaped (str, &(str[loop])))
+            if (!str_is_char_escaped (str, &(str[loop])))
             {
                 g_string_append_c (buff, ')');
                 inside_group = FALSE;
diff --git a/lib/search/hex.c b/lib/search/hex.c
index a5764d88d..4860805c4 100644
--- a/lib/search/hex.c
+++ b/lib/search/hex.c
@@ -31,7 +31,6 @@
 #include "lib/global.h"
 #include "lib/strutil.h"
 #include "lib/search.h"
-#include "lib/strescape.h"
 
 #include "internal.h"
 
diff --git a/lib/search/regex.c b/lib/search/regex.c
index b1c61c532..a0f255f67 100644
--- a/lib/search/regex.c
+++ b/lib/search/regex.c
@@ -33,7 +33,6 @@
 #include "lib/global.h"
 #include "lib/strutil.h"
 #include "lib/search.h"
-#include "lib/strescape.h"
 #include "lib/util.h"           /* MC_PTR_FREE */
 
 #include "internal.h"
@@ -97,7 +96,7 @@ mc_search__regex_str_append_if_special (GString * copy_to, const GString * regex
         spec_chr_len = strlen (*spec_chr);
 
         if (strncmp (tmp_regex_str, *spec_chr, spec_chr_len) == 0
-            && !strutils_is_char_escaped (regex_str->str, tmp_regex_str))
+            && !str_is_char_escaped (regex_str->str, tmp_regex_str))
         {
             if (strncmp ("\\x", *spec_chr, spec_chr_len) == 0)
             {
@@ -229,13 +228,12 @@ mc_search__cond_struct_new_regex_ci_str (const char *charset, const GString * as
             continue;
         }
 
-        if (astr->str[loop] == '[' && !strutils_is_char_escaped (astr->str, &(astr->str[loop])))
+        if (astr->str[loop] == '[' && !str_is_char_escaped (astr->str, &(astr->str[loop])))
         {
             mc_search__cond_struct_new_regex_accum_append (charset, ret_str, accumulator);
 
             while (loop < astr->len && !(astr->str[loop] == ']'
-                                         && !strutils_is_char_escaped (astr->str,
-                                                                       &(astr->str[loop]))))
+                                         && !str_is_char_escaped (astr->str, &(astr->str[loop]))))
             {
                 g_string_append_c (ret_str, astr->str[loop]);
                 loop++;
@@ -401,7 +399,7 @@ mc_search_regex__get_max_num_of_replace_tokens (const gchar * str, gsize len)
     for (loop = 0; loop < len - 1; loop++)
         if (str[loop] == '\\' && g_ascii_isdigit (str[loop + 1]))
         {
-            if (strutils_is_char_escaped (str, &str[loop]))
+            if (str_is_char_escaped (str, &str[loop]))
                 continue;
             if (max_token < str[loop + 1] - '0')
                 max_token = str[loop + 1] - '0';
@@ -410,7 +408,7 @@ mc_search_regex__get_max_num_of_replace_tokens (const gchar * str, gsize len)
         {
             gsize tmp_len;
 
-            if (strutils_is_char_escaped (str, &str[loop]))
+            if (str_is_char_escaped (str, &str[loop]))
                 continue;
 
             for (tmp_len = 0;
@@ -555,7 +553,7 @@ mc_search_regex__process_replace_str (const GString * replace_str, const gsize c
     {
         char *tmp_str;
 
-        if (strutils_is_char_escaped (replace_str->str, curr_str))
+        if (str_is_char_escaped (replace_str->str, curr_str))
         {
             *skip_len = 1;
             return REPLACE_PREPARE_T_NOTHING_SPECIAL;
@@ -582,7 +580,7 @@ mc_search_regex__process_replace_str (const GString * replace_str, const gsize c
 
     if (curr_str[0] == '\\' && replace_str->len > current_pos + 1)
     {
-        if (strutils_is_char_escaped (replace_str->str, curr_str))
+        if (str_is_char_escaped (replace_str->str, curr_str))
         {
             *skip_len = 1;
             return REPLACE_PREPARE_T_NOTHING_SPECIAL;
diff --git a/lib/strescape.h b/lib/strescape.h
deleted file mode 100644
index a24f5d60c..000000000
--- a/lib/strescape.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef MC__STRUTILS_ESCAPE_H
-#define MC__STRUTILS_ESCAPE_H
-
-#include <config.h>
-
-#include "lib/global.h"         /* <glib.h> */
-
-/*** typedefs(not structures) and defined constants **********************************************/
-
-/*** enums ***************************************************************************************/
-
-/*** structures declarations (and typedefs of structures)*****************************************/
-
-/*** global variables defined in .c file *********************************************************/
-
-/*** declarations of public functions ************************************************************/
-
-char *strutils_escape (const char *src, gsize src_len, const char *escaped_chars,
-                       gboolean escape_non_printable);
-char *strutils_unescape (const char *src, gsize src_len, const char *unescaped_chars,
-                         gboolean unescape_non_printable);
-char *strutils_shell_unescape (const char *text);
-char *strutils_shell_escape (const char *text);
-
-char *strutils_glob_escape (const char *text);
-char *strutils_glob_unescape (const char *text);
-
-char *strutils_regex_escape (const char *text);
-char *strutils_regex_unescape (const char *text);
-
-gboolean strutils_is_char_escaped (const char *start, const char *current);
-
-#endif /* MC__STRUTILS_ESCAPE_H */
diff --git a/lib/strutil.h b/lib/strutil.h
index ed13bc118..4c321dd25 100644
--- a/lib/strutil.h
+++ b/lib/strutil.h
@@ -613,6 +613,21 @@ strtol_error_t xstrtoumax (const char *s, char **ptr, int base, uintmax_t * val,
                            const char *valid_suffixes);
 uintmax_t parse_integer (const char *str, gboolean * invalid);
 
+char *str_escape (const char *src, gsize src_len, const char *escaped_chars,
+                  gboolean escape_non_printable);
+char *str_unescape (const char *src, gsize src_len, const char *unescaped_chars,
+                    gboolean unescape_non_printable);
+char *str_shell_unescape (const char *text);
+char *str_shell_escape (const char *text);
+
+char *str_glob_escape (const char *text);
+char *str_glob_unescape (const char *text);
+
+char *str_regex_escape (const char *text);
+char *str_regex_unescape (const char *text);
+
+gboolean str_is_char_escaped (const char *start, const char *current);
+
 /* --------------------------------------------------------------------------------------------- */
 /*** inline functions ****************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
diff --git a/lib/strutil/replace.c b/lib/strutil/replace.c
index a2d700dfd..82b773aaa 100644
--- a/lib/strutil/replace.c
+++ b/lib/strutil/replace.c
@@ -26,7 +26,6 @@
 #include <config.h>
 
 #include "lib/global.h"
-#include "lib/strescape.h"
 #include "lib/strutil.h"
 
 /*** global variables ****************************************************************************/
@@ -72,7 +71,7 @@ str_replace_all (const char *haystack, const char *needle, const char *replaceme
         if (return_str == NULL)
             return_str = g_string_sized_new (32);
 
-        if (strutils_is_char_escaped (haystack, needle_in_str))
+        if (str_is_char_escaped (haystack, needle_in_str))
         {
             char *backslash = needle_in_str - 1;
 
diff --git a/lib/strutil/strescape.c b/lib/strutil/strescape.c
index 1412fee43..3a045bdef 100644
--- a/lib/strutil/strescape.c
+++ b/lib/strutil/strescape.c
@@ -27,7 +27,7 @@
 #include <config.h>
 
 #include "lib/global.h"
-#include "lib/strescape.h"
+#include "lib/strutil.h"
 
 /*** global variables ****************************************************************************/
 
@@ -52,8 +52,8 @@ static const char ESCAPE_GLOB_CHARS[] = "$*\\?";
 /* --------------------------------------------------------------------------------------------- */
 
 char *
-strutils_escape (const char *src, gsize src_len, const char *escaped_chars,
-                 gboolean escape_non_printable)
+str_escape (const char *src, gsize src_len, const char *escaped_chars,
+            gboolean escape_non_printable)
 {
     GString *ret;
     gsize curr_index;
@@ -103,8 +103,8 @@ strutils_escape (const char *src, gsize src_len, const char *escaped_chars,
 /* --------------------------------------------------------------------------------------------- */
 
 char *
-strutils_unescape (const char *src, gsize src_len, const char *unescaped_chars,
-                   gboolean unescape_non_printable)
+str_unescape (const char *src, gsize src_len, const char *unescaped_chars,
+              gboolean unescape_non_printable)
 {
     GString *ret;
     gsize curr_index;
@@ -182,25 +182,25 @@ strutils_unescape (const char *src, gsize src_len, const char *unescaped_chars,
  */
 
 char *
-strutils_shell_escape (const char *src)
+str_shell_escape (const char *src)
 {
-    return strutils_escape (src, -1, ESCAPE_SHELL_CHARS, FALSE);
+    return str_escape (src, -1, ESCAPE_SHELL_CHARS, FALSE);
 }
 
 /* --------------------------------------------------------------------------------------------- */
 
 char *
-strutils_glob_escape (const char *src)
+str_glob_escape (const char *src)
 {
-    return strutils_escape (src, -1, ESCAPE_GLOB_CHARS, TRUE);
+    return str_escape (src, -1, ESCAPE_GLOB_CHARS, TRUE);
 }
 
 /* --------------------------------------------------------------------------------------------- */
 
 char *
-strutils_regex_escape (const char *src)
+str_regex_escape (const char *src)
 {
-    return strutils_escape (src, -1, ESCAPE_REGEX_CHARS, TRUE);
+    return str_escape (src, -1, ESCAPE_REGEX_CHARS, TRUE);
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -215,24 +215,24 @@ strutils_regex_escape (const char *src)
  */
 
 char *
-strutils_shell_unescape (const char *text)
+str_shell_unescape (const char *text)
 {
-    return strutils_unescape (text, -1, ESCAPE_SHELL_CHARS, TRUE);
+    return str_unescape (text, -1, ESCAPE_SHELL_CHARS, TRUE);
 }
 
 /* --------------------------------------------------------------------------------------------- */
 
 char *
-strutils_glob_unescape (const char *text)
+str_glob_unescape (const char *text)
 {
-    return strutils_unescape (text, -1, ESCAPE_GLOB_CHARS, TRUE);
+    return str_unescape (text, -1, ESCAPE_GLOB_CHARS, TRUE);
 }
 
 /* --------------------------------------------------------------------------------------------- */
 char *
-strutils_regex_unescape (const char *text)
+str_regex_unescape (const char *text)
 {
-    return strutils_unescape (text, -1, ESCAPE_REGEX_CHARS, TRUE);
+    return str_unescape (text, -1, ESCAPE_REGEX_CHARS, TRUE);
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -247,7 +247,7 @@ strutils_regex_unescape (const char *text)
  */
 
 gboolean
-strutils_is_char_escaped (const char *start, const char *current)
+str_is_char_escaped (const char *start, const char *current)
 {
     int num_esc = 0;
 
diff --git a/lib/unixcompat.h b/lib/unixcompat.h
index c7ff12ded..9a1e0cee6 100644
--- a/lib/unixcompat.h
+++ b/lib/unixcompat.h
@@ -11,6 +11,10 @@
 #ifndef MC_UNIXCOMPAT_H
 #define MC_UNIXCOMPAT_H
 
+#include <fcntl.h>              /* O_* macros */
+#include <signal.h>             /* sig_atomic_t */
+#include <unistd.h>
+
 #include <sys/types.h>          /* BSD */
 
 #ifdef MAJOR_IN_MKDEV
@@ -19,7 +23,20 @@
 #include <sys/sysmacros.h>
 #endif
 
-#include <unistd.h>
+#if defined(HAVE_STRING_H)
+#include <string.h>
+   /* An ANSI string.h and pre-ANSI memory.h might conflict */
+#elif defined(HAVE_MEMORY_H)
+#include <memory.h>
+#else
+#include <strings.h>
+    /* memory and strings.h conflict on other systems */
+#endif /* !STDC_HEADERS & !HAVE_STRING_H */
+
+#if defined(__QNX__) && !defined(__QNXNTO__)
+/* exec*() from <process.h> */
+#include <unix.h>
+#endif
 
 /*** typedefs(not structures) and defined constants **********************************************/
 
@@ -50,6 +67,59 @@
 #define STDERR_FILENO 2
 #endif
 
+/* The O_BINARY definition was taken from gettext */
+#if !defined O_BINARY && defined _O_BINARY
+  /* For MSC-compatible compilers.  */
+#define O_BINARY _O_BINARY
+#endif
+#ifdef __BEOS__
+  /* BeOS 5 has O_BINARY, but is has no effect.  */
+#undef O_BINARY
+#endif
+/* On reasonable systems, binary I/O is the default.  */
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
+/* Replacement for O_NONBLOCK */
+#ifndef O_NONBLOCK
+#ifdef O_NDELAY                 /* SYSV */
+#define O_NONBLOCK O_NDELAY
+#else /* BSD */
+#define O_NONBLOCK FNDELAY
+#endif /* !O_NDELAY */
+#endif /* !O_NONBLOCK */
+
+/* Solaris9 doesn't have PRIXMAX */
+#ifndef PRIXMAX
+#define PRIXMAX PRIxMAX
+#endif
+
+/* ESC_CHAR is defined in /usr/include/langinfo.h in some systems */
+#ifdef ESC_CHAR
+#undef ESC_CHAR
+#endif
+/* AIX compiler doesn't understand '\e' */
+#define ESC_CHAR '\033'
+#define ESC_STR  "\033"
+
+/* OS specific defines */
+#define PATH_SEP '/'
+#define PATH_SEP_STR "/"
+#define IS_PATH_SEP(c) ((c) == PATH_SEP)
+#define PATH_ENV_SEP ':'
+#define TMPDIR_DEFAULT "/tmp"
+#define SCRIPT_SUFFIX ""
+#define get_default_editor() "vi"
+#define OS_SORT_CASE_SENSITIVE_DEFAULT TRUE
+
+/* struct stat members */
+#ifdef __APPLE__
+#define st_atim st_atimespec
+#define st_ctim st_ctimespec
+#define st_mtim st_mtimespec
+#endif
+
 /*** enums ***************************************************************************************/
 
 /*** structures declarations (and typedefs of structures)*****************************************/
diff --git a/lib/util.h b/lib/util.h
index 1ead0fb97..a59e2c698 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -57,6 +57,11 @@
 /* Difference or zero */
 #define DOZ(a, b) ((a) > (b) ? (a) - (b) : 0)
 
+/* flags for shell_execute */
+#define EXECUTE_INTERNAL (1 << 0)
+#define EXECUTE_AS_SHELL (1 << 2)
+#define EXECUTE_HIDE     (1 << 3)
+
 /*** enums ***************************************************************************************/
 
 /* Pathname canonicalization */
diff --git a/lib/utilunix.c b/lib/utilunix.c
index fc7a011f0..1a43cee28 100644
--- a/lib/utilunix.c
+++ b/lib/utilunix.c
@@ -70,8 +70,6 @@
 #include "lib/charsets.h"
 #endif
 
-#include "utilunix.h"
-
 /*** global variables ****************************************************************************/
 
 struct sigaction startup_handler;
@@ -1221,13 +1219,13 @@ mc_build_filenamev (const char *first_element, va_list args)
     GString *path;
     char *ret;
 
-    if (element == NULL)
+    if (first_element == NULL)
         return NULL;
 
-    path = g_string_new ("");
-
     absolute = IS_PATH_SEP (*first_element);
 
+    path = g_string_new (absolute ? PATH_SEP_STR : "");
+
     do
     {
         if (*element == '\0')
@@ -1235,7 +1233,6 @@ mc_build_filenamev (const char *first_element, va_list args)
         else
         {
             char *tmp_element;
-            size_t len;
             const char *start;
 
             tmp_element = g_strdup (element);
@@ -1243,11 +1240,10 @@ mc_build_filenamev (const char *first_element, va_list args)
             element = va_arg (args, char *);
 
             canonicalize_pathname (tmp_element);
-            len = strlen (tmp_element);
             start = IS_PATH_SEP (tmp_element[0]) ? tmp_element + 1 : tmp_element;
 
             g_string_append (path, start);
-            if (!IS_PATH_SEP (tmp_element[len - 1]) && element != NULL)
+            if (!IS_PATH_SEP (path->str[path->len - 1]) && element != NULL)
                 g_string_append_c (path, PATH_SEP);
 
             g_free (tmp_element);
@@ -1255,9 +1251,6 @@ mc_build_filenamev (const char *first_element, va_list args)
     }
     while (element != NULL);
 
-    if (absolute)
-        g_string_prepend_c (path, PATH_SEP);
-
     ret = g_string_free (path, FALSE);
     canonicalize_pathname (ret);
 
diff --git a/lib/utilunix.h b/lib/utilunix.h
deleted file mode 100644
index 922d2657a..000000000
--- a/lib/utilunix.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/** \file  execute.h
- *  \brief Header: execution routines
- */
-
-#ifndef MC__UTILUNIX_H
-#define MC__UTILUNIX_H
-
-/*** typedefs(not structures) and defined constants **********************************************/
-
-/* flags for shell_execute */
-#define EXECUTE_INTERNAL (1 << 0)
-#define EXECUTE_AS_SHELL (1 << 2)
-#define EXECUTE_HIDE     (1 << 3)
-
-/*** enums ***************************************************************************************/
-
-/*** structures declarations (and typedefs of structures)*****************************************/
-
-/*** global variables defined in .c file *********************************************************/
-
-/*** declarations of public functions ************************************************************/
-
-/*** inline functions ****************************************************************************/
-
-#endif /* MC__UTILUNIX_H */
diff --git a/lib/widget/input_complete.c b/lib/widget/input_complete.c
index bc441150a..745d79c96 100644
--- a/lib/widget/input_complete.c
+++ b/lib/widget/input_complete.c
@@ -48,7 +48,6 @@
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"        /* XCTRL and ALT macros */
 #include "lib/vfs/vfs.h"
-#include "lib/strescape.h"
 #include "lib/strutil.h"
 #include "lib/util.h"
 #include "lib/widget.h"
@@ -94,10 +93,6 @@ void complete_engine_fill_completions (WInput * in);
 
 /*** file scope variables ************************************************************************/
 
-static char **hosts = NULL;
-static char **hosts_p = NULL;
-static int hosts_alloclen = 0;
-
 static WInput *input;
 static int min_end;
 static int start = 0;
@@ -151,12 +146,12 @@ filename_completion_function (const char *text, int state, input_complete_t flag
         char *result;
         char *e_result;
 
-        u_text = strutils_shell_unescape (text);
+        u_text = str_shell_unescape (text);
 
         result = filename_completion_function (u_text, state, flags & (~INPUT_COMPLETE_SHELL_ESC));
         g_free (u_text);
 
-        e_result = strutils_shell_escape (result);
+        e_result = str_shell_escape (result);
         g_free (result);
 
         return e_result;
@@ -395,13 +390,19 @@ variable_completion_function (const char *text, int state, input_complete_t flag
 
 /* --------------------------------------------------------------------------------------------- */
 
+static gboolean
+host_equal_func (gconstpointer a, gconstpointer b)
+{
+    return (strcmp ((const char *) a, (const char *) b) == 0);
+}
+
+/* --------------------------------------------------------------------------------------------- */
+
 static void
-fetch_hosts (const char *filename)
+fetch_hosts (const char *filename, GPtrArray * hosts)
 {
     FILE *file;
-    char buffer[256];
-    char *name;
-    char *lc_start;
+    char buffer[BUF_MEDIUM];
     char *bi;
 
     file = fopen (filename, "r");
@@ -424,31 +425,34 @@ fetch_hosts (const char *filename)
             char *includefile, *t;
 
             /* Find start of filename. */
-            includefile = bi + 9;
-            while (*includefile != '\0' && whitespace (*includefile))
-                includefile++;
+            for (includefile = bi + 9; includefile[0] != '\0' && whitespace (includefile[0]);
+                 includefile++)
+                ;
             t = includefile;
 
             /* Find end of filename. */
-            while (t[0] != '\0' && !str_isspace (t))
-                str_next_char (&t);
+            for (; t[0] != '\0' && !str_isspace (t); str_next_char (&t))
+                ;
             *t = '\0';
 
-            fetch_hosts (includefile);
+            fetch_hosts (includefile, hosts);
             continue;
         }
 
         /* Skip IP #s. */
-        while (bi[0] != '\0' && !str_isspace (bi))
-            str_next_char (&bi);
+        for (; bi[0] != '\0' && !str_isspace (bi); str_next_char (&bi))
+            ;
 
         /* Get the host names separated by white space. */
         while (bi[0] != '\0' && bi[0] != '#')
         {
-            while (bi[0] != '\0' && str_isspace (bi))
-                str_next_char (&bi);
+            char *lc_start, *name;
+
+            for (; bi[0] != '\0' && str_isspace (bi); str_next_char (&bi))
+                ;
             if (bi[0] == '#')
                 continue;
+
             for (lc_start = bi; bi[0] != '\0' && !str_isspace (bi); str_next_char (&bi))
                 ;
 
@@ -456,32 +460,10 @@ fetch_hosts (const char *filename)
                 continue;
 
             name = g_strndup (lc_start, bi - lc_start);
-
-            {
-                char **host_p;
-                int j;
-
-                j = hosts_p - hosts;
-
-                if (j >= hosts_alloclen)
-                {
-                    hosts_alloclen += 30;
-                    hosts = g_renew (char *, hosts, hosts_alloclen + 1);
-                    hosts_p = hosts + j;
-                }
-
-                for (host_p = hosts; host_p < hosts_p; host_p++)
-                    if (strcmp (name, *host_p) == 0)
-                        break;  /* We do not want any duplicates */
-
-                if (host_p == hosts_p)
-                {
-                    *(hosts_p++) = name;
-                    *hosts_p = NULL;
-                }
-                else
-                    g_free (name);
-            }
+            if (!g_ptr_array_find_with_equal_func (hosts, name, host_equal_func, NULL))
+                g_ptr_array_add (hosts, name);
+            else
+                g_free (name);
         }
     }
 
@@ -493,7 +475,8 @@ fetch_hosts (const char *filename)
 static char *
 hostname_completion_function (const char *text, int state, input_complete_t flags)
 {
-    static char **host_p = NULL;
+    static GPtrArray *hosts = NULL;
+    static unsigned int host_p = 0;
     static size_t textstart = 0;
     static size_t textlen = 0;
 
@@ -504,29 +487,27 @@ hostname_completion_function (const char *text, int state, input_complete_t flag
     {                           /* Initialization stuff */
         const char *p;
 
-        g_strfreev (hosts);
-        hosts_alloclen = 30;
-        hosts = g_new (char *, hosts_alloclen + 1);
-        *hosts = NULL;
-        hosts_p = hosts;
+        if (hosts != NULL)
+            g_ptr_array_free (hosts, TRUE);
+        hosts = g_ptr_array_new_with_free_func (g_free);
         p = getenv ("HOSTFILE");
-        fetch_hosts (p != NULL ? p : "/etc/hosts");
-        host_p = hosts;
+        fetch_hosts (p != NULL ? p : "/etc/hosts", hosts);
+        host_p = 0;
         textstart = (*text == '@') ? 1 : 0;
         textlen = strlen (text + textstart);
     }
 
-    for (; *host_p != NULL; host_p++)
+    for (; host_p < hosts->len; host_p++)
     {
         if (textlen == 0)
             break;              /* Match all of them */
-        if (strncmp (text + textstart, *host_p, textlen) == 0)
+        if (strncmp (text + textstart, g_ptr_array_index (hosts, host_p), textlen) == 0)
             break;
     }
 
-    if (*host_p == NULL)
+    if (host_p == hosts->len)
     {
-        g_strfreev (hosts);
+        g_ptr_array_free (hosts, TRUE);
         hosts = NULL;
         return NULL;
     }
@@ -538,7 +519,7 @@ hostname_completion_function (const char *text, int state, input_complete_t flag
 
         if (textstart != 0)
             g_string_append_c (temp, '@');
-        g_string_append (temp, *host_p);
+        g_string_append (temp, g_ptr_array_index (hosts, host_p));
         host_p++;
 
         return g_string_free (temp, FALSE);
@@ -587,7 +568,7 @@ command_completion_function (const char *text, int state, input_complete_t flags
     if ((flags & INPUT_COMPLETE_COMMANDS) == 0)
         return NULL;
 
-    u_text = strutils_shell_unescape (text);
+    u_text = str_shell_unescape (text);
     flags &= ~INPUT_COMPLETE_SHELL_ESC;
 
     if (state == 0)
@@ -621,7 +602,7 @@ command_completion_function (const char *text, int state, input_complete_t flags
         {
             char *temp_p = p;
 
-            p = strutils_shell_escape (p);
+            p = str_shell_escape (p);
             g_free (temp_p);
         }
 
@@ -688,7 +669,7 @@ command_completion_function (const char *text, int state, input_complete_t flags
         {
             char *tmp = found;
 
-            found = strutils_shell_escape (p + 1);
+            found = str_shell_escape (p + 1);
             g_free (tmp);
         }
     }
@@ -884,7 +865,7 @@ try_complete_find_start_sign (try_complete_automation_state_t * state)
         state->q = strrchr (state->word, '$');
 
         /* don't substitute variable in \$ case */
-        if (strutils_is_char_escaped (state->word, state->q))
+        if (str_is_char_escaped (state->word, state->q))
         {
             /* drop '\\' */
             str_move (state->q - 1, state->q);
@@ -1398,7 +1379,7 @@ try_complete (char *text, int *lc_start, int *lc_end, input_complete_t flags)
             char *p;
 
             p = *m;
-            *m = strutils_shell_escape (*m);
+            *m = str_shell_escape (*m);
             g_free (p);
         }
     }
@@ -1431,7 +1412,7 @@ complete_engine_fill_completions (WInput * in)
     for (; s >= in->buffer->str; str_prev_char (&s))
     {
         start = s - in->buffer->str;
-        if (strchr (word_separators, *s) != NULL && !strutils_is_char_escaped (in->buffer->str, s))
+        if (strchr (word_separators, *s) != NULL && !str_is_char_escaped (in->buffer->str, s))
             break;
     }
 
diff --git a/misc/syntax/c.syntax b/misc/syntax/c.syntax
index e6fabe997..c5e2bc171 100644
--- a/misc/syntax/c.syntax
+++ b/misc/syntax/c.syntax
@@ -1,40 +1,65 @@
 # Syntax rules for the C and the C++ programming languages
 
 context default
+    keyword whole alignas yellow
+    keyword whole alignof yellow
+    keyword whole asm yellow
     keyword whole auto yellow
     keyword whole break yellow
     keyword whole case yellow
     keyword whole char yellow
+    keyword whole constexpr yellow
     keyword whole const yellow
     keyword whole continue yellow
-    keyword whole do yellow
+    keyword whole default yellow
     keyword whole double yellow
+    keyword whole do yellow
     keyword whole else yellow
     keyword whole enum yellow
     keyword whole extern yellow
+    keyword whole false yellow
     keyword whole float yellow
     keyword whole for yellow
     keyword whole goto yellow
     keyword whole if yellow
+    keyword whole inline yellow
     keyword whole int yellow
     keyword whole long yellow
+    keyword whole nullptr yellow
     keyword whole register yellow
+    keyword whole restrict yellow
     keyword whole return yellow
     keyword whole short yellow
     keyword whole signed yellow
     keyword whole sizeof yellow
     keyword whole static yellow
+    keyword whole static_assert yellow
     keyword whole struct yellow
     keyword whole switch yellow
+    keyword whole thread_local yellow
+    keyword whole true yellow
     keyword whole typedef yellow
+    keyword whole typeof yellow
+    keyword whole typeof_unqual yellow
     keyword whole union yellow
     keyword whole unsigned yellow
     keyword whole void yellow
     keyword whole volatile yellow
-    keyword whole while yellow
-    keyword whole asm yellow
-    keyword whole inline yellow
     keyword whole wchar_t yellow
+    keyword whole while yellow
+    keyword whole _Alignas yellow
+    keyword whole _Alignof yellow
+    keyword whole _Atomic yellow
+    keyword whole _Bool yellow
+    keyword whole _Complex yellow
+    keyword whole _Decimal32 yellow
+    keyword whole _Decimal64 yellow
+    keyword whole _Decimal128 yellow
+    keyword whole _Generic yellow
+    keyword whole _Imaginary yellow
+    keyword whole _Noreturn yellow
+    keyword whole _Static_assert yellow
+    keyword whole _Thread_local yellow
     keyword whole ... yellow
     keyword linestart \{\s\t\}\[\s\t\]#*\n brightmagenta
     keyword whole \[\s\t\]default yellow
diff --git a/misc/syntax/cxx.syntax b/misc/syntax/cxx.syntax
index 08cd444be..7875cb61a 100644
--- a/misc/syntax/cxx.syntax
+++ b/misc/syntax/cxx.syntax
@@ -1,66 +1,97 @@
 context default
+    keyword whole alignas yellow
+    keyword whole alignof yellow
+    keyword whole and yellow
+    keyword whole and_eq yellow
+    keyword whole asm yellow
     keyword whole auto yellow
+    keyword whole bitand yellow
+    keyword whole bitor yellow
+    keyword whole bool yellow
     keyword whole break yellow
     keyword whole case yellow
+    keyword whole catch yellow
+    keyword whole char8_t yellow
+    keyword whole char16_t yellow
+    keyword whole char32_t yellow
     keyword whole char yellow
+    keyword whole class yellow
+    keyword whole compl yellow
+    keyword whole concept yellow
+    keyword whole concept yellow
+    keyword whole consteval yellow
+    keyword whole constexpr yellow
+    keyword whole constinit yellow
     keyword whole const yellow
+    keyword whole const_cast yellow
     keyword whole continue yellow
+    keyword whole co_await yellow
+    keyword whole co_return yellow
+    keyword whole co_yield yellow
+    keyword whole decltype yellow
     keyword whole default yellow
-    keyword whole do yellow
+    keyword whole delete yellow
     keyword whole double yellow
+    keyword whole do yellow
+    keyword whole dynamic_cast yellow
     keyword whole else yellow
     keyword whole enum yellow
+    keyword whole explicit yellow
+    keyword whole export yellow
     keyword whole extern yellow
+    keyword whole false yellow
     keyword whole float yellow
     keyword whole for yellow
+    keyword whole friend yellow
     keyword whole goto yellow
     keyword whole if yellow
+    keyword whole inline yellow
     keyword whole int yellow
     keyword whole long yellow
+    keyword whole mutable yellow
+    keyword whole namespace yellow
+    keyword whole new yellow
+    keyword whole noexcept yellow
+    keyword whole not yellow
+    keyword whole not_eq yellow
+    keyword whole nullptr yellow
+    keyword whole operator yellow
+    keyword whole or yellow
+    keyword whole or_eq yellow
+    keyword whole private yellow
+    keyword whole protected yellow
+    keyword whole public yellow
     keyword whole register yellow
+    keyword whole reinterpret_cast yellow
+    keyword whole requires yellow
     keyword whole return yellow
     keyword whole short yellow
     keyword whole signed yellow
     keyword whole sizeof yellow
     keyword whole static yellow
+    keyword whole static_assert yellow
+    keyword whole static_cast yellow
     keyword whole struct yellow
     keyword whole switch yellow
-    keyword whole typedef yellow
-    keyword whole union yellow
-    keyword whole unsigned yellow
-    keyword whole void yellow
-    keyword whole volatile yellow
-    keyword whole while yellow
-    keyword whole asm yellow
-    keyword whole catch yellow
-    keyword whole class yellow
-    keyword whole friend yellow
-    keyword whole delete yellow
-    keyword whole inline yellow
-    keyword whole new yellow
-    keyword whole operator yellow
-    keyword whole private yellow
-    keyword whole protected yellow
-    keyword whole public yellow
-    keyword whole this yellow
-    keyword whole throw yellow
     keyword whole template yellow
-    keyword whole try yellow
-    keyword whole virtual yellow
-    keyword whole bool yellow
-    keyword whole const_cast yellow
-    keyword whole dynamic_cast yellow
-    keyword whole explicit yellow
-    keyword whole false yellow
-    keyword whole mutable yellow
-    keyword whole namespace yellow
-    keyword whole reinterpret_cast yellow
-    keyword whole static_cast yellow
+    keyword whole this yellow
+    keyword whole thread_local yellow
+    keyword whole throw yellow
     keyword whole true yellow
+    keyword whole try yellow
+    keyword whole typedef yellow
     keyword whole typeid yellow
     keyword whole typename yellow
+    keyword whole union yellow
+    keyword whole unsigned yellow
     keyword whole using yellow
+    keyword whole virtual yellow
+    keyword whole void yellow
+    keyword whole volatile yellow
     keyword whole wchar_t yellow
+    keyword whole while yellow
+    keyword whole xor yellow
+    keyword whole xor_eq yellow
     keyword whole ... yellow
     keyword linestart \{\s\t\}\[\s\t\]#*\n brightmagenta
 
diff --git a/po/af.po b/po/af.po
index df2d9231e..d671510a7 100644
--- a/po/af.po
+++ b/po/af.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -759,6 +759,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2585,6 +2588,18 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2672,12 +2687,24 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3715,10 +3742,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/ar.po b/po/ar.po
index 01f0b08a9..ecb740afd 100644
--- a/po/ar.po
+++ b/po/ar.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -760,6 +760,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2586,6 +2589,18 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2673,12 +2688,24 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3732,10 +3759,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/az.po b/po/az.po
index 6b9f0b4ba..0522b7f55 100644
--- a/po/az.po
+++ b/po/az.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -762,6 +762,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2588,6 +2591,22 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"%s faylına yaza bilmirəm:\n"
+"%s\n"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"%s faylına yaza bilmirəm:\n"
+"%s\n"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2675,12 +2694,26 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"%s faylına yaza bilmirəm:\n"
+"%s\n"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3735,10 +3768,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Xəbərdarlıq : %s'ye keçə bilmədim .\n"
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/be.po b/po/be.po
index 27c0769ca..676064478 100644
--- a/po/be.po
+++ b/po/be.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Midnight Commander\n"
 "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n"
-"POT-Creation-Date: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\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"
@@ -25,9 +25,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || "
-"(n%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
 
 # "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 msgid "Warning: cannot load codepages list"
@@ -817,6 +817,10 @@ msgstr "Параметры тэрмінала"
 msgid "Arguments parse error!"
 msgstr "Памылка падчас разбору аргумента!"
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "З убудаваным рэдактарам"
+
 msgid "No arguments given to the viewer."
 msgstr "Праграма для прагляду не атрымала аргументаў."
 
@@ -2750,6 +2754,22 @@ msgstr ""
 "Немагчыма атрымаць уласцівасці зыходнага файла «%s»\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Немагчыма атрымаць уласцівасці зыходнага файла «%s»\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Немагчыма атрымаць уласцівасці мэтавага файла «%s»\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2861,6 +2881,14 @@ msgstr ""
 "Немагчыма закрыць мэтавы файл «%s»\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Немагчыма атрымаць уласцівасці мэтавага файла «%s»\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2869,6 +2897,14 @@ msgstr ""
 "Немагчыма атрымаць уласцівасці зыходнага файла «%s»\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Немагчыма атрымаць уласцівасці зыходнага файла «%s»\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3961,10 +3997,12 @@ msgstr "Абалонка яшчэ выкарыстоўваецца. Усё ад
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Увага: немагчыма перайсці ў «%s».\n"
 
-msgid "With builtin Editor and Aspell support"
+#, fuzzy
+msgid "With builtin editor and aspell support"
 msgstr "З падтрымкай убудаванага рэдактара і Aspell"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "З убудаваным рэдактарам"
 
 msgid "With optional subshell support"
diff --git a/po/bg.po b/po/bg.po
index 7a390dd3d..d423c10be 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -809,6 +809,10 @@ msgstr "Настройки на терминала"
 msgid "Arguments parse error!"
 msgstr "Грешка при обработка на аргументите"
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "С поддръжка на вградения редактор"
+
 msgid "No arguments given to the viewer."
 msgstr "Няма предоставени аргументи към визуализатора."
 
@@ -2727,6 +2731,22 @@ msgstr ""
 "Не може да се изпълни stat върху изходния файл „%s“\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Не може да се изпълни stat върху изходния файл „%s“\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Не може да се изпълни fstat върху целевия файл „%s“\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2838,6 +2858,14 @@ msgstr ""
 "Не може да се затвори целевият файл „%s“\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Не може да се изпълни fstat върху целевия файл „%s“\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2846,6 +2874,14 @@ msgstr ""
 "Не може да се изпълне stat върху изходната директория „%s“\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Не може да се изпълне stat върху изходната директория „%s“\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3934,10 +3970,12 @@ msgstr "Обвивката е още активна. Да се напусне л
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Внимание: Не може да се влезе в %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+#, fuzzy
+msgid "With builtin editor and aspell support"
 msgstr "С поддръжка на вградения редактор и aspell"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "С поддръжка на вградения редактор"
 
 msgid "With optional subshell support"
diff --git a/po/br.po b/po/br.po
index 7bd8a0f5a..47c737b7f 100644
--- a/po/br.po
+++ b/po/br.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -17,10 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !"
-"=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && "
-"(n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 "
-"> 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != "
-"0 && n % 1000000 == 0) ? 3 : 4);\n"
+"=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n"
+"%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > "
+"19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 "
+"&& n % 1000000 == 0) ? 3 : 4);\n"
 
 # "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 msgid "Warning: cannot load codepages list"
@@ -764,6 +764,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2590,6 +2593,18 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2677,12 +2692,24 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3732,10 +3759,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/ca.po b/po/ca.po
index 0cf6bc7db..d922294f0 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\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"
@@ -841,6 +841,10 @@ msgstr "Opcions de terminal"
 msgid "Arguments parse error!"
 msgstr "Error en analitzar els arguments!"
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "Amb l'editor integrat"
+
 msgid "No arguments given to the viewer."
 msgstr "No s'han donat arguments al visor."
 
@@ -2777,6 +2781,22 @@ msgstr ""
 "No s'ha pogut fer estat al fitxer d'origen «%s»\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"No s'ha pogut fer estat al fitxer d'origen «%s»\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"No s'ha pogut fer estat al fitxer de destinació «%s»\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2888,6 +2908,14 @@ msgstr ""
 "No s'ha pogut tancar el fitxer de destinació «%s»\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"No s'ha pogut fer estat al fitxer de destinació «%s»\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2896,6 +2924,14 @@ msgstr ""
 "No s'ha pogut veure l'estat del directori d'origen «%s»\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"No s'ha pogut veure l'estat del directori d'origen «%s»\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3988,10 +4024,12 @@ msgstr "L'intèrpret d'ordres encara està actiu. Voleu sortir igualment?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Avís: no s'ha pogut canviar a %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+#, fuzzy
+msgid "With builtin editor and aspell support"
 msgstr "Amb la implementació incorporada de l'Editor i Aspell"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "Amb l'editor integrat"
 
 msgid "With optional subshell support"
diff --git a/po/cs.po b/po/cs.po
index 13f16d17b..24baad1fa 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -811,6 +811,10 @@ msgstr "Nastavení terminálu"
 msgid "Arguments parse error!"
 msgstr "Chyba vyhodnocování argumentů!"
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "S vestavěným editorem"
+
 msgid "No arguments given to the viewer."
 msgstr "Prohlížeči nebyly zadány žádné parametry"
 
@@ -2747,6 +2751,22 @@ msgstr ""
 "Na zdrojovém souboru „%s“ nelze provést stat\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Na zdrojovém souboru „%s“ nelze provést stat\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Nelze provést fstat cílového souboru „%s“\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2858,6 +2878,14 @@ msgstr ""
 "Nelze zavřít cílový soubor „%s“\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Nelze provést fstat cílového souboru „%s“\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2866,6 +2894,14 @@ msgstr ""
 "Na zdrojovém adresáři „%s“ nelze provést stat\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Na zdrojovém adresáři „%s“ nelze provést stat\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3963,10 +3999,12 @@ msgstr "Shell je stále aktivní, přesto ukončit?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Varování: Nedaří se přepnout do složky %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+#, fuzzy
+msgid "With builtin editor and aspell support"
 msgstr "S vestavěným editorem a podporou Aspell"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "S vestavěným editorem"
 
 msgid "With optional subshell support"
diff --git a/po/da.po b/po/da.po
index 38db7f900..667127d01 100644
--- a/po/da.po
+++ b/po/da.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -807,6 +807,10 @@ msgstr "Terminalindstillinger"
 msgid "Arguments parse error!"
 msgstr "Fejl ved fortolkning af argumenter!"
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "Med indbygget editor"
+
 msgid "No arguments given to the viewer."
 msgstr "Ingen argumenter givet til fremviseren."
 
@@ -2739,6 +2743,22 @@ msgstr ""
 "Kan ikke stat kildefil »%s«\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Kan ikke stat kildefil »%s«\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Kan ikke fstat målfil »%s«\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2850,6 +2870,14 @@ msgstr ""
 "Kan ikke lukke målfil »%s«\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Kan ikke fstat målfil »%s«\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2858,6 +2886,14 @@ msgstr ""
 "Kan ikke stat kildemappe »%s«\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Kan ikke stat kildemappe »%s«\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3946,10 +3982,12 @@ msgstr "Skallen er stadig aktiv. Afslut alligevel?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Advarsel: Kunne ikke skifte til %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+#, fuzzy
+msgid "With builtin editor and aspell support"
 msgstr "Med indbygget editor og understøttelse af Aspell"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "Med indbygget editor"
 
 msgid "With optional subshell support"
diff --git a/po/de.po b/po/de.po
index 785da3ec8..552748034 100644
--- a/po/de.po
+++ b/po/de.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Midnight Commander\n"
 "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n"
-"POT-Creation-Date: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: Ettore Atalan <atalanttore@googlemail.com>, 2015-2024\n"
 "Language-Team: German (http://app.transifex.com/mc/mc/language/de/)\n"
@@ -823,6 +823,10 @@ msgstr "Terminal-Optionen"
 msgid "Arguments parse error!"
 msgstr "Fehler beim Analysieren der Argumente!"
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "Mit eingebautem Editor"
+
 msgid "No arguments given to the viewer."
 msgstr "Keine Argumente an den Viewer übergeben."
 
@@ -2758,6 +2762,22 @@ msgstr ""
 "Kann Quelldatei \"%s\" nicht untersuchen\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Kann Quelldatei \"%s\" nicht untersuchen\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Kann Zieldatei \"%s\" nicht untersuchen\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2869,6 +2889,14 @@ msgstr ""
 "Kann Zieldatei \"%s\" nicht schließen\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Kann Zieldatei \"%s\" nicht untersuchen\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2877,6 +2905,14 @@ msgstr ""
 "Kann Quellverzeichnis \"%s\" nicht untersuchen\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Kann Quellverzeichnis \"%s\" nicht untersuchen\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3964,10 +4000,12 @@ msgstr "Die Shell ist immer noch aktiv. Trotzdem beenden?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Warnung: Kann nicht in %s wechseln.\n"
 
-msgid "With builtin Editor and Aspell support"
+#, fuzzy
+msgid "With builtin editor and aspell support"
 msgstr "Mit eingebautem Editor und Aspell-Unterstützung"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "Mit eingebautem Editor"
 
 msgid "With optional subshell support"
diff --git a/po/de_CH.po b/po/de_CH.po
index 526c0bdd5..e7013d392 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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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/"
@@ -760,6 +760,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2586,6 +2589,18 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2673,12 +2688,24 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3716,10 +3743,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/el.po b/po/el.po
index 3016e1077..fea77082a 100644
--- a/po/el.po
+++ b/po/el.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -773,6 +773,9 @@ msgstr "Επιλογές τερματικού"
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr "Δεν έχουν δοθεί ορίσματα στον προβολέα."
 
@@ -2640,6 +2643,22 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Αδυναμία ανοίγματος πηγαίου αρχείου \"%s\"\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Αδυναμία εγγραφής στο αρχείο στόχο \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2743,12 +2762,28 @@ msgstr ""
 "Αδυναμία κλεισίματος αρχείου στόχου \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Αδυναμία εγγραφής στο αρχείο στόχο \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Αδυναμία δημιουργίας καταλόγου στόχου \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3819,10 +3854,10 @@ msgstr "Το κέλυφος είναι ακόμα ενεργό. Έξοδος π
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Προειδοποίηση: Αδυναμία αλλαγής σε %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/en_GB.po b/po/en_GB.po
index 774c5fd09..5eead099f 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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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/"
@@ -803,6 +803,9 @@ msgstr "Terminal options"
 msgid "Arguments parse error!"
 msgstr "Arguments parse error!"
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr "No arguments given to the viewer."
 
@@ -2650,6 +2653,20 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Cannot create temporary merge file\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2737,12 +2754,26 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Cannot create temporary merge file\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr "Cannot set correct permissions for directory %s\n"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3780,10 +3811,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/eo.po b/po/eo.po
index 9ce1bdd18..8353d8724 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -804,6 +804,10 @@ msgstr "Terminala agordo"
 msgid "Arguments parse error!"
 msgstr "Eraro dum analizi parametrojn!"
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "Kun interna tekstoredaktilo"
+
 msgid "No arguments given to the viewer."
 msgstr "Neniuj parametroj donitaj al la legilo."
 
@@ -2736,6 +2740,22 @@ msgstr ""
 "Ne eblas trovi fontan dosieron \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Ne eblas trovi fontan dosieron \"%s\"\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Ne eblas trovi celan dosieron \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2847,6 +2867,14 @@ msgstr ""
 "Ne eblas fermi celan dosieron \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Ne eblas trovi celan dosieron \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2855,6 +2883,14 @@ msgstr ""
 "Ne eblas trovi fontan dosierujon \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Ne eblas trovi fontan dosierujon \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3942,10 +3978,12 @@ msgstr "La ŝelo estas aktiva. Ĉu senkonsidere eliri?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Averto: Ne eblas ŝanĝi al %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+#, fuzzy
+msgid "With builtin editor and aspell support"
 msgstr "Kun interna tekstoredaktilo kaj literumilo"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "Kun interna tekstoredaktilo"
 
 msgid "With optional subshell support"
diff --git a/po/es.po b/po/es.po
index 99adba145..24123910b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -831,6 +831,10 @@ msgstr "Opciones de terminal"
 msgid "Arguments parse error!"
 msgstr "¡Error al analizar los argumentos!"
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "Con editor de texto propio incluido"
+
 msgid "No arguments given to the viewer."
 msgstr "No se han pasado argumentos al visor."
 
@@ -2765,6 +2769,22 @@ msgstr ""
 "Imposible identificar el archivo origen «%s»\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Imposible identificar el archivo origen «%s»\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Imposible identificar el archivo destino «%s»\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2876,6 +2896,14 @@ msgstr ""
 "Imposible cerrar el archivo destino «%s»\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Imposible identificar el archivo destino «%s»\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2884,6 +2912,14 @@ msgstr ""
 "Imposible identificar el directorio de origen «%s»\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Imposible identificar el directorio de origen «%s»\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3975,10 +4011,12 @@ msgstr "El shell todavía está activo. ¿Terminar de todas maneras?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Cuidado: Imposible cambiar a %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+#, fuzzy
+msgid "With builtin editor and aspell support"
 msgstr "Con editor de texto propio y ortografía «Aspell» incluidos"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "Con editor de texto propio incluido"
 
 msgid "With optional subshell support"
diff --git a/po/et.po b/po/et.po
index 34ab061fb..155565194 100644
--- a/po/et.po
+++ b/po/et.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: Kristjan Räts <kristjanrats@gmail.com>, "
 "2013-2016,2018-2019,2024\n"
@@ -830,6 +830,10 @@ msgstr "Terminali suvandid"
 msgid "Arguments parse error!"
 msgstr "Parameetrite parsimise viga!"
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "Sisseehitatud toimetiga"
+
 msgid "No arguments given to the viewer."
 msgstr "Vaaturile parameetreid ei antud."
 
@@ -2762,6 +2766,22 @@ msgstr ""
 "Lähtefaili \"%s\" info päring nurjus\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Lähtefaili \"%s\" info päring nurjus\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Sihtfaili \"%s\" info päring nurjus\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2873,6 +2893,14 @@ msgstr ""
 "Sihtfaili \"%s\" sulgemine nurjus\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Sihtfaili \"%s\" info päring nurjus\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2881,6 +2909,14 @@ msgstr ""
 "Lähtekataloogi \"%s\" info päring nurjus\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Lähtekataloogi \"%s\" info päring nurjus\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3968,10 +4004,12 @@ msgstr "Shell on veel aktiivne. Kas soovid ikkagi lõpetada?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Hoiatus: sisenemine kataloogi %s nurjus.\n"
 
-msgid "With builtin Editor and Aspell support"
+#, fuzzy
+msgid "With builtin editor and aspell support"
 msgstr "Sisseehitatud toimeti ja Aspelli toega"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "Sisseehitatud toimetiga"
 
 msgid "With optional subshell support"
diff --git a/po/eu.po b/po/eu.po
index 9a84ecfc5..923ee9e62 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>, "
 "2011,2015-2019\n"
@@ -799,6 +799,9 @@ msgstr "Terminalaren aukerak"
 msgid "Arguments parse error!"
 msgstr "Argumentuen azterketak akatsa!"
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr "Ez zaizkio argumentuak eman erakusleari."
 
@@ -2712,6 +2715,22 @@ msgstr ""
 "Ezin da lortu \"%s\" iturburu fitxategiaren egoera\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Ezin da lortu \"%s\" iturburu fitxategiaren egoera\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Ezin da loortu \"%s\" helburu fitxategiaren egoera (fstat)\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2823,6 +2842,14 @@ msgstr ""
 "Ezin da itxi \"%s\" helburu fitxategia\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Ezin da loortu \"%s\" helburu fitxategiaren egoera (fstat)\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2831,6 +2858,14 @@ msgstr ""
 "Ezin da lortu \"%s\" iturburu direktorioaren egoera (stat)\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Ezin da lortu \"%s\" iturburu direktorioaren egoera (stat)\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3911,10 +3946,10 @@ msgstr "Shell oraindik jardunean dago. Irten hala ere?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Abisua: %s(e)ra ezin aldatu.\n"
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/fa.po b/po/fa.po
index 092f31cee..770382ddc 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -764,6 +764,9 @@ msgstr "تنظیمات پایانه"
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2590,6 +2593,18 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2677,12 +2692,24 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr "امکان قرار دادن اجازه‌های درست برای پوشه %s وجود ندارد\n"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3720,10 +3747,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/fi.po b/po/fi.po
index 7d9563fcc..6dfb533ea 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -793,6 +793,9 @@ msgstr "Terminaalin asetukset"
 msgid "Arguments parse error!"
 msgstr "Argumenttien rakennevirhe!"
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr "Katseluohjelmalle ei annettu argumentteja."
 
@@ -2658,6 +2661,22 @@ msgstr ""
 "Lähdetiedostoa ei voi lisätä \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Lähdetiedostoa ei voi lisätä \"%s\"\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Ei onnistu fstat kohdetiedostoon \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2769,6 +2788,14 @@ msgstr ""
 "Kohdetiedostoa ei voi sulkea \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Ei onnistu fstat kohdetiedostoon \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2777,6 +2804,14 @@ msgstr ""
 "Kohdekansiota ei voi lisätä \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Kohdekansiota ei voi lisätä \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3822,10 +3857,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/fr.po b/po/fr.po
index 6e94fbf26..0855de40f 100644
--- a/po/fr.po
+++ b/po/fr.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: Wallon Wallon, 2022-2024\n"
 "Language-Team: French (http://app.transifex.com/mc/mc/language/fr/)\n"
@@ -839,6 +839,10 @@ msgstr "Options du terminal"
 msgid "Arguments parse error!"
 msgstr "Erreur lors de l’analyse des arguments !"
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "Avec l’éditeur intégré"
+
 msgid "No arguments given to the viewer."
 msgstr "Aucun argument passé à la visionneuse."
 
@@ -2774,6 +2778,22 @@ msgstr ""
 "Impossible d’obtenir les caractéristiques du fichier source « %s »\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Impossible d’obtenir les caractéristiques du fichier source « %s »\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Impossible d’obtenir les caractéristiques du fichier cible « %s »\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2885,6 +2905,14 @@ msgstr ""
 "Impossible de fermer le fichier cible « %s »\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Impossible d’obtenir les caractéristiques du fichier cible « %s »\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2893,6 +2921,14 @@ msgstr ""
 "Impossible d’obtenir les caractéristiques du fichier source « %s »\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Impossible d’obtenir les caractéristiques du fichier source « %s »\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3986,10 +4022,12 @@ msgstr "Le shell est toujours actif. Quitter tout de même ?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Attention : ne peut aller à %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+#, fuzzy
+msgid "With builtin editor and aspell support"
 msgstr "Avec un éditeur intégré et un support Aspell"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "Avec l’éditeur intégré"
 
 msgid "With optional subshell support"
diff --git a/po/fr_CA.po b/po/fr_CA.po
index 09a6fa206..1a2d95a16 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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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/"
@@ -760,6 +760,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2586,6 +2589,18 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2673,12 +2688,24 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3716,10 +3743,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/ga.po b/po/ga.po
index 892a60e8f..946efbda2 100644
--- a/po/ga.po
+++ b/po/ga.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -760,6 +760,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2586,6 +2589,18 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2673,12 +2688,24 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3728,10 +3755,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/gl.po b/po/gl.po
index 2f284b5f9..17d0b0348 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>, "
 "2012,2014-2015,2019\n"
@@ -806,6 +806,9 @@ msgstr "Opcións de terminal"
 msgid "Arguments parse error!"
 msgstr "Produciuse un erro ao analizar os argumentos!"
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr "Non hai argumentos para o visor."
 
@@ -2717,6 +2720,22 @@ msgstr ""
 "Non é posíbel identificar o ficheiro orixe «%s»\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Non é posíbel identificar o ficheiro orixe «%s»\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Non é posíbel identificar o ficheiro destino «%s»\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2828,6 +2847,14 @@ msgstr ""
 "Non é posíbel pechar o ficheiro destino «%s»\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Non é posíbel identificar o ficheiro destino «%s»\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2836,6 +2863,14 @@ msgstr ""
 "Non é posíbel identificar o directorio de orixe «%s»\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Non é posíbel identificar o directorio de orixe «%s»\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3915,10 +3950,10 @@ msgstr "O terminal aínda está activo. Saír de todos xeitos?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Coidado: Non é posíbel cambiar a %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/he.po b/po/he.po
index fedd809c6..cc7aba878 100644
--- a/po/he.po
+++ b/po/he.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -760,6 +760,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2586,6 +2589,18 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2673,12 +2688,24 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3724,10 +3751,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/hr.po b/po/hr.po
index eab132889..4e2a7e0b7 100644
--- a/po/hr.po
+++ b/po/hr.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 # "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 msgid "Warning: cannot load codepages list"
@@ -760,6 +760,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2586,6 +2589,18 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2673,12 +2688,24 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3720,10 +3747,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/hu.po b/po/hu.po
index fc05c954f..f65e716c0 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: 6bdcf737f9bcb6037ecba892a70fb951_e9eeb40 "
 "<b76b5e2faba6aa74d4498ee4c87ab010_661337>, 2020\n"
@@ -792,6 +792,10 @@ msgstr "Terminál opciók"
 msgid "Arguments parse error!"
 msgstr "Argumentum feldolgozási hiba!"
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "Beépített szerkesztővel"
+
 msgid "No arguments given to the viewer."
 msgstr "Hiányzó paraméterek a nézethez."
 
@@ -2691,6 +2695,23 @@ msgstr ""
 "A(z) \"%s\" forrásfájl adatai nem elérhetők \n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"A(z) \"%s\" forrásfájl adatai nem elérhetők \n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Nem sikerült lekérdezni a(z) \"%s\" \n"
+"célfájl adatait. \n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2805,6 +2826,15 @@ msgstr ""
 "Nem sikerült lezárni a(z) \"%s\" célfájlt. \n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Nem sikerült lekérdezni a(z) \"%s\" \n"
+"célfájl adatait. \n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2814,6 +2844,15 @@ msgstr ""
 "forráskönyvtár adatait. \n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Nem sikerült lekérdezni a(z) \"%s\" \n"
+"forráskönyvtár adatait. \n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3896,10 +3935,12 @@ msgstr "A háttér-shell még aktív. Mégis kilép?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Nem sikerült belépni a(z) \"%s\" könyvtárba.\n"
 
-msgid "With builtin Editor and Aspell support"
-msgstr ""
+#, fuzzy
+msgid "With builtin editor and aspell support"
+msgstr "Beépített szerkesztővel"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "Beépített szerkesztővel"
 
 msgid "With optional subshell support"
diff --git a/po/ia.po b/po/ia.po
index 806e426af..cc912d4a2 100644
--- a/po/ia.po
+++ b/po/ia.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -771,6 +771,9 @@ msgstr "Optiones de terminal"
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr "Nulle parametro passate al visualisator."
 
@@ -2606,6 +2609,20 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Impossibile crear file de fusionamento temporari\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2693,12 +2710,26 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Impossibile crear file de fusionamento temporari\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr "Non pote definir le permissiones correcte pro le directorio %s\n"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3736,10 +3767,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/id.po b/po/id.po
index 0e9a14ea0..edbdca678 100644
--- a/po/id.po
+++ b/po/id.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -782,6 +782,9 @@ msgstr "Opsi terminal"
 msgid "Arguments parse error!"
 msgstr "Kesalahan mengurai argumen!"
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr "Tidak ada argumen yang diberikan kepada viewer"
 
@@ -2623,6 +2626,20 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Gagal membuat temporary merge file\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2710,12 +2727,26 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Gagal membuat temporary merge file\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr "Tak bisa menata hak yang benar bagi direktori %s\n"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3749,10 +3780,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/ie.po b/po/ie.po
index 471851e66..9b99bf154 100644
--- a/po/ie.po
+++ b/po/ie.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -759,6 +759,9 @@ msgstr "Parametres de terminal"
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2589,6 +2592,18 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2676,12 +2691,24 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3719,10 +3746,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/it.po b/po/it.po
index b7a88c143..db46118c4 100644
--- a/po/it.po
+++ b/po/it.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -810,6 +810,10 @@ msgstr "Opzioni terminale"
 msgid "Arguments parse error!"
 msgstr "Errore di analisi argomenti!"
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "Con editor integrato"
+
 msgid "No arguments given to the viewer."
 msgstr "Nessun argomento fornito al visualizzatore"
 
@@ -2726,6 +2730,22 @@ msgstr ""
 "Impossibile ottenere info sul file sorgente \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Impossibile ottenere info sul file sorgente \"%s\"\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Impossibile ottenere info sul file destinazione \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2837,6 +2857,14 @@ msgstr ""
 "Impossibile chiudere il file destinazione \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Impossibile ottenere info sul file destinazione \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2845,6 +2873,14 @@ msgstr ""
 "Impossibile ottenere info sulla directory sorgente \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Impossibile ottenere info sulla directory sorgente \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3936,10 +3972,12 @@ msgstr "La shell è ancora attiva. Esco comunque?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Attenzione: non posso entrare su %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+#, fuzzy
+msgid "With builtin editor and aspell support"
 msgstr "Con editor integrato e supporto Aspell"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "Con editor integrato"
 
 msgid "With optional subshell support"
diff --git a/po/ja.po b/po/ja.po
index 60f58e598..04d65e32f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -774,6 +774,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2604,6 +2607,22 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"ファイル %s が開けません\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"ファイル %s に書き込めません:\n"
+"%s\n"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2691,12 +2710,26 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"ファイル %s に書き込めません:\n"
+"%s\n"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr "ディレクトリ %s のパーミッションを正しく設定できません\n"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3746,10 +3779,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr "警告: %s に変更できません.\n"
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/ka.po b/po/ka.po
index 1ddf0d922..0c46c86e4 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -767,6 +767,9 @@ msgstr "ტერმინალის პარამეტრები"
 msgid "Arguments parse error!"
 msgstr "არგუმენტების დამუშავების შეცდომა!"
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr "მნახველისთვის არგუმენტები გადაცემული არაა."
 
@@ -2602,6 +2605,22 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"ფაილის გახსნის შეცდომა %s\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"ფაილის გახსნის შეცდომა %s\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2689,12 +2708,24 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr "დროებითი საქაღალდის (%s) შექმნა შეუძლებელია: %s\n"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3732,10 +3763,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/kk.po b/po/kk.po
index 136bcc94e..7fc2f426f 100644
--- a/po/kk.po
+++ b/po/kk.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -760,6 +760,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2586,6 +2589,18 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2673,12 +2688,24 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3716,10 +3743,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/ko.po b/po/ko.po
index ec9360247..25ca80f10 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: Seong-ho Cho <darkcircle.0426@gmail.com>, 2023\n"
 "Language-Team: Korean (http://app.transifex.com/mc/mc/language/ko/)\n"
@@ -807,6 +807,10 @@ msgstr "터미널 옵션"
 msgid "Arguments parse error!"
 msgstr "인수 분석 오류!"
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "내장 편집기 포함"
+
 msgid "No arguments given to the viewer."
 msgstr "뷰어에 지정한 인자가 없습니다."
 
@@ -2737,6 +2741,22 @@ msgstr ""
 "\"%s\" 원본 파일을 통계할 수 없음\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"\"%s\" 원본 파일을 통계할 수 없음\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"\"%s\" 대상 파일을 fstat할 수 없음\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2848,6 +2868,14 @@ msgstr ""
 "\"%s\" 대상 파일을 닫을 수 없음\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"\"%s\" 대상 파일을 fstat할 수 없음\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2856,6 +2884,14 @@ msgstr ""
 "\"%s\" 소스 디렉터리를 stat할 수 없음\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"\"%s\" 소스 디렉터리를 stat할 수 없음\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3939,10 +3975,12 @@ msgstr "셸이 아직 활성 상태입니다. 그래도 끝낼까요?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "경고: %s으(로) 변경할 수 없습니다.\n"
 
-msgid "With builtin Editor and Aspell support"
+#, fuzzy
+msgid "With builtin editor and aspell support"
 msgstr "내장 편집기 및 Aspell 지원 포함"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "내장 편집기 포함"
 
 msgid "With optional subshell support"
diff --git a/po/kw.po b/po/kw.po
index 1aedd17e1..936320614 100644
--- a/po/kw.po
+++ b/po/kw.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -765,6 +765,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2591,6 +2594,18 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2678,12 +2693,24 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3737,10 +3764,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/lt.po b/po/lt.po
index f8f0087d2..d3ce9cbed 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -790,6 +790,9 @@ msgstr "Terminalo parinktys"
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2665,6 +2668,22 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Nepavyko pašalinti failo \"%s\"\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Nepavyko sukurti aplanko \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2752,12 +2771,28 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Nepavyko sukurti aplanko \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Nepavyko sukurti aplanko \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3831,10 +3866,10 @@ msgstr "Aplinka vis dar aktyvi. Vis tiek išeiti?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Įspėjimas: nepavyko įeiti į „%s“.\n"
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/lv.po b/po/lv.po
index 0eeaace0e..aea0ff5e6 100644
--- a/po/lv.po
+++ b/po/lv.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -763,6 +763,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2590,6 +2593,22 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Nevar ierakstīt failā %s:\n"
+"%s\n"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Nevar ierakstīt failā %s:\n"
+"%s\n"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2677,12 +2696,26 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Nevar ierakstīt failā %s:\n"
+"%s\n"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3741,10 +3774,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Brīdinājums: Nevarēja pārmainīt uz %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/mc.pot b/po/mc.pot
index d0f68b43f..4197ab3a0 100644
--- a/po/mc.pot
+++ b/po/mc.pot
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mc 4.8.30-111-gb03981f1f\n"
+"Project-Id-Version: mc 4.8.31-63-g2a45e3bcb\n"
 "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n"
-"POT-Creation-Date: 2024-01-14 17:58+0300\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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:220
+#: lib/charsets.c:219
 msgid "Warning: cannot load codepages list"
 msgstr ""
 
-#: lib/charsets.c:223 src/filemanager/boxes.c:387
+#: lib/charsets.c:222 src/filemanager/boxes.c:387
 msgid "7-bit ASCII"
 msgstr ""
 
-#: lib/charsets.c:318 lib/charsets.c:329
+#: lib/charsets.c:317 lib/charsets.c:328
 #, c-format
 msgid "Cannot translate from %s to %s"
 msgstr ""
@@ -85,21 +85,21 @@ msgstr ""
 msgid "FATAL: not a directory:"
 msgstr ""
 
-#: lib/search/hex.c:198
+#: lib/search/hex.c:197
 msgid ""
 "Number out of range (should be in byte range, 0 <= n <= 0xFF, expressed in "
 "hex)"
 msgstr ""
 
-#: lib/search/hex.c:201
+#: lib/search/hex.c:200
 msgid "Invalid character"
 msgstr ""
 
-#: lib/search/hex.c:204
+#: lib/search/hex.c:203
 msgid "Unmatched quotes character"
 msgstr ""
 
-#: lib/search/hex.c:212
+#: lib/search/hex.c:211
 #, c-format
 msgid ""
 "Hex pattern error at position %d:\n"
@@ -123,11 +123,11 @@ msgstr ""
 msgid "Invalid token number %d"
 msgstr ""
 
-#: lib/search/regex.c:340 lib/search/regex.c:838 src/filemanager/ext.c:775
+#: lib/search/regex.c:338 lib/search/regex.c:836 src/filemanager/ext.c:775
 msgid "Regular expression error"
 msgstr ""
 
-#: lib/search/search.c:55 src/diffviewer/ydiff.c:2347 tmp/ydiff.c:2404
+#: lib/search/search.c:55 src/diffviewer/ydiff.c:2346 tmp/ydiff.c:2403
 msgid "No&rmal"
 msgstr ""
 
@@ -630,26 +630,26 @@ msgstr ""
 msgid "GiB"
 msgstr ""
 
-#: lib/utilunix.c:515
+#: lib/utilunix.c:508
 msgid "Cannot create pipe descriptor"
 msgstr ""
 
-#: lib/utilunix.c:528
+#: lib/utilunix.c:521
 msgid "Cannot create pipe streams"
 msgstr ""
 
-#: lib/utilunix.c:607
+#: lib/utilunix.c:600
 #, c-format
 msgid ""
 "Unexpected error in select() reading data from a child process:\n"
 "%s"
 msgstr ""
 
-#: lib/utilunix.c:683
+#: lib/utilunix.c:676
 msgid "Cannot close pipe descriptor (p == NULL)"
 msgstr ""
 
-#: lib/utilunix.c:701
+#: lib/utilunix.c:694
 #, c-format
 msgid ""
 "Unexpected error in waitpid():\n"
@@ -750,54 +750,54 @@ msgstr ""
 msgid "Do you want clean this history?"
 msgstr ""
 
-#: 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
+#: lib/widget/listbox.c:325 src/diffviewer/ydiff.c:3006 src/editor/edit.c:375
+#: src/editor/editcmd.c:180 src/editor/editcmd.c:203 src/editor/editcmd.c:1486
+#: src/editor/editcmd.c:1492 src/filemanager/cmd.c:145
+#: src/filemanager/file.c:1005 src/filemanager/file.c:2013
+#: src/filemanager/filegui.c:481 src/filemanager/filemanager.c:1048
+#: src/filemanager/filemanager.c:1056 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:562 src/vfs/sftpfs/connection.c:574
 #: src/viewer/actions_cmd.c:634 src/viewer/actions_cmd.c:640
-#: src/viewer/search.c:452 tmp/ydiff.c:3069
+#: src/viewer/search.c:452 tmp/ydiff.c:3068
 msgid "&Yes"
 msgstr ""
 
-#: 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
+#: lib/widget/listbox.c:325 src/diffviewer/ydiff.c:3006 src/editor/edit.c:375
+#: src/editor/editcmd.c:180 src/editor/editcmd.c:1486 src/editor/editcmd.c:1492
+#: src/filemanager/cmd.c:145 src/filemanager/file.c:1005
+#: src/filemanager/file.c:2013 src/filemanager/filegui.c:483
+#: src/filemanager/filemanager.c:1048 src/filemanager/filemanager.c:1056
 #: 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:562
 #: src/vfs/sftpfs/connection.c:574 src/viewer/actions_cmd.c:634
-#: src/viewer/actions_cmd.c:640 src/viewer/search.c:453 tmp/ydiff.c:3069
+#: src/viewer/actions_cmd.c:640 src/viewer/search.c:453 tmp/ydiff.c:3068
 msgid "&No"
 msgstr ""
 
 #: lib/widget/quick.h:213 src/editor/editsearch.c:105
-#: 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
+#: src/editor/editsearch.c:1014 src/editor/editwidget.c:156
+#: src/filemanager/boxes.c:1294 src/filemanager/filegui.c:1387
+#: src/filemanager/find.c:605 src/filemanager/layout.c:511 src/main.c:418
 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: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/editcmd.c:377 src/editor/editcmd.c:519 src/editor/editcmd.c:955
+#: src/editor/editcmd.c:1032 src/editor/editcmd.c:1486
+#: src/editor/editcmd.c:1982 src/editor/editcmd.c:2010
 #: 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
 #: src/filemanager/chattr.c:235 src/filemanager/chattr.c:1124
 #: src/filemanager/chmod.c:117 src/filemanager/chmod.c:442
 #: src/filemanager/chown.c:88 src/filemanager/chown.c:314
-#: src/filemanager/cmd.c:1029 src/filemanager/filegui.c:1390
+#: src/filemanager/cmd.c:1033 src/filemanager/filegui.c:1391
 #: src/filemanager/find.c:605 src/filemanager/hotlist.c:185
 #: src/filemanager/hotlist.c:1018 src/filemanager/hotlist.c:1081
-#: src/filemanager/layout.c:512 src/filemanager/panelize.c:172 src/learn.c:261
+#: src/filemanager/layout.c:512 src/filemanager/panelize.c:172 src/learn.c:260
 #: src/viewer/hex.c:430
 msgid "&Cancel"
 msgstr ""
@@ -808,8 +808,8 @@ msgstr ""
 
 #: 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/edit.c:2032 src/editor/editcmd.c:267 src/editor/editcmd.c:277
+#: src/editor/editcmd.c:320 src/editor/editcmd.c:1590 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
@@ -821,123 +821,123 @@ msgstr ""
 msgid "%s (%d)"
 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:3179
-#: src/filemanager/filegui.c:257 src/filemanager/filegui.c:506
+#: lib/widget/wtools.c:704 src/filemanager/file.c:884
+#: src/filemanager/file.c:958 src/filemanager/file.c:960
+#: src/filemanager/file.c:1006 src/filemanager/file.c:3308
+#: src/filemanager/filegui.c:256 src/filemanager/filegui.c:505
 msgid "&Abort"
 msgstr ""
 
-#: src/args.c:102
+#: src/args.c:106
 msgid "Displays the current version"
 msgstr ""
 
-#: src/args.c:110
+#: src/args.c:114
 msgid "Print data directory"
 msgstr ""
 
-#: src/args.c:118
+#: src/args.c:122
 msgid "Print extended info about used data directories"
 msgstr ""
 
-#: src/args.c:127
+#: src/args.c:131
 msgid "Print configure options"
 msgstr ""
 
-#: src/args.c:135
+#: src/args.c:139
 msgid "Print last working directory to specified file"
 msgstr ""
 
-#: src/args.c:136 src/args.c:161 src/args.c:170 src/args.c:254
+#: src/args.c:140 src/args.c:165 src/args.c:174 src/args.c:258
 msgid "<file>"
 msgstr ""
 
-#: src/args.c:143
+#: src/args.c:147
 msgid "Enables subshell support (default)"
 msgstr ""
 
-#: src/args.c:150
+#: src/args.c:154
 msgid "Disables subshell support"
 msgstr ""
 
-#: src/args.c:160
+#: src/args.c:164
 msgid "Log ftp dialog to specified file"
 msgstr ""
 
-#: src/args.c:169
+#: src/args.c:173
 msgid "Launches the file viewer on a file"
 msgstr ""
 
-#: src/args.c:177
+#: src/args.c:181
 msgid "Edit files"
 msgstr ""
 
-#: src/args.c:178
+#: src/args.c:182
 msgid "<file> ..."
 msgstr ""
 
-#: src/args.c:193
+#: src/args.c:197
 msgid "Forces xterm features"
 msgstr ""
 
-#: src/args.c:200
+#: src/args.c:204
 msgid "Disable X11 support"
 msgstr ""
 
-#: src/args.c:207
+#: src/args.c:211
 msgid "Tries to use an old highlight mouse tracking"
 msgstr ""
 
-#: src/args.c:214
+#: src/args.c:218
 msgid "Disable mouse support in text version"
 msgstr ""
 
-#: src/args.c:222
+#: src/args.c:226
 msgid "Tries to use termcap instead of terminfo"
 msgstr ""
 
-#: src/args.c:230
+#: src/args.c:234
 msgid "To run on slow terminals"
 msgstr ""
 
-#: src/args.c:237
+#: src/args.c:241
 msgid "Use stickchars to draw"
 msgstr ""
 
-#: src/args.c:245
+#: src/args.c:249
 msgid "Resets soft keys on HP terminals"
 msgstr ""
 
-#: src/args.c:253
+#: src/args.c:257
 msgid "Load definitions of key bindings from specified file"
 msgstr ""
 
-#: src/args.c:260
+#: src/args.c:264
 msgid "Don't load definitions of key bindings from file, use defaults"
 msgstr ""
 
-#: src/args.c:279
+#: src/args.c:283
 msgid "Requests to run in black and white"
 msgstr ""
 
-#: src/args.c:286
+#: src/args.c:290
 msgid "Request to run in color mode"
 msgstr ""
 
-#: src/args.c:293
+#: src/args.c:297
 msgid "Specifies a color configuration"
 msgstr ""
 
-#: src/args.c:294 src/args.c:301
+#: src/args.c:298 src/args.c:305
 msgid "<string>"
 msgstr ""
 
-#: src/args.c:300
+#: src/args.c:304
 msgid "Show mc with specified skin"
 msgstr ""
 
 #. TRANSLATORS: don't translate keywords
-#: src/args.c:337
+#: src/args.c:341
 msgid ""
 "--colors KEYWORD={FORE},{BACK},{ATTR}:KEYWORD2=...\n"
 "\n"
@@ -961,7 +961,7 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: don't translate color names and attributes
-#: src/args.c:354
+#: src/args.c:358
 msgid ""
 "Standard Colors:\n"
 "   black, gray, red, brightred, green, brightgreen, brown,\n"
@@ -975,55 +975,59 @@ msgid ""
 "   bold, italic, underline, reverse, blink; append more with '+'\n"
 msgstr ""
 
-#: src/args.c:366
+#: src/args.c:370
 msgid "Color options"
 msgstr ""
 
-#: src/args.c:380
+#: src/args.c:385
 msgid "[+lineno] file1[:lineno] [file2[:lineno]...]"
 msgstr ""
 
-#: src/args.c:383 src/filemanager/file.c:172
+#: src/args.c:389 src/filemanager/file.c:170
 msgid "file"
 msgstr ""
 
-#: src/args.c:387
+#: src/args.c:393
 msgid "file1 file2"
 msgstr ""
 
-#: src/args.c:392
+#: src/args.c:398
 msgid "[this_dir] [other_panel_dir]"
 msgstr ""
 
-#: src/args.c:407
+#: src/args.c:413
 msgid ""
 "\n"
 "Please send any bug reports (including the output of 'mc -V')\n"
 "as tickets at www.midnight-commander.org\n"
 msgstr ""
 
-#: src/args.c:411 src/filemanager/filemanager.c:1746 src/textconf.c:144
+#: src/args.c:417 src/filemanager/filemanager.c:1738 src/textconf.c:144
 #, c-format
 msgid "GNU Midnight Commander %s\n"
 msgstr ""
 
-#: src/args.c:664 src/filemanager/boxes.c:694
+#: src/args.c:641 src/filemanager/boxes.c:694
 msgid "Main options"
 msgstr ""
 
-#: src/args.c:670 src/args.c:671
+#: src/args.c:647 src/args.c:648
 msgid "Terminal options"
 msgstr ""
 
-#: src/args.c:686
+#: src/args.c:663
 msgid "Arguments parse error!"
 msgstr ""
 
-#: src/args.c:796
+#: src/args.c:771
+msgid "MC is built without builtin editor."
+msgstr ""
+
+#: src/args.c:778
 msgid "No arguments given to the viewer."
 msgstr ""
 
-#: src/args.c:808
+#: src/args.c:790
 msgid "Two files are required to invoke the diffviewer."
 msgstr ""
 
@@ -1035,7 +1039,7 @@ msgstr ""
 msgid "Reading failed"
 msgstr ""
 
-#: src/background.c:222 src/filemanager/file.c:862 src/filemanager/file.c:962
+#: src/background.c:222 src/filemanager/file.c:853 src/filemanager/file.c:953
 msgid "Background process error"
 msgstr ""
 
@@ -1090,9 +1094,9 @@ msgstr ""
 
 #: 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:902 src/editor/editsearch.c:913
+#: src/editor/editsearch.c:115 src/editor/editsearch.c:601
+#: src/editor/editsearch.c:627 src/editor/editsearch.c:656
+#: src/editor/editsearch.c:898 src/editor/editsearch.c:909
 #: 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"
@@ -1102,14 +1106,14 @@ msgstr ""
 msgid "Search is disabled"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:185 tmp/ydiff.c:168
+#: src/diffviewer/ydiff.c:184 tmp/ydiff.c:167
 #, c-format
 msgid ""
 "Cannot create temporary diff file\n"
 "%s"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2143 tmp/ydiff.c:2200
+#: src/diffviewer/ydiff.c:2142 tmp/ydiff.c:2199
 #, c-format
 msgid ""
 "Cannot create backup file\n"
@@ -1117,149 +1121,149 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2152 tmp/ydiff.c:2209
+#: src/diffviewer/ydiff.c:2151 tmp/ydiff.c:2208
 #, c-format
 msgid ""
 "Cannot create temporary merge file\n"
 "%s"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2348 tmp/ydiff.c:2405
+#: src/diffviewer/ydiff.c:2347 tmp/ydiff.c:2404
 msgid "&Fastest (Assume large files)"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2349 tmp/ydiff.c:2406
+#: src/diffviewer/ydiff.c:2348 tmp/ydiff.c:2405
 msgid "&Minimal (Find a smaller set of change)"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2354 tmp/ydiff.c:2411
+#: src/diffviewer/ydiff.c:2353 tmp/ydiff.c:2410
 msgid "Diff algorithm"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2357 tmp/ydiff.c:2414
+#: src/diffviewer/ydiff.c:2356 tmp/ydiff.c:2413
 msgid "Diff extra options"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2358 tmp/ydiff.c:2415
+#: src/diffviewer/ydiff.c:2357 tmp/ydiff.c:2414
 msgid "&Ignore case"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2359 tmp/ydiff.c:2416
+#: src/diffviewer/ydiff.c:2358 tmp/ydiff.c:2415
 msgid "Ignore tab &expansion"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2360 tmp/ydiff.c:2417
+#: src/diffviewer/ydiff.c:2359 tmp/ydiff.c:2416
 msgid "Ignore &space change"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2361 tmp/ydiff.c:2418
+#: src/diffviewer/ydiff.c:2360 tmp/ydiff.c:2417
 msgid "Ignore all &whitespace"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2362 tmp/ydiff.c:2419
+#: src/diffviewer/ydiff.c:2361 tmp/ydiff.c:2418
 msgid "Strip &trailing carriage return"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2373 tmp/ydiff.c:2430
+#: src/diffviewer/ydiff.c:2372 tmp/ydiff.c:2429
 msgid "Diff Options"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2884 tmp/ydiff.c:2932
+#: src/diffviewer/ydiff.c:2869 tmp/ydiff.c:2931
 msgid "Edit"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2884 tmp/ydiff.c:2932
+#: src/diffviewer/ydiff.c:2869 tmp/ydiff.c:2931
 msgid "Edit is disabled"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2918 tmp/ydiff.c:2966
+#: src/diffviewer/ydiff.c:2903 tmp/ydiff.c:2965
 msgid "Goto line (left)"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2919 tmp/ydiff.c:2967
+#: src/diffviewer/ydiff.c:2904 tmp/ydiff.c:2966
 msgid "Goto line (right)"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2927 src/editor/editcmd.c:1660 tmp/ydiff.c:2975
+#: src/diffviewer/ydiff.c:2912 src/editor/editcmd.c:1673 tmp/ydiff.c:2974
 msgid "Enter line:"
 msgstr ""
 
-#: 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 tmp/ydiff.c:3014
+#: src/diffviewer/ydiff.c:2951 src/editor/editwidget.c:676
+#: src/filemanager/filemanager.c:1626 src/filemanager/tree.c:1176
+#: src/help.c:1170 src/viewer/display.c:90 tmp/ydiff.c:3013
 msgid "ButtonBar|Help"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2967 src/editor/editwidget.c:678
-#: src/viewer/display.c:102 tmp/ydiff.c:3015
+#: src/diffviewer/ydiff.c:2952 src/editor/editwidget.c:677
+#: src/viewer/display.c:102 tmp/ydiff.c:3014
 msgid "ButtonBar|Save"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2968 src/filemanager/filemanager.c:1637
-#: src/viewer/display.c:97 tmp/ydiff.c:3016
+#: src/diffviewer/ydiff.c:2953 src/filemanager/filemanager.c:1629
+#: src/viewer/display.c:97 tmp/ydiff.c:3015
 msgid "ButtonBar|Edit"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2969 tmp/ydiff.c:3017
+#: src/diffviewer/ydiff.c:2954 tmp/ydiff.c:3016
 msgid "ButtonBar|Merge"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2970 src/editor/editwidget.c:683
-#: src/viewer/display.c:112 tmp/ydiff.c:3018
+#: src/diffviewer/ydiff.c:2955 src/editor/editwidget.c:682
+#: src/viewer/display.c:112 tmp/ydiff.c:3017
 msgid "ButtonBar|Search"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:2971 tmp/ydiff.c:3019
+#: src/diffviewer/ydiff.c:2956 tmp/ydiff.c:3018
 msgid "ButtonBar|Options"
 msgstr ""
 
-#: 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 tmp/ydiff.c:3020
+#: src/diffviewer/ydiff.c:2957 src/editor/editwidget.c:685
+#: src/filemanager/filemanager.c:1635 src/help.c:1179 src/viewer/display.c:121
+#: src/viewer/display.c:124 tmp/ydiff.c:3019
 msgid "ButtonBar|Quit"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:3018 src/editor/editcmd.c:1479
-#: src/viewer/actions_cmd.c:632 src/viewer/actions_cmd.c:638 tmp/ydiff.c:3066
+#: src/diffviewer/ydiff.c:3003 src/editor/editcmd.c:1492
+#: src/viewer/actions_cmd.c:632 src/viewer/actions_cmd.c:638 tmp/ydiff.c:3065
 msgid "Quit"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:3019 tmp/ydiff.c:3067
+#: src/diffviewer/ydiff.c:3004 tmp/ydiff.c:3066
 msgid "File(s) was modified. Save with exit?"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:3020 tmp/ydiff.c:3068
+#: src/diffviewer/ydiff.c:3005 tmp/ydiff.c:3067
 msgid ""
 "Midnight Commander is being shut down.\n"
 "Save modified file(s)?"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:3352 src/diffviewer/ydiff.c:3355 tmp/ydiff.c:3400
-#: tmp/ydiff.c:3403
+#: src/diffviewer/ydiff.c:3337 src/diffviewer/ydiff.c:3340 tmp/ydiff.c:3399
+#: tmp/ydiff.c:3402
 msgid "Diff:"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:3475 src/diffviewer/ydiff.c:3485
-#: src/diffviewer/ydiff.c:3505 src/diffviewer/ydiff.c:3522 tmp/ydiff.c:3524
-#: tmp/ydiff.c:3534 tmp/ydiff.c:3554 tmp/ydiff.c:3571
+#: src/diffviewer/ydiff.c:3468 src/diffviewer/ydiff.c:3478
+#: src/diffviewer/ydiff.c:3498 src/diffviewer/ydiff.c:3515 tmp/ydiff.c:3523
+#: tmp/ydiff.c:3533 tmp/ydiff.c:3553 tmp/ydiff.c:3570
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:3511 src/diffviewer/ydiff.c:3528
-#: src/filemanager/file.c:1830 src/viewer/mcviewer.c:354 tmp/ydiff.c:3560
-#: tmp/ydiff.c:3577
+#: src/diffviewer/ydiff.c:3504 src/diffviewer/ydiff.c:3521
+#: src/filemanager/file.c:1821 src/viewer/mcviewer.c:356 tmp/ydiff.c:3559
+#: tmp/ydiff.c:3576
 #, c-format
 msgid ""
 "Cannot stat \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:3537 tmp/ydiff.c:3586
+#: src/diffviewer/ydiff.c:3530 tmp/ydiff.c:3585
 msgid "Diff viewer: invalid mode"
 msgstr ""
 
-#: src/diffviewer/ydiff.c:3563 tmp/ydiff.c:3616
+#: src/diffviewer/ydiff.c:3556 tmp/ydiff.c:3615
 msgid "Two files are needed to compare"
 msgstr ""
 
@@ -1304,10 +1308,10 @@ msgid ""
 msgstr ""
 
 #: 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/editor/editcmd.c:375 src/editor/editcmd.c:517 src/editor/editcmd.c:954
+#: src/editor/editcmd.c:1979 src/editor/editcmd.c:2007 src/editor/etags.c:373
+#: src/execute.c:137 src/filemanager/ext.c:792 src/filemanager/file.c:2526
+#: src/filemanager/panel.c:4708 src/help.c:365 src/main.c:415
 #: src/subshell/common.c:1651 src/vfs/sftpfs/connection.c:562
 #: src/viewer/actions_cmd.c:434
 msgid "Warning"
@@ -1331,281 +1335,281 @@ msgstr ""
 msgid "The file has been modified in the meantime. Save anyway?"
 msgstr ""
 
-#: src/editor/editcmd.c:264
+#: src/editor/editcmd.c:266
 #, c-format
 msgid "Error writing to pipe: %s"
 msgstr ""
 
-#: src/editor/editcmd.c:274
+#: src/editor/editcmd.c:276
 #, c-format
 msgid "Cannot open pipe for writing: %s"
 msgstr ""
 
-#: src/editor/editcmd.c:317
+#: src/editor/editcmd.c:319
 #, c-format
 msgid "Cannot open file for writing: %s"
 msgstr ""
 
-#: src/editor/editcmd.c:374
+#: src/editor/editcmd.c:376
 msgid "The file you are saving does not end with a newline."
 msgstr ""
 
-#: 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
+#: src/editor/editcmd.c:377 src/editor/editcmd.c:519 src/editor/editcmd.c:1981
+#: src/editor/editcmd.c:2009 src/editor/etags.c:375
 msgid "C&ontinue"
 msgstr ""
 
-#: src/editor/editcmd.c:388
+#: src/editor/editcmd.c:390
 msgid "&Do not change"
 msgstr ""
 
-#: src/editor/editcmd.c:389
+#: src/editor/editcmd.c:391
 msgid "&Unix format (LF)"
 msgstr ""
 
-#: src/editor/editcmd.c:390
+#: src/editor/editcmd.c:392
 msgid "&Windows/DOS format (CR LF)"
 msgstr ""
 
-#: src/editor/editcmd.c:391
+#: src/editor/editcmd.c:393
 msgid "&Macintosh format (CR)"
 msgstr ""
 
-#: 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
+#: src/editor/editcmd.c:398 src/editor/editcmd.c:1054 src/editor/editcmd.c:1714
+#: src/editor/editcmd.c:1745 src/filemanager/cmd.c:739
 msgid "Enter file name:"
 msgstr ""
 
-#: src/editor/editcmd.c:400
+#: src/editor/editcmd.c:402
 msgid "Change line breaks to:"
 msgstr ""
 
-#: src/editor/editcmd.c:410
+#: src/editor/editcmd.c:412
 msgid "Save As"
 msgstr ""
 
-#: src/editor/editcmd.c:851
+#: src/editor/editcmd.c:853
 msgid "&Quick save"
 msgstr ""
 
-#: src/editor/editcmd.c:852
+#: src/editor/editcmd.c:854
 msgid "&Safe save"
 msgstr ""
 
-#: src/editor/editcmd.c:853
+#: src/editor/editcmd.c:855
 msgid "&Do backups with following extension:"
 msgstr ""
 
-#: src/editor/editcmd.c:872
+#: src/editor/editcmd.c:874
 msgid "Check &POSIX new line"
 msgstr ""
 
-#: src/editor/editcmd.c:881
+#: src/editor/editcmd.c:883
 msgid "Edit Save Mode"
 msgstr ""
 
-#: src/editor/editcmd.c:935 src/editor/editcmd.c:994
+#: src/editor/editcmd.c:937 src/editor/editcmd.c:996
 msgid "Save as"
 msgstr ""
 
-#: src/editor/editcmd.c:937
+#: src/editor/editcmd.c:939
 msgid "Cannot save: destination is not a regular file"
 msgstr ""
 
-#: src/editor/editcmd.c:953
+#: src/editor/editcmd.c:955
 msgid "A file already exists with this name"
 msgstr ""
 
-#: src/editor/editcmd.c:953
+#: src/editor/editcmd.c:955
 msgid "&Overwrite"
 msgstr ""
 
-#: src/editor/editcmd.c:994 src/editor/editcmd.c:1711
+#: src/editor/editcmd.c:996 src/editor/editcmd.c:1724
 msgid "Cannot save file"
 msgstr ""
 
-#: src/editor/editcmd.c:1028
+#: src/editor/editcmd.c:1030
 #, c-format
 msgid "Confirm save file: \"%s\""
 msgstr ""
 
-#: src/editor/editcmd.c:1030 src/viewer/hex.c:418 src/viewer/hex.c:430
+#: src/editor/editcmd.c:1032 src/viewer/hex.c:418 src/viewer/hex.c:430
 msgid "Save file"
 msgstr ""
 
-#: src/editor/editcmd.c:1030 src/editor/editmenu.c:80 src/learn.c:195
-#: src/learn.c:260
+#: src/editor/editcmd.c:1032 src/editor/editmenu.c:78 src/learn.c:194
+#: src/learn.c:259
 msgid "&Save"
 msgstr ""
 
-#: src/editor/editcmd.c:1052
+#: src/editor/editcmd.c:1054
 msgid "Load"
 msgstr ""
 
-#: src/editor/editcmd.c:1135
+#: src/editor/editcmd.c:1142
 msgid "Syntax file edit"
 msgstr ""
 
-#: src/editor/editcmd.c:1136
+#: src/editor/editcmd.c:1143
 msgid "Which syntax file you want to edit?"
 msgstr ""
 
-#: 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
+#: src/editor/editcmd.c:1144 src/editor/editcmd.c:1195
+#: src/filemanager/cmd.c:838 src/filemanager/cmd.c:879
+#: src/filemanager/cmd.c:937
 msgid "&User"
 msgstr ""
 
-#: src/editor/editcmd.c:1137 src/editor/editcmd.c:1183
+#: src/editor/editcmd.c:1144 src/editor/editcmd.c:1195
 msgid "&System wide"
 msgstr ""
 
-#: src/editor/editcmd.c:1181 src/filemanager/cmd.c:873
+#: src/editor/editcmd.c:1193 src/filemanager/cmd.c:877
 msgid "Menu edit"
 msgstr ""
 
-#: src/editor/editcmd.c:1182 src/filemanager/cmd.c:874
+#: src/editor/editcmd.c:1194 src/filemanager/cmd.c:878
 msgid "Which menu file do you want to edit?"
 msgstr ""
 
-#: src/editor/editcmd.c:1183 src/filemanager/cmd.c:875
+#: src/editor/editcmd.c:1195 src/filemanager/cmd.c:879
 msgid "&Local"
 msgstr ""
 
-#: src/editor/editcmd.c:1454 src/editor/editwidget.c:388
+#: src/editor/editcmd.c:1467 src/editor/editwidget.c:387
 msgid "[NoName]"
 msgstr ""
 
-#: src/editor/editcmd.c:1472
+#: src/editor/editcmd.c:1485
 #, c-format
 msgid ""
 "File %s was modified.\n"
 "Save before close?"
 msgstr ""
 
-#: src/editor/editcmd.c:1473
+#: src/editor/editcmd.c:1486
 msgid "Close file"
 msgstr ""
 
-#: src/editor/editcmd.c:1477
+#: src/editor/editcmd.c:1490
 #, c-format
 msgid ""
 "Midnight Commander is being shut down.\n"
 "Save modified file %s?"
 msgstr ""
 
-#: src/editor/editcmd.c:1577
+#: src/editor/editcmd.c:1590
 msgid "This function is not implemented"
 msgstr ""
 
-#: src/editor/editcmd.c:1592
+#: src/editor/editcmd.c:1605
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/editor/editcmd.c:1592 src/editor/editcmd.c:1616
+#: src/editor/editcmd.c:1605 src/editor/editcmd.c:1629
 msgid "Unable to save to file"
 msgstr ""
 
-#: src/editor/editcmd.c:1616
+#: src/editor/editcmd.c:1629
 msgid "Cut to clipboard"
 msgstr ""
 
-#: src/editor/editcmd.c:1660
+#: src/editor/editcmd.c:1673
 msgid "Goto line"
 msgstr ""
 
-#: src/editor/editcmd.c:1701 src/editor/editcmd.c:1711
+#: src/editor/editcmd.c:1714 src/editor/editcmd.c:1724
 msgid "Save block"
 msgstr ""
 
-#: src/editor/editcmd.c:1732 src/editor/editcmd.c:1747
+#: src/editor/editcmd.c:1745 src/editor/editcmd.c:1760
 msgid "Insert file"
 msgstr ""
 
-#: src/editor/editcmd.c:1747
+#: src/editor/editcmd.c:1760
 msgid "Cannot insert file"
 msgstr ""
 
-#: src/editor/editcmd.c:1768
+#: src/editor/editcmd.c:1781
 msgid "Sort block"
 msgstr ""
 
-#: src/editor/editcmd.c:1768
+#: src/editor/editcmd.c:1781
 msgid "You must first highlight a block of text"
 msgstr ""
 
-#: src/editor/editcmd.c:1776
+#: src/editor/editcmd.c:1789
 msgid "Run sort"
 msgstr ""
 
-#: src/editor/editcmd.c:1777
+#: src/editor/editcmd.c:1790
 msgid "Enter sort options (see sort(1) manpage) separated by whitespace:"
 msgstr ""
 
-#: src/editor/editcmd.c:1797 src/editor/editcmd.c:1804
+#: src/editor/editcmd.c:1810 src/editor/editcmd.c:1817
 msgid "Sort"
 msgstr ""
 
-#: src/editor/editcmd.c:1797
+#: src/editor/editcmd.c:1810
 msgid "Cannot execute sort command"
 msgstr ""
 
-#: src/editor/editcmd.c:1803
+#: src/editor/editcmd.c:1816
 #, c-format
 msgid "Sort returned non-zero: %s"
 msgstr ""
 
-#: src/editor/editcmd.c:1840
+#: src/editor/editcmd.c:1853
 msgid "Paste output of external command"
 msgstr ""
 
-#: src/editor/editcmd.c:1841
+#: src/editor/editcmd.c:1854
 msgid "Enter shell command(s):"
 msgstr ""
 
-#: src/editor/editcmd.c:1858
+#: src/editor/editcmd.c:1871
 msgid "External command"
 msgstr ""
 
-#: src/editor/editcmd.c:1858
+#: src/editor/editcmd.c:1871
 msgid "Cannot execute command"
 msgstr ""
 
-#: src/editor/editcmd.c:1903
+#: src/editor/editcmd.c:1916
 msgid "mail -s <subject> -c <cc> <to>"
 msgstr ""
 
-#: src/editor/editcmd.c:1904
+#: src/editor/editcmd.c:1917
 msgid "To"
 msgstr ""
 
-#: src/editor/editcmd.c:1907
+#: src/editor/editcmd.c:1920
 msgid "Subject"
 msgstr ""
 
-#: src/editor/editcmd.c:1910
+#: src/editor/editcmd.c:1923
 msgid "Copies to"
 msgstr ""
 
-#: src/editor/editcmd.c:1921
+#: src/editor/editcmd.c:1934
 msgid "Mail"
 msgstr ""
 
-#: src/editor/editcmd.c:1955
+#: src/editor/editcmd.c:1968
 msgid "Insert literal"
 msgstr ""
 
-#: src/editor/editcmd.c:1956
+#: src/editor/editcmd.c:1969
 msgid "Press any key:"
 msgstr ""
 
-#: src/editor/editcmd.c:1967 src/editor/editcmd.c:1996 src/editor/etags.c:374
+#: src/editor/editcmd.c:1980 src/editor/editcmd.c:2008 src/editor/etags.c:374
 msgid ""
 "Current text was modified without a file save.\n"
 "Continue discards these changes."
 msgstr ""
 
-#: src/editor/editcmd.c:2049
+#: src/editor/editcmd.c:2060
 msgid "Cancel"
 msgstr ""
 
@@ -1613,7 +1617,7 @@ msgstr ""
 msgid "Collect completions"
 msgstr ""
 
-#: src/editor/editdraw.c:256 src/editor/editwidget.c:334
+#: src/editor/editdraw.c:256 src/editor/editwidget.c:333
 msgid "NoName"
 msgstr ""
 
@@ -1645,300 +1649,300 @@ msgstr ""
 msgid "Repeat times:"
 msgstr ""
 
-#: src/editor/editmenu.c:75
+#: src/editor/editmenu.c:73
 msgid "&Open file..."
 msgstr ""
 
-#: src/editor/editmenu.c:76
+#: src/editor/editmenu.c:74
 msgid "&New"
 msgstr ""
 
-#: src/editor/editmenu.c:77
+#: src/editor/editmenu.c:75
 msgid "&Close"
 msgstr ""
 
-#: src/editor/editmenu.c:78
+#: src/editor/editmenu.c:76
 msgid "&History..."
 msgstr ""
 
-#: src/editor/editmenu.c:81
+#: src/editor/editmenu.c:79
 msgid "Save &as..."
 msgstr ""
 
-#: src/editor/editmenu.c:83
+#: src/editor/editmenu.c:81
 msgid "&Insert file..."
 msgstr ""
 
-#: src/editor/editmenu.c:84
+#: src/editor/editmenu.c:82
 msgid "Cop&y to file..."
 msgstr ""
 
-#: src/editor/editmenu.c:86
+#: src/editor/editmenu.c:84
 msgid "&User menu..."
 msgstr ""
 
-#: src/editor/editmenu.c:88
+#: src/editor/editmenu.c:86
 msgid "A&bout..."
 msgstr ""
 
-#: src/editor/editmenu.c:90 src/filemanager/find.c:194 src/main.c:414
+#: src/editor/editmenu.c:88 src/filemanager/find.c:194 src/main.c:418
 msgid "&Quit"
 msgstr ""
 
-#: src/editor/editmenu.c:102
+#: src/editor/editmenu.c:100
 msgid "&Undo"
 msgstr ""
 
-#: src/editor/editmenu.c:103
+#: src/editor/editmenu.c:101
 msgid "&Redo"
 msgstr ""
 
-#: src/editor/editmenu.c:105
+#: src/editor/editmenu.c:103
 msgid "&Toggle ins/overw"
 msgstr ""
 
-#: src/editor/editmenu.c:107
+#: src/editor/editmenu.c:105
 msgid "To&ggle mark"
 msgstr ""
 
-#: src/editor/editmenu.c:108
+#: src/editor/editmenu.c:106
 msgid "&Mark columns"
 msgstr ""
 
-#: src/editor/editmenu.c:109
+#: src/editor/editmenu.c:107
 msgid "Mark &all"
 msgstr ""
 
-#: src/editor/editmenu.c:110
+#: src/editor/editmenu.c:108
 msgid "Unmar&k"
 msgstr ""
 
-#: src/editor/editmenu.c:112
+#: src/editor/editmenu.c:110
 msgid "Cop&y"
 msgstr ""
 
-#: src/editor/editmenu.c:113
+#: src/editor/editmenu.c:111
 msgid "Mo&ve"
 msgstr ""
 
-#: src/editor/editmenu.c:114 src/filemanager/file.c:2711
-#: src/filemanager/file.c:2767 src/filemanager/filemanager.c:251
+#: src/editor/editmenu.c:112 src/filemanager/file.c:2776
+#: src/filemanager/file.c:2832 src/filemanager/filemanager.c:251
 msgid "&Delete"
 msgstr ""
 
-#: src/editor/editmenu.c:116
+#: src/editor/editmenu.c:114
 msgid "Co&py to clipfile"
 msgstr ""
 
-#: src/editor/editmenu.c:117
+#: src/editor/editmenu.c:115
 msgid "&Cut to clipfile"
 msgstr ""
 
-#: src/editor/editmenu.c:118
+#: src/editor/editmenu.c:116
 msgid "Pa&ste from clipfile"
 msgstr ""
 
-#: src/editor/editmenu.c:120
+#: src/editor/editmenu.c:118
 msgid "&Beginning"
 msgstr ""
 
-#: src/editor/editmenu.c:121
+#: src/editor/editmenu.c:119
 msgid "&End"
 msgstr ""
 
-#: src/editor/editmenu.c:133
+#: src/editor/editmenu.c:131
 msgid "&Search..."
 msgstr ""
 
-#: src/editor/editmenu.c:134
+#: src/editor/editmenu.c:132
 msgid "Search &again"
 msgstr ""
 
-#: src/editor/editmenu.c:135
+#: src/editor/editmenu.c:133
 msgid "&Replace..."
 msgstr ""
 
-#: src/editor/editmenu.c:137
+#: src/editor/editmenu.c:135
 msgid "&Toggle bookmark"
 msgstr ""
 
-#: src/editor/editmenu.c:138
+#: src/editor/editmenu.c:136
 msgid "&Next bookmark"
 msgstr ""
 
-#: src/editor/editmenu.c:139
+#: src/editor/editmenu.c:137
 msgid "&Prev bookmark"
 msgstr ""
 
-#: src/editor/editmenu.c:140
+#: src/editor/editmenu.c:138
 msgid "&Flush bookmarks"
 msgstr ""
 
-#: src/editor/editmenu.c:152
+#: src/editor/editmenu.c:150
 msgid "&Go to line..."
 msgstr ""
 
-#: src/editor/editmenu.c:153
+#: src/editor/editmenu.c:151
 msgid "&Toggle line state"
 msgstr ""
 
-#: src/editor/editmenu.c:155
+#: src/editor/editmenu.c:153
 msgid "Go to matching &bracket"
 msgstr ""
 
-#: src/editor/editmenu.c:157
+#: src/editor/editmenu.c:155
 msgid "Toggle s&yntax highlighting"
 msgstr ""
 
-#: src/editor/editmenu.c:159
+#: src/editor/editmenu.c:157
 msgid "&Find declaration"
 msgstr ""
 
-#: src/editor/editmenu.c:160
+#: src/editor/editmenu.c:158
 msgid "Back from &declaration"
 msgstr ""
 
-#: src/editor/editmenu.c:161
+#: src/editor/editmenu.c:159
 msgid "For&ward to declaration"
 msgstr ""
 
-#: src/editor/editmenu.c:164
+#: src/editor/editmenu.c:162
 msgid "Encod&ing..."
 msgstr ""
 
-#: src/editor/editmenu.c:167
+#: src/editor/editmenu.c:165
 msgid "&Refresh screen"
 msgstr ""
 
-#: src/editor/editmenu.c:171
+#: src/editor/editmenu.c:169
 msgid "&Start/Stop record macro"
 msgstr ""
 
-#: src/editor/editmenu.c:172
+#: src/editor/editmenu.c:170
 msgid "Delete macr&o..."
 msgstr ""
 
-#: src/editor/editmenu.c:175
+#: src/editor/editmenu.c:173
 msgid "Record/Repeat &actions"
 msgstr ""
 
-#: src/editor/editmenu.c:180
+#: src/editor/editmenu.c:178
 msgid "S&pell check"
 msgstr ""
 
-#: src/editor/editmenu.c:182
+#: src/editor/editmenu.c:180
 msgid "C&heck word"
 msgstr ""
 
-#: src/editor/editmenu.c:185
+#: src/editor/editmenu.c:183
 msgid "Change spelling &language..."
 msgstr ""
 
-#: src/editor/editmenu.c:190
+#: src/editor/editmenu.c:188
 msgid "&Mail..."
 msgstr ""
 
-#: src/editor/editmenu.c:203
+#: src/editor/editmenu.c:201
 msgid "Insert &literal..."
 msgstr ""
 
-#: src/editor/editmenu.c:204
+#: src/editor/editmenu.c:202
 msgid "Insert &date/time"
 msgstr ""
 
-#: src/editor/editmenu.c:206
+#: src/editor/editmenu.c:204
 msgid "&Format paragraph"
 msgstr ""
 
-#: src/editor/editmenu.c:207
+#: src/editor/editmenu.c:205
 msgid "&Sort..."
 msgstr ""
 
-#: src/editor/editmenu.c:209
+#: src/editor/editmenu.c:207
 msgid "&Paste output of..."
 msgstr ""
 
-#: src/editor/editmenu.c:210
+#: src/editor/editmenu.c:208
 msgid "&External formatter"
 msgstr ""
 
-#: src/editor/editmenu.c:225 src/filemanager/hotlist.c:197
+#: src/editor/editmenu.c:223 src/filemanager/hotlist.c:197
 msgid "&Move"
 msgstr ""
 
-#: src/editor/editmenu.c:226
+#: src/editor/editmenu.c:224
 msgid "&Resize"
 msgstr ""
 
-#: src/editor/editmenu.c:228
+#: src/editor/editmenu.c:226
 msgid "&Toggle fullscreen"
 msgstr ""
 
-#: src/editor/editmenu.c:230
+#: src/editor/editmenu.c:228
 msgid "&Next"
 msgstr ""
 
-#: src/editor/editmenu.c:231
+#: src/editor/editmenu.c:229
 msgid "&Previous"
 msgstr ""
 
-#: src/editor/editmenu.c:232
+#: src/editor/editmenu.c:230
 msgid "&List..."
 msgstr ""
 
-#: src/editor/editmenu.c:244
+#: src/editor/editmenu.c:242
 msgid "&General..."
 msgstr ""
 
-#: src/editor/editmenu.c:245
+#: src/editor/editmenu.c:243
 msgid "Save &mode..."
 msgstr ""
 
-#: src/editor/editmenu.c:246 src/filemanager/filemanager.c:335
+#: src/editor/editmenu.c:244 src/filemanager/filemanager.c:335
 msgid "Learn &keys..."
 msgstr ""
 
-#: src/editor/editmenu.c:248
+#: src/editor/editmenu.c:246
 msgid "Syntax &highlighting..."
 msgstr ""
 
-#: src/editor/editmenu.c:250
+#: src/editor/editmenu.c:248
 msgid "S&yntax file"
 msgstr ""
 
-#: src/editor/editmenu.c:251
+#: src/editor/editmenu.c:249
 msgid "&Menu file"
 msgstr ""
 
-#: src/editor/editmenu.c:253 src/filemanager/filemanager.c:340
+#: src/editor/editmenu.c:251 src/filemanager/filemanager.c:340
 msgid "&Save setup"
 msgstr ""
 
-#: src/editor/editmenu.c:277 src/filemanager/filemanager.c:352
+#: src/editor/editmenu.c:275 src/filemanager/filemanager.c:352
 msgid "&File"
 msgstr ""
 
-#: src/editor/editmenu.c:279 src/filemanager/filemanager.c:236
+#: src/editor/editmenu.c:277 src/filemanager/filemanager.c:236
 msgid "&Edit"
 msgstr ""
 
-#: src/editor/editmenu.c:281
+#: src/editor/editmenu.c:279
 msgid "&Search"
 msgstr ""
 
-#: src/editor/editmenu.c:284 src/filemanager/filemanager.c:354
+#: src/editor/editmenu.c:282 src/filemanager/filemanager.c:354
 msgid "&Command"
 msgstr ""
 
-#: src/editor/editmenu.c:286
+#: src/editor/editmenu.c:284
 msgid "For&mat"
 msgstr ""
 
-#: src/editor/editmenu.c:288
+#: src/editor/editmenu.c:286
 msgid "&Window"
 msgstr ""
 
-#: src/editor/editmenu.c:290 src/filemanager/filemanager.c:356
+#: src/editor/editmenu.c:288 src/filemanager/filemanager.c:356
 msgid "&Options"
 msgstr ""
 
@@ -2043,8 +2047,8 @@ msgstr ""
 msgid "Enter replacement string:"
 msgstr ""
 
-#: src/editor/editsearch.c:195 src/editor/editsearch.c:978
-#: src/editor/editsearch.c:1018 src/editor/editsearch.c:1030
+#: src/editor/editsearch.c:195 src/editor/editsearch.c:974
+#: src/editor/editsearch.c:1014 src/editor/editsearch.c:1026
 msgid "Replace"
 msgstr ""
 
@@ -2056,15 +2060,15 @@ msgstr ""
 msgid "&Replace"
 msgstr ""
 
-#: src/editor/editsearch.c:250 src/filemanager/file.c:1014
-#: src/filemanager/filegui.c:495
+#: src/editor/editsearch.c:250 src/filemanager/file.c:1005
+#: src/filemanager/filegui.c:494
 msgid "A&ll"
 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:3180
-#: src/filemanager/filegui.c:254
+#: src/filemanager/file.c:884 src/filemanager/file.c:957
+#: src/filemanager/file.c:960 src/filemanager/file.c:3309
+#: src/filemanager/filegui.c:253
 msgid "&Skip"
 msgstr ""
 
@@ -2072,66 +2076,66 @@ msgstr ""
 msgid "Confirm replace"
 msgstr ""
 
-#: src/editor/editsearch.c:749 src/viewer/search.c:95
+#: src/editor/editsearch.c:750 src/viewer/search.c:95
 #, c-format
 msgid "Searching %s: %3d%%"
 msgstr ""
 
-#: src/editor/editsearch.c:752 src/filemanager/find.c:1358
+#: src/editor/editsearch.c:753 src/filemanager/find.c:1358
 #: src/viewer/search.c:98
 #, c-format
 msgid "Searching %s"
 msgstr ""
 
-#: src/editor/editsearch.c:1030
+#: src/editor/editsearch.c:1026
 #, c-format
 msgid "%ld replacements made"
 msgstr ""
 
-#: src/editor/editwidget.c:152
+#: src/editor/editwidget.c:151
 msgid ""
 "A user friendly text editor\n"
 "written for the Midnight Commander."
 msgstr ""
 
-#: src/editor/editwidget.c:155
+#: src/editor/editwidget.c:154
 msgid "Copyright (C) 1996-2024 the Free Software Foundation"
 msgstr ""
 
-#: src/editor/editwidget.c:165
+#: src/editor/editwidget.c:164
 msgid "About"
 msgstr ""
 
-#: src/editor/editwidget.c:325
+#: src/editor/editwidget.c:324
 msgid "Open files"
 msgstr ""
 
-#: src/editor/editwidget.c:392 src/editor/editwidget.c:395
+#: src/editor/editwidget.c:391 src/editor/editwidget.c:394
 msgid "Edit: "
 msgstr ""
 
-#: src/editor/editwidget.c:679
+#: src/editor/editwidget.c:678
 msgid "ButtonBar|Mark"
 msgstr ""
 
-#: src/editor/editwidget.c:680
+#: src/editor/editwidget.c:679
 msgid "ButtonBar|Replac"
 msgstr ""
 
-#: src/editor/editwidget.c:681 src/filemanager/filemanager.c:1638
+#: src/editor/editwidget.c:680 src/filemanager/filemanager.c:1630
 #: src/filemanager/tree.c:1181
 msgid "ButtonBar|Copy"
 msgstr ""
 
-#: src/editor/editwidget.c:682
+#: src/editor/editwidget.c:681
 msgid "ButtonBar|Move"
 msgstr ""
 
-#: src/editor/editwidget.c:684 src/filemanager/filemanager.c:1641
+#: src/editor/editwidget.c:683 src/filemanager/filemanager.c:1633
 msgid "ButtonBar|Delete"
 msgstr ""
 
-#: src/editor/editwidget.c:685 src/filemanager/filemanager.c:1642
+#: src/editor/editwidget.c:684 src/filemanager/filemanager.c:1634
 msgid "ButtonBar|PullDn"
 msgstr ""
 
@@ -2297,17 +2301,17 @@ msgstr ""
 msgid "Cannot fetch a local copy of %s"
 msgstr ""
 
-#: src/execute.c:439 src/filemanager/command.c:127
+#: src/execute.c:441 src/filemanager/command.c:127
 msgid "The shell is already running a command"
 msgstr ""
 
-#: src/execute.c:466
+#: src/execute.c:468
 msgid ""
 "Not an xterm or Linux console;\n"
 "the subshell cannot be toggled."
 msgstr ""
 
-#: src/execute.c:505
+#: src/execute.c:507
 msgid "Type 'exit' to return to the Midnight Commander"
 msgstr ""
 
@@ -2375,7 +2379,7 @@ 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/filemanager/file.c:966 src/viewer/hex.c:430
+#: src/filemanager/chown.c:313 src/filemanager/file.c:957 src/viewer/hex.c:430
 msgid "&Retry"
 msgstr ""
 
@@ -2396,7 +2400,7 @@ msgid "Skins"
 msgstr ""
 
 #: src/filemanager/boxes.c:382 src/filemanager/boxes.c:1017
-#: src/selcodepage.c:103
+#: src/selcodepage.c:108
 msgid "Other 8 bit"
 msgstr ""
 
@@ -2722,75 +2726,75 @@ msgstr ""
 msgid "Input / display codepage:"
 msgstr ""
 
-#: src/filemanager/boxes.c:1090 src/filemanager/tree.c:1131
+#: src/filemanager/boxes.c:1091 src/filemanager/tree.c:1131
 msgid "Directory tree"
 msgstr ""
 
-#: src/filemanager/boxes.c:1140
+#: src/filemanager/boxes.c:1142
 msgid "Timeout for freeing VFSs (sec):"
 msgstr ""
 
-#: src/filemanager/boxes.c:1145
+#: src/filemanager/boxes.c:1147
 msgid "FTP anonymous password:"
 msgstr ""
 
-#: src/filemanager/boxes.c:1148
+#: src/filemanager/boxes.c:1150
 msgid "FTP directory cache timeout (sec):"
 msgstr ""
 
-#: src/filemanager/boxes.c:1151
+#: src/filemanager/boxes.c:1153
 msgid "&Always use ftp proxy:"
 msgstr ""
 
-#: src/filemanager/boxes.c:1155
+#: src/filemanager/boxes.c:1157
 msgid "&Use ~/.netrc"
 msgstr ""
 
-#: src/filemanager/boxes.c:1156
+#: src/filemanager/boxes.c:1158
 msgid "Use &passive mode"
 msgstr ""
 
-#: src/filemanager/boxes.c:1157
+#: src/filemanager/boxes.c:1159
 msgid "Use passive mode over pro&xy"
 msgstr ""
 
-#: src/filemanager/boxes.c:1168
+#: src/filemanager/boxes.c:1170
 msgid "Virtual File System Setting"
 msgstr ""
 
-#: src/filemanager/boxes.c:1223
+#: src/filemanager/boxes.c:1225
 msgid "cd"
 msgstr ""
 
-#: src/filemanager/boxes.c:1231
+#: src/filemanager/boxes.c:1233
 msgid "Quick cd"
 msgstr ""
 
-#: src/filemanager/boxes.c:1246
+#: src/filemanager/boxes.c:1248
 msgid "Existing filename (filename symlink will point to):"
 msgstr ""
 
-#: src/filemanager/boxes.c:1250
+#: src/filemanager/boxes.c:1252
 msgid "Symbolic link filename:"
 msgstr ""
 
-#: src/filemanager/boxes.c:1261
+#: src/filemanager/boxes.c:1263
 msgid "Symbolic link"
 msgstr ""
 
-#: src/filemanager/boxes.c:1289
+#: src/filemanager/boxes.c:1291
 msgid "&Stop"
 msgstr ""
 
-#: src/filemanager/boxes.c:1290
+#: src/filemanager/boxes.c:1292
 msgid "&Resume"
 msgstr ""
 
-#: src/filemanager/boxes.c:1291
+#: src/filemanager/boxes.c:1293
 msgid "&Kill"
 msgstr ""
 
-#: src/filemanager/boxes.c:1321
+#: src/filemanager/boxes.c:1323
 msgid "Background jobs"
 msgstr ""
 
@@ -3092,126 +3096,126 @@ msgstr ""
 msgid "Filter command and arguments:"
 msgstr ""
 
-#: src/filemanager/cmd.c:735
+#: src/filemanager/cmd.c:739
 msgid "Edit file"
 msgstr ""
 
-#: src/filemanager/cmd.c:770
+#: src/filemanager/cmd.c:774
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/filemanager/cmd.c:771
+#: src/filemanager/cmd.c:775
 msgid "Enter directory name:"
 msgstr ""
 
-#: src/filemanager/cmd.c:832
+#: src/filemanager/cmd.c:836
 msgid "Extension file edit"
 msgstr ""
 
-#: src/filemanager/cmd.c:833
+#: src/filemanager/cmd.c:837
 msgid "Which extension file you want to edit?"
 msgstr ""
 
-#: src/filemanager/cmd.c:834 src/filemanager/cmd.c:875
-#: src/filemanager/cmd.c:933
+#: src/filemanager/cmd.c:838 src/filemanager/cmd.c:879
+#: src/filemanager/cmd.c:937
 msgid "&System Wide"
 msgstr ""
 
-#: src/filemanager/cmd.c:931
+#: src/filemanager/cmd.c:935
 msgid "Highlighting groups file edit"
 msgstr ""
 
-#: src/filemanager/cmd.c:932
+#: src/filemanager/cmd.c:936
 msgid "Which highlighting file you want to edit?"
 msgstr ""
 
-#: src/filemanager/cmd.c:1027
+#: src/filemanager/cmd.c:1031
 msgid "Compare directories"
 msgstr ""
 
-#: src/filemanager/cmd.c:1028
+#: src/filemanager/cmd.c:1032
 msgid "Select compare method:"
 msgstr ""
 
-#: src/filemanager/cmd.c:1029
+#: src/filemanager/cmd.c:1033
 msgid "&Quick"
 msgstr ""
 
-#: src/filemanager/cmd.c:1029
+#: src/filemanager/cmd.c:1033
 msgid "&Size only"
 msgstr ""
 
-#: src/filemanager/cmd.c:1029
+#: src/filemanager/cmd.c:1033
 msgid "&Thorough"
 msgstr ""
 
-#: src/filemanager/cmd.c:1043
+#: src/filemanager/cmd.c:1047
 msgid ""
 "Both panels should be in the listing mode\n"
 "to use this command"
 msgstr ""
 
-#: src/filemanager/cmd.c:1102
+#: src/filemanager/cmd.c:1106
 #, c-format
 msgid "'%s' is not a symbolic link"
 msgstr ""
 
-#: src/filemanager/cmd.c:1115
+#: src/filemanager/cmd.c:1119
 #, c-format
 msgid "Symlink '%s' points to:"
 msgstr ""
 
-#: src/filemanager/cmd.c:1117
+#: src/filemanager/cmd.c:1121
 msgid "Edit symlink"
 msgstr ""
 
-#: src/filemanager/cmd.c:1130
+#: src/filemanager/cmd.c:1134
 #, c-format
 msgid "edit symlink, unable to remove %s: %s"
 msgstr ""
 
-#: src/filemanager/cmd.c:1138
+#: src/filemanager/cmd.c:1142
 #, c-format
 msgid "edit symlink: %s"
 msgstr ""
 
-#: src/filemanager/cmd.c:1183
+#: src/filemanager/cmd.c:1187
 msgid "FTP to machine"
 msgstr ""
 
-#: src/filemanager/cmd.c:1194
+#: src/filemanager/cmd.c:1198
 msgid "SFTP to machine"
 msgstr ""
 
-#: src/filemanager/cmd.c:1206
+#: src/filemanager/cmd.c:1210
 msgid "Shell link to machine"
 msgstr ""
 
-#: src/filemanager/cmd.c:1218
+#: src/filemanager/cmd.c:1222
 msgid "Undelete files on an ext2 file system"
 msgstr ""
 
-#: src/filemanager/cmd.c:1219
+#: src/filemanager/cmd.c:1223
 msgid ""
 "Enter device (without /dev/) to undelete\n"
 "files on: (F1 for details)"
 msgstr ""
 
-#: src/filemanager/cmd.c:1280 src/filemanager/cmd.c:1314
-#: src/filemanager/file.c:773
+#: src/filemanager/cmd.c:1284 src/filemanager/cmd.c:1318
+#: src/filemanager/file.c:764
 msgid "Directory scanning"
 msgstr ""
 
-#: src/filemanager/cmd.c:1360 src/filemanager/cmd.c:1362
+#: src/filemanager/cmd.c:1364 src/filemanager/cmd.c:1366
 msgid "Setup"
 msgstr ""
 
-#: src/filemanager/cmd.c:1360
+#: src/filemanager/cmd.c:1364
 #, c-format
 msgid "Setup saved to %s"
 msgstr ""
 
-#: src/filemanager/cmd.c:1362
+#: src/filemanager/cmd.c:1366
 #, c-format
 msgid "Unable to save setup to %s"
 msgstr ""
@@ -3264,104 +3268,104 @@ msgid ""
 "or use that file as an example of how to write it."
 msgstr ""
 
-#: src/filemanager/file.c:95 src/filemanager/file.c:2709
-#: src/filemanager/file.c:2766 src/filemanager/tree.c:719
+#: src/filemanager/file.c:94 src/filemanager/file.c:2774
+#: src/filemanager/file.c:2831 src/filemanager/tree.c:719
 msgid "DialogTitle|Copy"
 msgstr ""
 
-#: src/filemanager/file.c:96 src/filemanager/tree.c:755
+#: src/filemanager/file.c:95 src/filemanager/tree.c:755
 msgid "DialogTitle|Move"
 msgstr ""
 
-#: src/filemanager/file.c:97 src/filemanager/hotlist.c:1163
+#: src/filemanager/file.c:96 src/filemanager/hotlist.c:1163
 #: src/filemanager/hotlist.c:1180 src/filemanager/tree.c:826
 msgid "DialogTitle|Delete"
 msgstr ""
 
-#: src/filemanager/file.c:152
+#: src/filemanager/file.c:150
 msgid "FileOperation|Copy"
 msgstr ""
 
-#: src/filemanager/file.c:153
+#: src/filemanager/file.c:151
 msgid "FileOperation|Move"
 msgstr ""
 
-#: src/filemanager/file.c:154
+#: src/filemanager/file.c:152
 msgid "FileOperation|Delete"
 msgstr ""
 
-#: src/filemanager/file.c:167
+#: src/filemanager/file.c:165
 #, no-c-format
 msgid "%o %f%n\"%s\"%m"
 msgstr ""
 
-#: src/filemanager/file.c:169
+#: src/filemanager/file.c:167
 #, no-c-format
 msgid "%o %d %f%m"
 msgstr ""
 
-#: src/filemanager/file.c:173
+#: src/filemanager/file.c:171
 msgid "files"
 msgstr ""
 
-#: src/filemanager/file.c:174
+#: src/filemanager/file.c:172
 msgid "directory"
 msgstr ""
 
-#: src/filemanager/file.c:175
+#: src/filemanager/file.c:173
 msgid "directories"
 msgstr ""
 
-#: src/filemanager/file.c:176
+#: src/filemanager/file.c:174
 msgid "files/directories"
 msgstr ""
 
 #. TRANSLATORS: keep leading space here to split words in Copy/Move dialog
-#: src/filemanager/file.c:178
+#: src/filemanager/file.c:176
 msgid " with source mask:"
 msgstr ""
 
-#: src/filemanager/file.c:416
+#: src/filemanager/file.c:408
 #, c-format
 msgid ""
 "Cannot stat hardlink source file \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:436
+#: src/filemanager/file.c:428
 #, c-format
 msgid ""
 "Cannot create target hardlink \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:472
+#: src/filemanager/file.c:464
 #, c-format
 msgid "Cannot create target hardlink \"%s\""
 msgstr ""
 
-#: src/filemanager/file.c:536
+#: src/filemanager/file.c:527
 #, c-format
 msgid ""
 "Cannot read source link \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:550
+#: src/filemanager/file.c:541
 msgid ""
 "Cannot make stable symlinks across non-local filesystems:\n"
 "\n"
 "Option Stable Symlinks will be disabled"
 msgstr ""
 
-#: src/filemanager/file.c:620
+#: src/filemanager/file.c:611
 #, c-format
 msgid ""
 "Cannot create target symlink \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:932
+#: src/filemanager/file.c:923
 #, c-format
 msgid ""
 "\"%s\"\n"
@@ -3370,7 +3374,7 @@ msgid ""
 "are the same directory"
 msgstr ""
 
-#: src/filemanager/file.c:934
+#: src/filemanager/file.c:925
 #, c-format
 msgid ""
 "\"%s\"\n"
@@ -3379,18 +3383,18 @@ msgid ""
 "are the same file"
 msgstr ""
 
-#: src/filemanager/file.c:966 src/filemanager/file.c:969
+#: src/filemanager/file.c:957 src/filemanager/file.c:960
 msgid "Ski&p all"
 msgstr ""
 
-#: src/filemanager/file.c:1006
+#: src/filemanager/file.c:997
 #, c-format
 msgid ""
 "Directory \"%s\" not empty.\n"
 "Delete it recursively?"
 msgstr ""
 
-#: src/filemanager/file.c:1007
+#: src/filemanager/file.c:998
 #, c-format
 msgid ""
 "Background process:\n"
@@ -3398,201 +3402,229 @@ msgid ""
 "Delete it recursively?"
 msgstr ""
 
-#: src/filemanager/file.c:1015 src/filemanager/filegui.c:499
+#: src/filemanager/file.c:1006 src/filemanager/filegui.c:498
 msgid "Non&e"
 msgstr ""
 
-#: src/filemanager/file.c:1209
+#: src/filemanager/file.c:1200
 #, c-format
 msgid ""
 "Cannot remove file \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:1267
+#: src/filemanager/file.c:1258
 #, c-format
 msgid ""
 "Cannot stat file \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:1283
+#: src/filemanager/file.c:1274
 #, c-format
 msgid "Cannot overwrite directory \"%s\""
 msgstr ""
 
-#: src/filemanager/file.c:1338
+#: src/filemanager/file.c:1329
 #, c-format
 msgid ""
 "Cannot move file \"%s\" to \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:1444
+#: src/filemanager/file.c:1435
 #, c-format
 msgid ""
 "Cannot remove directory \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:1694 src/filemanager/file.c:2311
+#: src/filemanager/file.c:1685 src/filemanager/file.c:2304
 #, c-format
 msgid ""
 "Cannot overwrite directory \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:1696
+#: src/filemanager/file.c:1687
 #, c-format
 msgid ""
 "Cannot overwrite file \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:1717
+#: src/filemanager/file.c:1708
 #, c-format
 msgid ""
 "Cannot move directory \"%s\" to \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:1819
+#: src/filemanager/file.c:1810
 msgid "Cannot operate on \"..\"!"
 msgstr ""
 
-#: src/filemanager/file.c:2330
+#: src/filemanager/file.c:2323
 #, c-format
 msgid ""
 "Cannot stat source file \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:2399
+#: src/filemanager/file.c:2344
+#, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+
+#: src/filemanager/file.c:2413 src/filemanager/file.c:2487
+#, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+
+#: src/filemanager/file.c:2439
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:2411 src/filemanager/file.c:2782
+#: src/filemanager/file.c:2451 src/filemanager/file.c:2847
 #, c-format
 msgid ""
 "Cannot chown target file \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:2426 src/filemanager/file.c:2798
+#: src/filemanager/file.c:2466 src/filemanager/file.c:2863
 #, c-format
 msgid ""
 "Cannot chmod target file \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:2448
+#: src/filemanager/file.c:2513
 #, c-format
 msgid ""
 "Cannot open source file \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:2461
+#: src/filemanager/file.c:2526
 msgid "Reget failed, about to overwrite file"
 msgstr ""
 
-#: src/filemanager/file.c:2472
+#: src/filemanager/file.c:2537
 #, c-format
 msgid ""
 "Cannot fstat source file \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:2504
+#: src/filemanager/file.c:2569
 #, c-format
 msgid ""
 "Cannot create target file \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:2536
+#: src/filemanager/file.c:2601
 #, c-format
 msgid ""
 "Cannot fstat target file \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:2557
+#: src/filemanager/file.c:2622
 #, c-format
 msgid ""
 "Cannot preallocate space for target file \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:2616
+#: src/filemanager/file.c:2681
 #, c-format
 msgid ""
 "Cannot read source file \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:2655
+#: src/filemanager/file.c:2720
 #, c-format
 msgid ""
 "Cannot write target file \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:2689
+#: src/filemanager/file.c:2754
 msgid "(stalled)"
 msgstr ""
 
-#: src/filemanager/file.c:2710 src/filemanager/file.c:2766
+#: src/filemanager/file.c:2775 src/filemanager/file.c:2831
 msgid "Incomplete file was retrieved"
 msgstr ""
 
-#: src/filemanager/file.c:2711 src/filemanager/file.c:2767
+#: src/filemanager/file.c:2776 src/filemanager/file.c:2832
 msgid "&Keep"
 msgstr ""
 
-#: src/filemanager/file.c:2711
+#: src/filemanager/file.c:2776
 msgid "&Continue copy"
 msgstr ""
 
-#: src/filemanager/file.c:2742
+#: src/filemanager/file.c:2807
 #, c-format
 msgid ""
 "Cannot close source file \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:2754
+#: src/filemanager/file.c:2819
 #, c-format
 msgid ""
 "Cannot close target file \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:2865
+#: src/filemanager/file.c:2901
+#, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+
+#: src/filemanager/file.c:2962
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:2909
+#: src/filemanager/file.c:2987
+#, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+
+#: src/filemanager/file.c:3034
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:2921
+#: src/filemanager/file.c:3046
 #, c-format
 msgid ""
 "Cannot copy cyclic symbolic link\n"
 "\"%s\""
 msgstr ""
 
-#: src/filemanager/file.c:2960 src/filemanager/file.c:3452
+#: src/filemanager/file.c:3085 src/filemanager/file.c:3581
 #: src/filemanager/tree.c:769
 #, c-format
 msgid ""
@@ -3600,192 +3632,192 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:2993
+#: src/filemanager/file.c:3118
 #, c-format
 msgid ""
 "Cannot create target directory \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:3017
+#: src/filemanager/file.c:3142
 #, c-format
 msgid ""
 "Cannot chown target directory \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/filemanager/file.c:3224
+#: src/filemanager/file.c:3353
 #, c-format
 msgid "Directories: %zu, total size: %s"
 msgstr ""
 
-#: src/filemanager/file.c:3370
+#: src/filemanager/file.c:3499
 msgid "Sorry, I could not put the job in background"
 msgstr ""
 
-#: src/filemanager/filegui.c:255 src/filemanager/find.c:192
+#: src/filemanager/filegui.c:254 src/filemanager/find.c:192
 msgid "S&uspend"
 msgstr ""
 
-#: src/filemanager/filegui.c:256 src/filemanager/find.c:193
+#: src/filemanager/filegui.c:255 src/filemanager/find.c:193
 msgid "Con&tinue"
 msgstr ""
 
-#: src/filemanager/filegui.c:346
+#: src/filemanager/filegui.c:345
 #, c-format
 msgid "%d:%02d:%02d"
 msgstr ""
 
-#: src/filemanager/filegui.c:365
+#: src/filemanager/filegui.c:364
 #, c-format
 msgid "ETA %s"
 msgstr ""
 
-#: src/filemanager/filegui.c:374
+#: src/filemanager/filegui.c:373
 #, c-format
 msgid "%.2f MB/s"
 msgstr ""
 
-#: src/filemanager/filegui.c:376
+#: src/filemanager/filegui.c:375
 #, c-format
 msgid "%.2f KB/s"
 msgstr ""
 
-#: src/filemanager/filegui.c:378
+#: src/filemanager/filegui.c:377
 #, c-format
 msgid "%ld B/s"
 msgstr ""
 
-#: src/filemanager/filegui.c:463
+#: src/filemanager/filegui.c:462
 msgid "New     :"
 msgstr ""
 
-#: src/filemanager/filegui.c:471
+#: src/filemanager/filegui.c:470
 msgid "Existing:"
 msgstr ""
 
-#: src/filemanager/filegui.c:480
+#: src/filemanager/filegui.c:479
 msgid "Overwrite this file?"
 msgstr ""
 
-#: src/filemanager/filegui.c:486 src/filemanager/hotlist.c:193
+#: src/filemanager/filegui.c:485 src/filemanager/hotlist.c:193
 msgid "A&ppend"
 msgstr ""
 
-#: src/filemanager/filegui.c:488
+#: src/filemanager/filegui.c:487
 msgid "&Reget"
 msgstr ""
 
-#: src/filemanager/filegui.c:491
+#: src/filemanager/filegui.c:490
 msgid "Overwrite all files?"
 msgstr ""
 
-#: src/filemanager/filegui.c:493
+#: src/filemanager/filegui.c:492
 msgid "Don't overwrite with &zero length file"
 msgstr ""
 
-#: src/filemanager/filegui.c:497
+#: src/filemanager/filegui.c:496
 msgid "&Older"
 msgstr ""
 
-#: src/filemanager/filegui.c:501
+#: src/filemanager/filegui.c:500
 msgid "S&maller"
 msgstr ""
 
-#: src/filemanager/filegui.c:503
+#: src/filemanager/filegui.c:502
 msgid "&Size differs"
 msgstr ""
 
-#: src/filemanager/filegui.c:529
+#: src/filemanager/filegui.c:528
 msgid "File exists"
 msgstr ""
 
-#: src/filemanager/filegui.c:531
+#: src/filemanager/filegui.c:530
 msgid "Background process: File exists"
 msgstr ""
 
-#: src/filemanager/filegui.c:1049
+#: src/filemanager/filegui.c:1048
 #, c-format
 msgid "Files processed: %zu / %zu"
 msgstr ""
 
-#: src/filemanager/filegui.c:1052
+#: src/filemanager/filegui.c:1051
 #, c-format
 msgid "Files processed: %zu"
 msgstr ""
 
-#: src/filemanager/filegui.c:1097
+#: src/filemanager/filegui.c:1096
 #, c-format
 msgid "Time: %s %s"
 msgstr ""
 
-#: src/filemanager/filegui.c:1101
+#: src/filemanager/filegui.c:1100
 #, c-format
 msgid "Time: %s %s (%s)"
 msgstr ""
 
-#: src/filemanager/filegui.c:1107
+#: src/filemanager/filegui.c:1106
 #, c-format
 msgid "Time: %s"
 msgstr ""
 
-#: src/filemanager/filegui.c:1111
+#: src/filemanager/filegui.c:1110
 #, c-format
 msgid "Time: %s (%s)"
 msgstr ""
 
-#: src/filemanager/filegui.c:1121
+#: src/filemanager/filegui.c:1120
 #, c-format
 msgid " Total: %s "
 msgstr ""
 
-#: src/filemanager/filegui.c:1125
+#: src/filemanager/filegui.c:1124
 #, c-format
 msgid " Total: %s / %s "
 msgstr ""
 
-#: src/filemanager/filegui.c:1149
+#: src/filemanager/filegui.c:1148
 msgid "Source"
 msgstr ""
 
-#: src/filemanager/filegui.c:1174
+#: src/filemanager/filegui.c:1173
 msgid "Target"
 msgstr ""
 
-#: src/filemanager/filegui.c:1207
+#: src/filemanager/filegui.c:1206
 msgid "Deleting"
 msgstr ""
 
-#: src/filemanager/filegui.c:1373 src/filemanager/find.c:587
+#: src/filemanager/filegui.c:1374 src/filemanager/find.c:587
 #: src/filemanager/panel.c:2617
 msgid "&Using shell patterns"
 msgstr ""
 
-#: src/filemanager/filegui.c:1375
+#: src/filemanager/filegui.c:1376
 msgid "to:"
 msgstr ""
 
-#: src/filemanager/filegui.c:1379
+#: src/filemanager/filegui.c:1380
 msgid "Follow &links"
 msgstr ""
 
-#: src/filemanager/filegui.c:1380
+#: src/filemanager/filegui.c:1381
 msgid "Preserve &attributes"
 msgstr ""
 
-#: src/filemanager/filegui.c:1382
+#: src/filemanager/filegui.c:1383
 msgid "Di&ve into subdir if exists"
 msgstr ""
 
-#: src/filemanager/filegui.c:1383
+#: src/filemanager/filegui.c:1384
 msgid "&Stable symlinks"
 msgstr ""
 
-#: src/filemanager/filegui.c:1388
+#: src/filemanager/filegui.c:1389
 msgid "&Background"
 msgstr ""
 
-#: src/filemanager/filegui.c:1442
+#: src/filemanager/filegui.c:1443
 #, c-format
 msgid "Invalid source pattern '%s'"
 msgstr ""
@@ -4030,51 +4062,51 @@ msgstr ""
 msgid "Panels:"
 msgstr ""
 
-#: src/filemanager/filemanager.c:1053
+#: src/filemanager/filemanager.c:1045
 #, c-format
 msgid "You have %zu opened screen. Quit anyway?"
 msgid_plural "You have %zu opened screens. Quit anyway?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/filemanager/filemanager.c:1056 src/filemanager/filemanager.c:1062
+#: src/filemanager/filemanager.c:1048 src/filemanager/filemanager.c:1054
 #: src/filemanager/panel.c:2960
 msgid "The Midnight Commander"
 msgstr ""
 
-#: src/filemanager/filemanager.c:1063
+#: src/filemanager/filemanager.c:1055
 msgid "Do you really want to quit the Midnight Commander?"
 msgstr ""
 
-#: src/filemanager/filemanager.c:1621
+#: src/filemanager/filemanager.c:1613
 msgid "&Above"
 msgstr ""
 
-#: src/filemanager/filemanager.c:1621
+#: src/filemanager/filemanager.c:1613
 msgid "&Left"
 msgstr ""
 
-#: src/filemanager/filemanager.c:1622
+#: src/filemanager/filemanager.c:1614
 msgid "&Below"
 msgstr ""
 
-#: src/filemanager/filemanager.c:1622
+#: src/filemanager/filemanager.c:1614
 msgid "&Right"
 msgstr ""
 
-#: src/filemanager/filemanager.c:1635
+#: src/filemanager/filemanager.c:1627
 msgid "ButtonBar|Menu"
 msgstr ""
 
-#: src/filemanager/filemanager.c:1636 src/viewer/display.c:95
+#: src/filemanager/filemanager.c:1628 src/viewer/display.c:95
 msgid "ButtonBar|View"
 msgstr ""
 
-#: src/filemanager/filemanager.c:1639 src/filemanager/tree.c:1182
+#: src/filemanager/filemanager.c:1631 src/filemanager/tree.c:1182
 msgid "ButtonBar|RenMov"
 msgstr ""
 
-#: src/filemanager/filemanager.c:1640 src/filemanager/tree.c:1185
+#: src/filemanager/filemanager.c:1632 src/filemanager/tree.c:1185
 msgid "ButtonBar|Mkdir"
 msgstr ""
 
@@ -4398,12 +4430,12 @@ msgstr ""
 msgid "Links:      %d"
 msgstr ""
 
-#: src/filemanager/info.c:275
+#: src/filemanager/info.c:273
 #, c-format
 msgid "Attributes: %s"
 msgstr ""
 
-#: src/filemanager/info.c:278
+#: src/filemanager/info.c:275 src/filemanager/info.c:280
 msgid "Attributes: unavailable"
 msgstr ""
 
@@ -4650,12 +4682,12 @@ msgstr ""
 msgid "Do you really want to execute?"
 msgstr ""
 
-#: src/filemanager/panel.c:3432 src/filemanager/panel.c:4609
-#: src/filemanager/panel.c:4657 src/viewer/actions_cmd.c:310
+#: src/filemanager/panel.c:3432 src/filemanager/panel.c:4607
+#: src/filemanager/panel.c:4655 src/viewer/actions_cmd.c:310
 msgid "Cannot read directory contents"
 msgstr ""
 
-#: src/filemanager/panel.c:4711
+#: src/filemanager/panel.c:4709
 msgid "User supplied format looks invalid, reverting to default."
 msgstr ""
 
@@ -4800,15 +4832,15 @@ msgstr ""
 msgid "ButtonBar|Prev"
 msgstr ""
 
-#: src/learn.c:73
+#: src/learn.c:72
 msgid "Learn keys"
 msgstr ""
 
-#: src/learn.c:92
+#: src/learn.c:91
 msgid "Teach me a key"
 msgstr ""
 
-#: src/learn.c:93
+#: src/learn.c:92
 #, c-format
 msgid ""
 "Please press the %s\n"
@@ -4821,62 +4853,62 @@ msgid ""
 "and wait as well."
 msgstr ""
 
-#: src/learn.c:122
+#: src/learn.c:121
 msgid "Cannot accept this key"
 msgstr ""
 
-#: src/learn.c:122
+#: src/learn.c:121
 #, c-format
 msgid "You have entered \"%s\""
 msgstr ""
 
 #. TRANSLATORS: This label appears near learned keys.  Keep it short.
-#: src/learn.c:183
+#: src/learn.c:182
 msgid "OK"
 msgstr ""
 
-#: src/learn.c:193
+#: src/learn.c:192
 msgid ""
 "It seems that all your keys already\n"
 "work fine. That's great."
 msgstr ""
 
-#: src/learn.c:195
+#: src/learn.c:194
 msgid "&Discard"
 msgstr ""
 
-#: src/learn.c:202
+#: src/learn.c:201
 msgid ""
 "Great! You have a complete terminal database!\n"
 "All your keys work well."
 msgstr ""
 
-#: src/learn.c:331
+#: src/learn.c:330
 msgid ""
 "Press all the keys mentioned here. After you have done it, check\n"
 "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 ""
 
-#: src/main.c:274
+#: src/main.c:278
 #, c-format
 msgid ""
 "Failed to run:\n"
 "%s\n"
 msgstr ""
 
-#: src/main.c:294
+#: src/main.c:298
 msgid "Home directory path is not absolute"
 msgstr ""
 
-#: src/main.c:412
+#: src/main.c:416
 msgid ""
 "GNU Midnight Commander\n"
 "is already running on this terminal.\n"
 "Subshell support will be disabled."
 msgstr ""
 
-#: src/main.c:546
+#: src/main.c:552
 #, c-format
 msgid ""
 "\n"
@@ -4916,17 +4948,17 @@ msgstr ""
 msgid "The shell is still active. Quit anyway?"
 msgstr ""
 
-#: src/subshell/common.c:1776
+#: src/subshell/common.c:1788
 #, c-format
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
 #: src/textconf.c:89
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
 #: src/textconf.c:91
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 #: src/textconf.c:97
@@ -5346,26 +5378,26 @@ msgid ""
 "Remove password or correct mode"
 msgstr ""
 
-#: src/vfs/sfs/sfs.c:229 src/vfs/sfs/sfs.c:239 src/vfs/sfs/sfs.c:246
+#: src/vfs/sfs/sfs.c:227 src/vfs/sfs/sfs.c:237 src/vfs/sfs/sfs.c:244
 #, c-format
 msgid ""
 "SFS virtual file system:\n"
 "%s"
 msgstr ""
 
-#: src/vfs/sfs/sfs.c:462
+#: src/vfs/sfs/sfs.c:460
 #, c-format
 msgid "%s: Warning: file %s not found\n"
 msgstr ""
 
-#: src/vfs/sfs/sfs.c:492
+#: src/vfs/sfs/sfs.c:490
 #, c-format
 msgid ""
 "Warning: Invalid line in %s:\n"
 "%s\n"
 msgstr ""
 
-#: src/vfs/sfs/sfs.c:509
+#: src/vfs/sfs/sfs.c:507
 #, c-format
 msgid ""
 "Warning: Invalid flag %c in %s:\n"
@@ -5562,7 +5594,7 @@ 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
+#: src/vfs/tar/tar-internal.c:422
 msgid "Inconsistent tar archive"
 msgstr ""
 
@@ -5584,7 +5616,7 @@ msgid ""
 "doesn't look like a tar archive"
 msgstr ""
 
-#: src/vfs/tar/tar-internal.c:165
+#: src/vfs/tar/tar-internal.c:169
 msgid "tar: mc_lseek not stopped at a record boundary"
 msgstr ""
 
@@ -5781,18 +5813,18 @@ msgstr ""
 msgid "View: "
 msgstr ""
 
-#: src/viewer/mcviewer.c:339
+#: src/viewer/mcviewer.c:341
 #, c-format
 msgid ""
 "Cannot open \"%s\"\n"
 "%s"
 msgstr ""
 
-#: src/viewer/mcviewer.c:369
+#: src/viewer/mcviewer.c:371
 msgid "Cannot view: not a regular file"
 msgstr ""
 
-#: src/viewer/mcviewer.c:404
+#: src/viewer/mcviewer.c:406
 #, c-format
 msgid ""
 "Cannot open \"%s\" in parse mode\n"
diff --git a/po/mn.po b/po/mn.po
index ea1aef38c..c651814a9 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -763,6 +763,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2589,6 +2592,22 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+" %s файл руу бичиж чадсангүй:\n"
+"%s\n"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+" %s файл руу бичиж чадсангүй:\n"
+"%s\n"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2676,12 +2695,26 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+" %s файл руу бичиж чадсангүй:\n"
+"%s\n"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr " %s лавлахын зөв зөвшөөрөлийг олгож чадсангүй\n"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3735,10 +3768,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Анхааруулга: %s руу өөрчилж чадсангүй. \n"
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/nb.po b/po/nb.po
index 63871b39f..5cebdfff5 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: heskjestad <kc.madderloss@gmail.com>, 2024\n"
 "Language-Team: Norwegian Bokmål (http://app.transifex.com/mc/mc/language/"
@@ -829,6 +829,10 @@ msgstr "Terminalinnstillinger"
 msgid "Arguments parse error!"
 msgstr "Klarte ikke tolke argumentene."
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "Med innebygget tekstprogram"
+
 msgid "No arguments given to the viewer."
 msgstr "Filviseren fikk ingen argumenter."
 
@@ -2765,6 +2769,22 @@ msgstr ""
 "stat() mislyktes for kildefila «%s»\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"stat() mislyktes for kildefila «%s»\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"fstat() mislyktes for målfila «%s»\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2876,6 +2896,14 @@ msgstr ""
 "Klarte ikke lukke målfila «%s»\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"fstat() mislyktes for målfila «%s»\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2884,6 +2912,14 @@ msgstr ""
 "stat() mislyktes for kildemappa «%s»\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"stat() mislyktes for kildemappa «%s»\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3970,10 +4006,12 @@ msgstr "Skallet er fortsatt aktivt. Avslutte likevel?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Advarsel: Klarte ikke bytte til %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+#, fuzzy
+msgid "With builtin editor and aspell support"
 msgstr "Med innebygget tekstprogram og Aspell-støtte"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "Med innebygget tekstprogram"
 
 msgid "With optional subshell support"
diff --git a/po/nl.po b/po/nl.po
index cf28342a8..b2257d1d0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -809,6 +809,10 @@ msgstr "Terminal-opties"
 msgid "Arguments parse error!"
 msgstr "Parsefout argumenten!"
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "Met ingebouwde editor"
+
 msgid "No arguments given to the viewer."
 msgstr "Geen argumenten opgegevan aan de viewer"
 
@@ -2726,6 +2730,22 @@ msgstr ""
 "Bronbestand \"%s\" kan niet geïnspecteerd worden \n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Bronbestand \"%s\" kan niet geïnspecteerd worden \n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"fstat werkt niet op doelbestand \"%s\" \n"
+"%s "
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2837,6 +2857,14 @@ msgstr ""
 "Doelbestand \"%s\" kan niet gesloten worden \n"
 "%s "
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"fstat werkt niet op doelbestand \"%s\" \n"
+"%s "
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2845,6 +2873,14 @@ msgstr ""
 "Bronmap \"%s\" kan niet geïnspecteerd worden\n"
 "%s "
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Bronmap \"%s\" kan niet geïnspecteerd worden\n"
+"%s "
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3934,10 +3970,12 @@ msgstr "De shell is nog steeds actief. Toch stoppen?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Waarschuwing: Schakelen naar %s mislukt.\n"
 
-msgid "With builtin Editor and Aspell support"
+#, fuzzy
+msgid "With builtin editor and aspell support"
 msgstr "Met ingebouwde editor- en Aspell-ondersteuning"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "Met ingebouwde editor"
 
 msgid "With optional subshell support"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 58a55787c..ef38909e7 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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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/"
@@ -760,6 +760,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2586,6 +2589,18 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2673,12 +2688,24 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3716,10 +3743,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/pl.po b/po/pl.po
index b107882dd..22cbd186d 100644
--- a/po/pl.po
+++ b/po/pl.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>, 2011-2024\n"
 "Language-Team: Polish (http://app.transifex.com/mc/mc/language/pl/)\n"
@@ -18,9 +18,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && "
-"(n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && "
-"n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n"
+"%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
+"%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 # "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 msgid "Warning: cannot load codepages list"
@@ -833,6 +833,10 @@ msgstr "Opcje terminala"
 msgid "Arguments parse error!"
 msgstr "Błąd podczas przetwarzania parametrów."
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "Z wbudowanym edytorem"
+
 msgid "No arguments given to the viewer."
 msgstr "Nie podano parametrów dla przeglądarki."
 
@@ -2767,6 +2771,22 @@ msgstr ""
 "Nie można wykonać polecenia stat na pliku źródłowym „%s”\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Nie można wykonać polecenia stat na pliku źródłowym „%s”\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Nie można wykonać polecenia stat na pliku docelowym „%s”\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2878,6 +2898,14 @@ msgstr ""
 "Nie można zamknąć pliku docelowego „%s”\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Nie można wykonać polecenia stat na pliku docelowym „%s”\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2886,6 +2914,14 @@ msgstr ""
 "Nie można wykonać polecenia stat na katalogu źródłowym „%s”\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Nie można wykonać polecenia stat na katalogu źródłowym „%s”\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3983,10 +4019,12 @@ msgstr "Powłoka jest wciąż aktywna. Zakończyć mimo to?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Ostrzeżenie: nie można zmienić katalogu na %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+#, fuzzy
+msgid "With builtin editor and aspell support"
 msgstr "Z wbudowanym edytorem i obsługą Aspell"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "Z wbudowanym edytorem"
 
 msgid "With optional subshell support"
diff --git a/po/pt.po b/po/pt.po
index c57fc0c56..aff56669c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: Gilberto Jorge <gmj125@gmail.com>, 2013-2024\n"
 "Language-Team: Portuguese (http://app.transifex.com/mc/mc/language/pt/)\n"
@@ -831,6 +831,10 @@ msgstr "Opções para o terminal"
 msgid "Arguments parse error!"
 msgstr "Erro de parseamento de argumentos!"
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "Com Editor integrado"
+
 msgid "No arguments given to the viewer."
 msgstr "Nenhum argumento dado ao visualizador."
 
@@ -2766,6 +2770,22 @@ msgstr ""
 "Não é possível efetuar stat no ficheiro fonte \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Não é possível efetuar stat no ficheiro fonte \"%s\"\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Não é possível efetuar fstat no ficheiro alvo \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2877,6 +2897,14 @@ msgstr ""
 "Não é possível fechar o ficheiro alvo \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Não é possível efetuar fstat no ficheiro alvo \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2885,6 +2913,14 @@ msgstr ""
 "Não é possível efetuar stat no diretório fonte \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Não é possível efetuar stat no diretório fonte \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3977,10 +4013,12 @@ msgstr "A shell ainda está ativa. Sair na mesma?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Aviso: Não é possível mudar para %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+#, fuzzy
+msgid "With builtin editor and aspell support"
 msgstr "Com Editor integrado and suporte Aspell"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "Com Editor integrado"
 
 msgid "With optional subshell support"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4185935ab..fc8c454e7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: marcelo cripe <marcelocripe@gmail.com>, 2022-2024\n"
 "Language-Team: Portuguese (Brazil) (http://app.transifex.com/mc/mc/language/"
@@ -850,6 +850,10 @@ msgstr "Opções do terminal"
 msgid "Arguments parse error!"
 msgstr "Ocorreu um erro na análise dos argumentos!"
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "Com o editor integrado"
+
 msgid "No arguments given to the viewer."
 msgstr "Nenhum argumento foi passado para o visualizador"
 
@@ -2804,6 +2808,22 @@ msgstr ""
 "Não foi possível obter o estado do arquivo de origem \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Não foi possível obter o estado do arquivo de origem \"%s\"\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Não foi possível executar o fstat no arquivo de destino \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2915,6 +2935,14 @@ msgstr ""
 "Não foi possível fechar o arquivo de destino \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Não foi possível executar o fstat no arquivo de destino \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2923,6 +2951,14 @@ msgstr ""
 "Não foi possível obter o estado do diretório \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Não foi possível obter o estado do diretório \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -4029,10 +4065,12 @@ msgstr ""
 "Aviso:\n"
 "Não foi possível alterar para %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+#, fuzzy
+msgid "With builtin editor and aspell support"
 msgstr "Com o editor integrado e o suporte ao Aspell"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "Com o editor integrado"
 
 msgid "With optional subshell support"
diff --git a/po/ro.po b/po/ro.po
index 4d6a5bd96..89af3ffed 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -814,6 +814,10 @@ msgstr "Opțiuni terminal"
 msgid "Arguments parse error!"
 msgstr "Eroare de interpretare a argumentelor!"
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "Cu editor încorporat"
+
 msgid "No arguments given to the viewer."
 msgstr "Nu au fost date argumente către vizualizator."
 
@@ -2745,6 +2749,22 @@ msgstr ""
 "Nu se poate găsi fișierul sursă \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Nu se poate găsi fișierul sursă \"%s\"\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Nu se poate găsi fișierul destinație \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2856,6 +2876,14 @@ msgstr ""
 "Nu se poate închide fișierul destinație \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Nu se poate găsi fișierul destinație \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2864,6 +2892,14 @@ msgstr ""
 "Nu se poate găsi dosarul sursă \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Nu se poate găsi dosarul sursă \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3956,10 +3992,12 @@ msgstr "Terminalul este încă activ. Ieși oricum?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Atenție: Nu se poate schimba în %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+#, fuzzy
+msgid "With builtin editor and aspell support"
 msgstr "Cu editor încorporat și suport Aspell"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "Cu editor încorporat"
 
 msgid "With optional subshell support"
diff --git a/po/ru.po b/po/ru.po
index 49b45c491..14b5a9ef1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -30,7 +30,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Midnight Commander\n"
 "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n"
-"POT-Creation-Date: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -38,9 +38,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || "
-"(n%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
 
 # "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 msgid "Warning: cannot load codepages list"
@@ -831,6 +831,10 @@ msgstr "Настройки терминала"
 msgid "Arguments parse error!"
 msgstr "Аргументы вызывают ошибку!"
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "Со встроенным редактором"
+
 msgid "No arguments given to the viewer."
 msgstr "Не заданы аргументы для программы просмотра."
 
@@ -2764,6 +2768,22 @@ msgstr ""
 "Не удалось получить свойства исходного файла \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Не удалось получить свойства исходного файла \"%s\"\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Не удалось получить свойства целевого файла \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2875,6 +2895,14 @@ msgstr ""
 "Не удалось закрыть целевой файл \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Не удалось получить свойства целевого файла \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2883,6 +2911,14 @@ msgstr ""
 "Не удалось получить свойства исходного каталога \"%s\"\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Не удалось получить свойства исходного каталога \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3978,10 +4014,12 @@ msgstr "Оболочка всё ещё активна. Всё равно вый
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Внимание: не удалось перейти в %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+#, fuzzy
+msgid "With builtin editor and aspell support"
 msgstr "Со встроенным редактором и поддержкой Aspell"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "Со встроенным редактором"
 
 msgid "With optional subshell support"
diff --git a/po/sk.po b/po/sk.po
index c1ee08bf8..730430ae7 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -804,6 +804,9 @@ msgstr "Možnosti terminálu"
 msgid "Arguments parse error!"
 msgstr "Chyba pri spracovaní argumentov!"
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr "Prehliadaču neboli odovzdané žiadne argumenty."
 
@@ -2710,6 +2713,22 @@ msgstr ""
 "Nemožno vykonať stat() zdrojového súboru „%s“\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Nemožno vykonať stat() zdrojového súboru „%s“\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Nemožno vykonať fstat() cieľového súboru „%s“\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2821,6 +2840,14 @@ msgstr ""
 "Nemožno zatvoriť cieľový súbor „%s“\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Nemožno vykonať fstat() cieľového súboru „%s“\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2829,6 +2856,14 @@ msgstr ""
 "Nemožno vykonať stat() zdrojového adresára „%s“\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Nemožno vykonať stat() zdrojového adresára „%s“\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3918,10 +3953,10 @@ msgstr "Shell je ešte aktívny. Ukončiť napriek tomu?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Upozornenie: Nedá sa zmeniť adresár na %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/sl.po b/po/sl.po
index ac94842ff..ea377169b 100644
--- a/po/sl.po
+++ b/po/sl.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -18,8 +18,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
-"n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
 
 # "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 msgid "Warning: cannot load codepages list"
@@ -772,6 +772,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2598,6 +2601,22 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Ne morem pisati v datoteko %s:\n"
+"%s\n"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Ne morem pisati v datoteko %s:\n"
+"%s\n"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2685,12 +2704,26 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Ne morem pisati v datoteko %s:\n"
+"%s\n"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr "Ne morem nastaviti pravilnih dovoljenj za imenik %s\n"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3753,10 +3786,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Opozorilo: Ne morem iti v %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/sr.po b/po/sr.po
index e3ad4221b..25e746d1a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -17,8 +17,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 # "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 msgid "Warning: cannot load codepages list"
@@ -791,6 +791,9 @@ msgstr "Опције терминала"
 msgid "Arguments parse error!"
 msgstr "Грешка обраде аргумената!"
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr "Аргументи нису дати прегледачу."
 
@@ -2693,6 +2696,22 @@ msgstr ""
 "Не могу да добијем податке о изворној датотеци „%s“\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Не могу да добијем податке о изворној датотеци „%s“\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Не могу да дознам податке о циљној датотеци „%s“\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2802,6 +2821,14 @@ msgstr ""
 "Не могу да затворим циљну датотеку „%s“\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Не могу да дознам податке о циљној датотеци „%s“\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2810,6 +2837,14 @@ msgstr ""
 "Не могу да добијем податке о изворном директоријуму „%s“\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Не могу да добијем податке о изворном директоријуму „%s“\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3894,10 +3929,10 @@ msgstr "Љуска је још увек радна. Да ипак изађем?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Упозорење: Не могу да пређем на „%s“.\n"
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/sv.po b/po/sv.po
index 469a986da..9e7d63600 100644
--- a/po/sv.po
+++ b/po/sv.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -809,6 +809,10 @@ msgstr "Terminalalternativ"
 msgid "Arguments parse error!"
 msgstr "Argumenttolkningsfel!"
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "Med inbyggd redigerare"
+
 msgid "No arguments given to the viewer."
 msgstr "Inga argument angavs till filvisaren"
 
@@ -2720,6 +2724,22 @@ msgstr ""
 "Stat på källfilen \"%s\" misslyckades\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Stat på källfilen \"%s\" misslyckades\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Fstat på målfilen \"%s\" misslyckades\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2831,6 +2851,14 @@ msgstr ""
 "Stängning av målfilen \"%s\" misslyckades\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Fstat på målfilen \"%s\" misslyckades\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2839,6 +2867,14 @@ msgstr ""
 "Stat på källkatalogen \"%s\" misslyckades\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Stat på källkatalogen \"%s\" misslyckades\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3918,10 +3954,12 @@ msgstr "Skalet är fortfarande aktivt. Avsluta ändå?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Varning: Kan inte byta till %s.\n"
 
-msgid "With builtin Editor and Aspell support"
-msgstr ""
+#, fuzzy
+msgid "With builtin editor and aspell support"
+msgstr "Med inbyggd redigerare"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "Med inbyggd redigerare"
 
 msgid "With optional subshell support"
diff --git a/po/szl.po b/po/szl.po
index f4b5f1e19..fdec727e4 100644
--- a/po/szl.po
+++ b/po/szl.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -760,6 +760,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2586,6 +2589,18 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2673,12 +2688,24 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3720,10 +3747,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/ta.po b/po/ta.po
index 38e9a6830..83989f55e 100644
--- a/po/ta.po
+++ b/po/ta.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -760,6 +760,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2586,6 +2589,18 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2673,12 +2688,24 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3716,10 +3743,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/te.po b/po/te.po
index 3c3341d93..264c331ba 100644
--- a/po/te.po
+++ b/po/te.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -759,6 +759,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2585,6 +2588,18 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2672,12 +2687,24 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3715,10 +3742,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/tr.po b/po/tr.po
index 89a0ae491..259c9ac51 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -810,6 +810,9 @@ msgstr "Uçbirim seçenekleri"
 msgid "Arguments parse error!"
 msgstr "Arguman ayrıştırma hatası!"
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr "Görüntüleyiciye hiç bağımsız değişken verilmedi"
 
@@ -2724,6 +2727,22 @@ msgstr ""
 "\"%s\" kaynak dosyası durumlanamıyor \n"
 " %s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"\"%s\" kaynak dosyası durumlanamıyor \n"
+" %s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"\"%s\" hedef dosyası fstat yapılamıyor \n"
+" %s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2835,6 +2854,14 @@ msgstr ""
 "\"%s\" hedef dosyası kapatılamıyor \n"
 " %s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"\"%s\" hedef dosyası fstat yapılamıyor \n"
+" %s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2843,6 +2870,14 @@ msgstr ""
 "\"%s\" kaynak dizini durumlanamıyor \n"
 " %s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"\"%s\" kaynak dizini durumlanamıyor \n"
+" %s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3923,10 +3958,10 @@ msgstr "Kabuk hala etkin. Yine de çıkılsın mı?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Uyarı: %s'e geçilemedi.\n"
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/uk.po b/po/uk.po
index ac8d6dc5c..99236f3f4 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -820,6 +820,10 @@ msgstr "Параметри терміналу"
 msgid "Arguments parse error!"
 msgstr "Сталася помилка під час обробки аргументів."
 
+#, fuzzy
+msgid "MC is built without builtin editor."
+msgstr "Із вбудованим редактором"
+
 msgid "No arguments given to the viewer."
 msgstr "Переглядачу не передано жодних аргументів."
 
@@ -2734,6 +2738,22 @@ msgstr ""
 "Не вдалося отримати властивості вихідного файлу «%s»\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Не вдалося отримати властивості вихідного файлу «%s»\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Не вдалося отримати властивості цільового файлу «%s»\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2845,6 +2865,14 @@ msgstr ""
 "Не вдалося закрити цільовий файл «%s»\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Не вдалося отримати властивості цільового файлу «%s»\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2853,6 +2881,14 @@ msgstr ""
 "Не вдавдалосяться отримати властивості вихідного каталогу «%s»\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"Не вдавдалосяться отримати властивості вихідного каталогу «%s»\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3949,10 +3985,12 @@ msgstr "Оболонка ще активна. Все одно вийти?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Попередження: не вдалося змінити на %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+#, fuzzy
+msgid "With builtin editor and aspell support"
 msgstr "Із вбудованим редактором і підтримкою Aspell"
 
-msgid "With builtin Editor"
+#, fuzzy
+msgid "With builtin editor"
 msgstr "Із вбудованим редактором"
 
 msgid "With optional subshell support"
diff --git a/po/uz.po b/po/uz.po
index 988902090..7476dc743 100644
--- a/po/uz.po
+++ b/po/uz.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -759,6 +759,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2585,6 +2588,18 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2672,12 +2687,24 @@ msgid ""
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3711,10 +3738,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr ""
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/vi.po b/po/vi.po
index 23af26426..533c22da1 100644
--- a/po/vi.po
+++ b/po/vi.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -762,6 +762,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2588,6 +2591,22 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Không ghi nhớ được vào tập tin %s:\n"
+"%s\n"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Không ghi nhớ được vào tập tin %s:\n"
+"%s\n"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2675,12 +2694,26 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Không ghi nhớ được vào tập tin %s:\n"
+"%s\n"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr "Không đặt được quyền hạn đúng cho thư mục %s\n"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3731,10 +3764,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Cảnh báo: Không chuyển được vào %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/wa.po b/po/wa.po
index 00e0116bf..8982dd3a1 100644
--- a/po/wa.po
+++ b/po/wa.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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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"
@@ -760,6 +760,9 @@ msgstr ""
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr ""
 
@@ -2586,6 +2589,22 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"Dji n' sai scrire e fitchî %s :\n"
+"%s\n"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"Dji n' sai scrire e fitchî %s :\n"
+"%s\n"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2673,12 +2692,26 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"Dji n' sai scrire e fitchî %s :\n"
+"%s\n"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3733,10 +3766,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr "Advertixhmint: dji n' sai candjî dins %s.\n"
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ae4e1cc59..bdb3e79cf 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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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/"
@@ -804,6 +804,9 @@ msgstr "终端选项"
 msgid "Arguments parse error!"
 msgstr "参数解析错误!"
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr "查看器没有指定参数。"
 
@@ -2711,6 +2714,22 @@ msgstr ""
 "无法 stat 源文件“%s”\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"无法 stat 源文件“%s”\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"无法 fstat 目标文件\"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2822,6 +2841,14 @@ msgstr ""
 "无法关闭目标文件“%s”\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"无法 fstat 目标文件\"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
@@ -2830,6 +2857,14 @@ msgstr ""
 "无法 stat 源目录“%s”\n"
 "%s"
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"无法 stat 源目录“%s”\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3905,10 +3940,10 @@ msgstr "Shell 仍在运行中。依然退出?"
 msgid "Warning: Cannot change to %s.\n"
 msgstr "警告: 无法切换至 %s。\n"
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 798c444a0..a8de71690 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: 2024-01-20 20:51+0100\n"
+"POT-Creation-Date: 2024-04-07 16:41+0300\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/"
@@ -780,6 +780,9 @@ msgstr "終端機選項"
 msgid "Arguments parse error!"
 msgstr ""
 
+msgid "MC is built without builtin editor."
+msgstr ""
+
 msgid "No arguments given to the viewer."
 msgstr "沒有為檢視器指定引數。"
 
@@ -2629,6 +2632,22 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source file \"%s\"\n"
+"%s"
+msgstr ""
+"無法覆寫檔案 \"%s\"\n"
+"%s"
+
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes of target file \"%s\"\n"
+"%s"
+msgstr ""
+"無法對目標檔案 \"%s\" 執行 chmod 指令\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot create special file \"%s\"\n"
@@ -2718,12 +2737,28 @@ msgid ""
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot set attributes for target file \"%s\"\n"
+"%s"
+msgstr ""
+"無法對目標檔案 \"%s\" 執行 chmod 指令\n"
+"%s"
+
 #, c-format
 msgid ""
 "Cannot stat source directory \"%s\"\n"
 "%s"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Cannot get attributes of source directory \"%s\"\n"
+"%s"
+msgstr ""
+"無法建立目標目錄 \"%s\"\n"
+"%s"
+
 #, c-format
 msgid ""
 "Source \"%s\" is not a directory\n"
@@ -3786,10 +3821,10 @@ msgstr ""
 msgid "Warning: Cannot change to %s.\n"
 msgstr "警告： 無法切換到 %s。\n"
 
-msgid "With builtin Editor and Aspell support"
+msgid "With builtin editor and aspell support"
 msgstr ""
 
-msgid "With builtin Editor"
+msgid "With builtin editor"
 msgstr ""
 
 msgid "With optional subshell support"
diff --git a/src/args.c b/src/args.c
index 8831f38d5..00c480312 100644
--- a/src/args.c
+++ b/src/args.c
@@ -36,6 +36,10 @@
 
 #include "src/textconf.h"
 
+#ifdef USE_INTERNAL_EDIT
+#include "editor/edit.h"        /* edit_arg_t */
+#endif
+
 #include "src/args.h"
 
 /*** external variables **************************************************************************/
@@ -376,9 +380,11 @@ mc_args_add_usage_info (void)
 
     switch (mc_global.mc_run_mode)
     {
+#ifdef USE_INTERNAL_EDIT
     case MC_RUN_EDITOR:
         s = g_strdup_printf ("%s\n", _("[+lineno] file1[:lineno] [file2[:lineno]...]"));
         break;
+#endif /* USE_INTERNAL_EDIT */
     case MC_RUN_VIEWER:
         s = g_strdup_printf ("%s\n", _("file"));
         break;
@@ -471,48 +477,14 @@ parse_mc_v_argument (const gchar * option_name, const gchar * value, gpointer da
 }
 
 /* --------------------------------------------------------------------------------------------- */
-/**
- * Create mcedit_arg_t object from vfs_path_t object and the line number.
- *
- * @param file_vpath  file path object
- * @param line_number line number. If value is 0, try to restore saved position.
- * @return mcedit_arg_t object
- */
 
-static mcedit_arg_t *
-mcedit_arg_vpath_new (vfs_path_t * file_vpath, long line_number)
-{
-    mcedit_arg_t *arg;
-
-    arg = g_new (mcedit_arg_t, 1);
-    arg->file_vpath = file_vpath;
-    arg->line_number = line_number;
-
-    return arg;
-}
-
-/* --------------------------------------------------------------------------------------------- */
-/**
- * Create mcedit_arg_t object from file name and the line number.
- *
- * @param file_name   file name
- * @param line_number line number. If value is 0, try to restore saved position.
- * @return mcedit_arg_t object
- */
-
-static mcedit_arg_t *
-mcedit_arg_new (const char *file_name, long line_number)
-{
-    return mcedit_arg_vpath_new (vfs_path_from_str (file_name), line_number);
-}
-
-/* --------------------------------------------------------------------------------------------- */
+#ifdef USE_INTERNAL_EDIT
 /**
  * Get list of filenames (and line numbers) from command line, when mc called as editor
  *
  * @param argc count of all arguments
  * @param argv array of strings, contains arguments
- * @return list of mcedit_arg_t objects
+ * @return list of edit_arg_t objects
  */
 
 static GList *
@@ -526,7 +498,7 @@ parse_mcedit_arguments (int argc, char **argv)
     {
         char *tmp;
         char *end, *p;
-        mcedit_arg_t *arg;
+        edit_arg_t *arg;
 
         tmp = argv[i];
 
@@ -579,36 +551,37 @@ parse_mcedit_arguments (int argc, char **argv)
              */
             if (mc_stat (tmp_vpath, &st) == -1 && mc_stat (fname_vpath, &st) != -1)
             {
-                arg = mcedit_arg_vpath_new (fname_vpath, atoi (p));
+                arg = edit_arg_vpath_new (fname_vpath, atoi (p));
                 vfs_path_free (tmp_vpath, TRUE);
             }
             else
             {
-                arg = mcedit_arg_vpath_new (tmp_vpath, 0);
+                arg = edit_arg_vpath_new (tmp_vpath, 0);
                 vfs_path_free (fname_vpath, TRUE);
             }
 
             g_free (fname);
         }
         else
-            arg = mcedit_arg_new (tmp, 0);
+            arg = edit_arg_new (tmp, 0);
 
         flist = g_list_prepend (flist, arg);
     }
 
     if (flist == NULL)
-        flist = g_list_prepend (flist, mcedit_arg_new (NULL, 0));
+        flist = g_list_prepend (flist, edit_arg_new (NULL, 0));
     else if (first_line_number != -1)
     {
         /* overwrite line number for first file */
         GList *l;
 
         l = g_list_last (flist);
-        ((mcedit_arg_t *) l->data)->line_number = first_line_number;
+        ((edit_arg_t *) l->data)->line_number = first_line_number;
     }
 
     return flist;
 }
+#endif /* USE_INTERNAL_EDIT */
 
 /* --------------------------------------------------------------------------------------------- */
 /*** public functions ****************************************************************************/
@@ -621,16 +594,18 @@ mc_setup_run_mode (char **argv)
 
     base = x_basename (argv[0]);
 
-    if (strncmp (base, "mce", 3) == 0 || strcmp (base, "vi") == 0)
-    {
-        /* mce* or vi is link to mc */
-        mc_global.mc_run_mode = MC_RUN_EDITOR;
-    }
-    else if (strncmp (base, "mcv", 3) == 0 || strcmp (base, "view") == 0)
+    if (strncmp (base, "mcv", 3) == 0 || strcmp (base, "view") == 0)
     {
         /* mcv* or view is link to mc */
         mc_global.mc_run_mode = MC_RUN_VIEWER;
     }
+#ifdef USE_INTERNAL_EDIT
+    else if (strncmp (base, "mce", 3) == 0 || strcmp (base, "vi") == 0)
+    {
+        /* mce* or vi is link to mc */
+        mc_global.mc_run_mode = MC_RUN_EDITOR;
+    }
+#endif
 #ifdef USE_DIFF_VIEW
     else if (strncmp (base, "mcd", 3) == 0 || strcmp (base, "diff") == 0)
     {
@@ -640,6 +615,8 @@ mc_setup_run_mode (char **argv)
 #endif /* USE_DIFF_VIEW */
 }
 
+/* --------------------------------------------------------------------------------------------- */
+
 gboolean
 mc_args_parse (int *argc, char ***argv, const char *translation_domain, GError ** mcerror)
 {
@@ -787,8 +764,13 @@ mc_setup_by_args (int argc, char **argv, GError ** mcerror)
     switch (mc_global.mc_run_mode)
     {
     case MC_RUN_EDITOR:
+#ifdef USE_INTERNAL_EDIT
         mc_run_param0 = parse_mcedit_arguments (argc - 1, &argv[1]);
         break;
+#else
+        mc_propagate_error (mcerror, 0, "%s\n", _("MC is built without builtin editor."));
+        return FALSE;
+#endif
 
     case MC_RUN_VIEWER:
         if (tmp == NULL)
@@ -829,17 +811,3 @@ mc_setup_by_args (int argc, char **argv, GError ** mcerror)
 }
 
 /* --------------------------------------------------------------------------------------------- */
-/**
- * Free the mcedit_arg_t object.
- *
- * @param arg mcedit_arg_t object
- */
-
-void
-mcedit_arg_free (mcedit_arg_t * arg)
-{
-    vfs_path_free (arg->file_vpath, TRUE);
-    g_free (arg);
-}
-
-/* --------------------------------------------------------------------------------------------- */
diff --git a/src/args.h b/src/args.h
index 19099ddf3..4aa59f40a 100644
--- a/src/args.h
+++ b/src/args.h
@@ -10,12 +10,6 @@
 
 /*** structures declarations (and typedefs of structures)*****************************************/
 
-typedef struct
-{
-    vfs_path_t *file_vpath;
-    long line_number;
-} mcedit_arg_t;
-
 /*** global variables defined in .c file *********************************************************/
 
 extern gboolean mc_args__force_xterm;
@@ -48,8 +42,6 @@ gboolean mc_args_parse (int *argc, char ***argv, const char *translation_domain,
 gboolean mc_args_show_info (void);
 gboolean mc_setup_by_args (int argc, char **argv, GError ** mcerror);
 
-void mcedit_arg_free (mcedit_arg_t * arg);
-
 /*** inline functions ****************************************************************************/
 
 #endif /* MC__ARGS_H */
diff --git a/src/diffviewer/ydiff.c b/src/diffviewer/ydiff.c
index c6c12dd37..f35a8fd83 100644
--- a/src/diffviewer/ydiff.c
+++ b/src/diffviewer/ydiff.c
@@ -42,11 +42,10 @@
 #include "lib/tty/color.h"
 #include "lib/tty/key.h"
 #include "lib/skin.h"           /* EDITOR_NORMAL_COLOR */
-#include "lib/vfs/vfs.h"        /* mc_opendir, mc_readdir, mc_closedir, */
+#include "lib/vfs/vfs.h"
 #include "lib/util.h"
 #include "lib/widget.h"
 #include "lib/strutil.h"
-#include "lib/strescape.h"      /* strutils_glob_escape() */
 #ifdef HAVE_CHARSET
 #include "lib/charsets.h"
 #endif
@@ -821,8 +820,8 @@ dff_execute (const char *args, const char *extra, const char *file1, const char
     char *file1_esc, *file2_esc;
 
     /* escape potential $ to avoid shell variable substitutions in popen() */
-    file1_esc = strutils_shell_escape (file1);
-    file2_esc = strutils_shell_escape (file2);
+    file1_esc = str_shell_escape (file1);
+    file2_esc = str_shell_escape (file2);
     cmd = g_strdup_printf ("diff %s %s %s %s %s", args, extra, opt, file1_esc, file2_esc);
     g_free (file1_esc);
     g_free (file2_esc);
@@ -2384,7 +2383,6 @@ static int
 dview_init (WDiff * dview, const char *args, const char *file1, const char *file2,
             const char *label1, const char *label2, DSRC dsrc)
 {
-    int ndiff;
     FBUF *f[DIFF_COUNT];
 
     f[DIFF_LEFT] = NULL;
@@ -2457,19 +2455,6 @@ dview_init (WDiff * dview, const char *args, const char *file1, const char *file
     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() */
-        dview_fclose (f[DIFF_LEFT]);
-        dview_fclose (f[DIFF_RIGHT]);
-        return -1;
-    }
-
-    dview->ndiff = ndiff;
-
-    dview_compute_areas (dview);
-
     return 0;
 }
 
@@ -3399,6 +3384,14 @@ diff_view (const char *file1, const char *file2, const char *label1, const char
     dview_dlg->get_title = dview_get_title;
 
     error = dview_init (dview, "-a", file1, file2, label1, label2, DATA_SRC_MEM);       /* XXX binary diff? */
+    if (error >= 0)
+        error = redo_diff (dview);
+    if (error >= 0)
+    {
+        dview->ndiff = error;
+        dview_compute_areas (dview);
+        error = 0;
+    }
 
     if (error == 0)
         dlg_run (dview_dlg);
diff --git a/src/editor/edit-impl.h b/src/editor/edit-impl.h
index 98472ee85..f398eb705 100644
--- a/src/editor/edit-impl.h
+++ b/src/editor/edit-impl.h
@@ -109,12 +109,6 @@ typedef struct edit_search_options_t
     gboolean all_codepages;
 } edit_search_options_t;
 
-typedef struct edit_stack_type
-{
-    long line;
-    vfs_path_t *filename_vpath;
-} edit_stack_type;
-
 /*** global variables defined in .c file *********************************************************/
 
 extern const char VERTICAL_MAGIC[5];
@@ -124,7 +118,7 @@ extern gboolean enable_show_tabs_tws;
 extern edit_search_options_t edit_search_options;
 
 extern unsigned int edit_stack_iterator;
-extern edit_stack_type edit_history_moveto[MAX_HISTORY_MOVETO];
+extern edit_arg_t edit_history_moveto[MAX_HISTORY_MOVETO];
 
 extern int max_undo;
 extern gboolean auto_syntax;
@@ -136,7 +130,7 @@ extern char *edit_window_close_char;
 
 /*** declarations of public functions ************************************************************/
 
-gboolean edit_add_window (WDialog * h, const WRect * r, const vfs_path_t * f, long fline);
+gboolean edit_add_window (WDialog * h, const WRect * r, const edit_arg_t * arg);
 WEdit *edit_find_editor (const WDialog * h);
 gboolean edit_widget_is_editor (const Widget * w);
 gboolean edit_drop_hotkey_menu (WDialog * h, int key);
@@ -158,7 +152,7 @@ long edit_get_col (const WEdit * edit);
 void edit_update_curs_row (WEdit * edit);
 void edit_update_curs_col (WEdit * edit);
 void edit_find_bracket (WEdit * edit);
-gboolean edit_reload_line (WEdit * edit, const vfs_path_t * filename_vpath, long line);
+gboolean edit_reload_line (WEdit * edit, const edit_arg_t * arg);
 void edit_set_codeset (WEdit * edit);
 
 void edit_block_copy_cmd (WEdit * edit);
@@ -180,11 +174,11 @@ char *edit_get_write_filter (const vfs_path_t * write_name_vpath,
                              const vfs_path_t * filename_vpath);
 gboolean edit_save_confirm_cmd (WEdit * edit);
 gboolean edit_save_as_cmd (WEdit * edit);
-WEdit *edit_init (WEdit * edit, const WRect * r, const vfs_path_t * filename_vpath, long line);
+WEdit *edit_init (WEdit * edit, const WRect * r, const edit_arg_t * arg);
 gboolean edit_clean (WEdit * edit);
 gboolean edit_ok_to_exit (WEdit * edit);
 gboolean edit_load_cmd (WDialog * h);
-gboolean edit_load_file_from_filename (WDialog * h, const vfs_path_t * vpath, long line);
+gboolean edit_load_file_from_filename (WDialog * h, const edit_arg_t * arg);
 gboolean edit_load_file_from_history (WDialog * h);
 gboolean edit_load_syntax_file (WDialog * h);
 gboolean edit_load_menu_file (WDialog * h);
@@ -272,7 +266,11 @@ int editcmd_dialog_raw_key_query (const char *heading, const char *query, gboole
 static inline gboolean
 edit_reload (WEdit * edit, const vfs_path_t * filename_vpath)
 {
-    return edit_reload_line (edit, filename_vpath, 0);
+    edit_arg_t arg;
+
+    edit_arg_init (&arg, (vfs_path_t *) filename_vpath, 0);
+
+    return edit_reload_line (edit, &arg);
 }
 
 #endif /* MC__EDIT_IMPL_H */
diff --git a/src/editor/edit.c b/src/editor/edit.c
index 8846b2fdc..115dbec81 100644
--- a/src/editor/edit.c
+++ b/src/editor/edit.c
@@ -111,7 +111,7 @@ int max_undo = 32768;
 gboolean enable_show_tabs_tws = TRUE;
 
 unsigned int edit_stack_iterator = 0;
-edit_stack_type edit_history_moveto[MAX_HISTORY_MOVETO];
+edit_arg_t edit_history_moveto[MAX_HISTORY_MOVETO];
 /* magic sequence for say than block is vertical */
 const char VERTICAL_MAGIC[] = { '\1', '\1', '\1', '\1', '\n' };
 
@@ -2114,14 +2114,15 @@ edit_insert_file (WEdit * edit, const vfs_path_t * filename_vpath)
  * Fill in the edit structure.  Return NULL on failure.  Pass edit as
  * NULL to allocate a new structure.
  *
- * If line is 0, try to restore saved position.  Otherwise put the
+ * If arg is NULL or arg->line_number is 0, try to restore saved position.  Otherwise put the
  * cursor on that line and show it in the middle of the screen.
  */
 
 WEdit *
-edit_init (WEdit * edit, const WRect * r, const vfs_path_t * filename_vpath, long line)
+edit_init (WEdit * edit, const WRect * r, const edit_arg_t * arg)
 {
     gboolean to_free = FALSE;
+    long line;
 
     auto_syntax = TRUE;         /* Resetting to auto on every invocation */
     edit_options.line_state_width = edit_options.line_state ? LINE_STATE_WIDTH : 0;
@@ -2164,7 +2165,7 @@ edit_init (WEdit * edit, const WRect * r, const vfs_path_t * filename_vpath, lon
     edit->stat1.st_gid = getgid ();
     edit->stat1.st_mtime = 0;
 
-    edit->attrs_ok = (mc_fgetflags (filename_vpath, &edit->attrs) == 0);
+    edit->attrs_ok = (mc_fgetflags (arg->file_vpath, &edit->attrs) == 0);
 
     edit->over_col = 0;
     edit->bracket = -1;
@@ -2172,7 +2173,16 @@ edit_init (WEdit * edit, const WRect * r, const vfs_path_t * filename_vpath, lon
     edit->force |= REDRAW_PAGE;
 
     /* set file name before load file */
-    edit_set_filename (edit, filename_vpath);
+    if (arg != NULL)
+    {
+        edit_set_filename (edit, arg->file_vpath);
+        line = arg->line_number;
+    }
+    else
+    {
+        edit_set_filename (edit, NULL);
+        line = 0;
+    }
 
     edit->undo_stack_size = START_STACK_SIZE;
     edit->undo_stack_size_mask = START_STACK_SIZE - 1;
@@ -2273,7 +2283,7 @@ edit_clean (WEdit * edit)
  * @return TRUE on success, FALSE on failure.
  */
 gboolean
-edit_reload_line (WEdit * edit, const vfs_path_t * filename_vpath, long line)
+edit_reload_line (WEdit * edit, const edit_arg_t * arg)
 {
     Widget *w = WIDGET (edit);
     WEdit *e;
@@ -2284,7 +2294,7 @@ edit_reload_line (WEdit * edit, const vfs_path_t * filename_vpath, long line)
     e->fullscreen = edit->fullscreen;
     e->loc_prev = edit->loc_prev;
 
-    if (edit_init (e, &w->rect, filename_vpath, line) == NULL)
+    if (edit_init (e, &w->rect, arg) == NULL)
     {
         g_free (e);
         return FALSE;
@@ -3017,9 +3027,9 @@ edit_move_to_prev_col (WEdit * edit, off_t p)
         }
         else
         {
-            edit->over_col = 0;
-            edit->prev_col = edit->curs_col;
             edit->curs_col = prev + over;
+            edit->prev_col = edit->curs_col;
+            edit->over_col = 0;
         }
     }
     else
@@ -4135,10 +4145,7 @@ void
 edit_stack_init (void)
 {
     for (edit_stack_iterator = 0; edit_stack_iterator < MAX_HISTORY_MOVETO; edit_stack_iterator++)
-    {
-        edit_history_moveto[edit_stack_iterator].filename_vpath = NULL;
-        edit_history_moveto[edit_stack_iterator].line = -1;
-    }
+        edit_arg_init (&edit_history_moveto[edit_stack_iterator], NULL, -1);
 
     edit_stack_iterator = 0;
 }
@@ -4149,7 +4156,7 @@ void
 edit_stack_free (void)
 {
     for (edit_stack_iterator = 0; edit_stack_iterator < MAX_HISTORY_MOVETO; edit_stack_iterator++)
-        vfs_path_free (edit_history_moveto[edit_stack_iterator].filename_vpath, TRUE);
+        vfs_path_free (edit_history_moveto[edit_stack_iterator].file_vpath, TRUE);
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -4171,3 +4178,93 @@ edit_move_down (WEdit * edit, long i, gboolean do_scroll)
 }
 
 /* --------------------------------------------------------------------------------------------- */
+/**
+ * Create edit_arg_t object from vfs_path_t object and the line number.
+ *
+ * @param file_vpath  file path object
+ * @param line_number line number. If value is 0, try to restore saved position.
+ * @return edit_arg_t object
+ */
+
+edit_arg_t *
+edit_arg_vpath_new (vfs_path_t * file_vpath, long line_number)
+{
+    edit_arg_t *arg;
+
+    arg = g_new (edit_arg_t, 1);
+    arg->file_vpath = file_vpath;
+    arg->line_number = line_number;
+
+    return arg;
+}
+
+/* --------------------------------------------------------------------------------------------- */
+/**
+ * Create edit_arg_t object from file name and the line number.
+ *
+ * @param file_name   file name
+ * @param line_number line number. If value is 0, try to restore saved position.
+ * @return edit_arg_t object
+ */
+
+edit_arg_t *
+edit_arg_new (const char *file_name, long line_number)
+{
+    return edit_arg_vpath_new (vfs_path_from_str (file_name), line_number);
+}
+
+/* --------------------------------------------------------------------------------------------- */
+/**
+ * Initialize edit_arg_t object.
+ *
+ * @param arg  edit_arg_t object
+ * @param vpath vfs_path_t object
+ * @param line line number
+ */
+
+void
+edit_arg_init (edit_arg_t * arg, vfs_path_t * vpath, long line)
+{
+    arg->file_vpath = (vfs_path_t *) vpath;
+    arg->line_number = line;
+}
+
+/* --------------------------------------------------------------------------------------------- */
+/**
+ * Apply new values to edit_arg_t object members.
+ *
+ * @param arg  edit_arg_t object
+ * @param vpath vfs_path_t object
+ * @param line line number
+ */
+
+void
+edit_arg_assign (edit_arg_t * arg, vfs_path_t * vpath, long line)
+{
+    vfs_path_free (arg->file_vpath, TRUE);
+    edit_arg_init (arg, vpath, line);
+}
+
+/* --------------------------------------------------------------------------------------------- */
+/**
+ * Free the edit_arg_t object.
+ *
+ * @param arg edit_arg_t object
+ */
+
+void
+edit_arg_free (edit_arg_t * arg)
+{
+    vfs_path_free (arg->file_vpath, TRUE);
+    g_free (arg);
+}
+
+/* --------------------------------------------------------------------------------------------- */
+
+const char *
+edit_get_file_name (const WEdit * edit)
+{
+    return vfs_path_as_str (edit->filename_vpath);
+}
+
+/* --------------------------------------------------------------------------------------------- */
diff --git a/src/editor/edit.h b/src/editor/edit.h
index 358aa3f14..a70491d59 100644
--- a/src/editor/edit.h
+++ b/src/editor/edit.h
@@ -62,6 +62,12 @@ typedef struct
     gboolean check_nl_at_eof;
 } edit_options_t;
 
+typedef struct
+{
+    vfs_path_t *file_vpath;
+    long line_number;
+} edit_arg_t;
+
 /*** global variables defined in .c file *********************************************************/
 
 extern edit_options_t edit_options;
@@ -72,9 +78,15 @@ extern edit_options_t edit_options;
 void edit_stack_init (void);
 void edit_stack_free (void);
 
-gboolean edit_file (const vfs_path_t * file_vpath, long line);
+gboolean edit_file (const edit_arg_t * arg);
 gboolean edit_files (const GList * files);
 
+edit_arg_t *edit_arg_vpath_new (vfs_path_t * file_vpath, long line_number);
+edit_arg_t *edit_arg_new (const char *file_name, long line_number);
+void edit_arg_init (edit_arg_t * arg, vfs_path_t * vpath, long line);
+void edit_arg_assign (edit_arg_t * arg, vfs_path_t * vpath, long line);
+void edit_arg_free (edit_arg_t * arg);
+
 const char *edit_get_file_name (const WEdit * edit);
 off_t edit_get_cursor_offset (const WEdit * edit);
 long edit_get_curs_col (const WEdit * edit);
diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c
index 32144b123..38a9b76d7 100644
--- a/src/editor/editcmd.c
+++ b/src/editor/editcmd.c
@@ -1058,9 +1058,11 @@ edit_load_cmd (WDialog * h)
     if (exp != NULL && *exp != '\0')
     {
         vfs_path_t *exp_vpath;
+        edit_arg_t arg;
 
         exp_vpath = vfs_path_from_str (exp);
-        ret = edit_load_file_from_filename (h, exp_vpath, 0);
+        edit_arg_init (&arg, exp_vpath, 0);
+        ret = edit_load_file_from_filename (h, &arg);
         vfs_path_free (exp_vpath, TRUE);
     }
 
@@ -1081,13 +1083,13 @@ edit_load_cmd (WDialog * h)
  */
 
 gboolean
-edit_load_file_from_filename (WDialog * h, const vfs_path_t * vpath, long line)
+edit_load_file_from_filename (WDialog * h, const edit_arg_t * arg)
 {
     WRect r = WIDGET (h)->rect;
 
     rect_grow (&r, -1, 0);
 
-    return edit_add_window (h, &r, vpath, line);
+    return edit_add_window (h, &r, arg);
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -1108,9 +1110,11 @@ edit_load_file_from_history (WDialog * h)
     if (exp != NULL && (action == CK_Edit || action == CK_Enter))
     {
         vfs_path_t *exp_vpath;
+        edit_arg_t arg;
 
         exp_vpath = vfs_path_from_str (exp);
-        ret = edit_load_file_from_filename (h, exp_vpath, 0);
+        edit_arg_init (&arg, exp_vpath, 0);
+        ret = edit_load_file_from_filename (h, &arg);
         vfs_path_free (exp_vpath, TRUE);
     }
 
@@ -1131,6 +1135,7 @@ edit_load_syntax_file (WDialog * h)
 {
     vfs_path_t *extdir_vpath;
     int dir = 0;
+    edit_arg_t arg;
     gboolean ret = FALSE;
 
     if (geteuid () == 0)
@@ -1153,11 +1158,15 @@ edit_load_syntax_file (WDialog * h)
 
         user_syntax_file_vpath = mc_config_get_full_vpath (EDIT_SYNTAX_FILE);
         check_for_default (extdir_vpath, user_syntax_file_vpath);
-        ret = edit_load_file_from_filename (h, user_syntax_file_vpath, 0);
+        edit_arg_init (&arg, user_syntax_file_vpath, 0);
+        ret = edit_load_file_from_filename (h, &arg);
         vfs_path_free (user_syntax_file_vpath, TRUE);
     }
     else if (dir == 1)
-        ret = edit_load_file_from_filename (h, extdir_vpath, 0);
+    {
+        edit_arg_init (&arg, extdir_vpath, 0);
+        ret = edit_load_file_from_filename (h, &arg);
+    }
 
     vfs_path_free (extdir_vpath, TRUE);
 
@@ -1177,6 +1186,7 @@ edit_load_menu_file (WDialog * h)
     vfs_path_t *buffer_vpath;
     vfs_path_t *menufile_vpath;
     int dir;
+    edit_arg_t arg;
     gboolean ret;
 
     query_set_sel (1);
@@ -1222,7 +1232,8 @@ edit_load_menu_file (WDialog * h)
         return FALSE;
     }
 
-    ret = edit_load_file_from_filename (h, buffer_vpath, 0);
+    edit_arg_init (&arg, buffer_vpath, 0);
+    ret = edit_load_file_from_filename (h, &arg);
 
     vfs_path_free (buffer_vpath, TRUE);
     vfs_path_free (menufile_vpath, TRUE);
@@ -1977,13 +1988,12 @@ edit_load_forward_cmd (WEdit * edit)
     if (edit_stack_iterator + 1 >= MAX_HISTORY_MOVETO)
         return FALSE;
 
-    if (edit_history_moveto[edit_stack_iterator + 1].line < 1)
+    if (edit_history_moveto[edit_stack_iterator + 1].line_number < 1)
         return FALSE;
 
     edit_stack_iterator++;
-    if (edit_history_moveto[edit_stack_iterator].filename_vpath != NULL)
-        return edit_reload_line (edit, edit_history_moveto[edit_stack_iterator].filename_vpath,
-                                 edit_history_moveto[edit_stack_iterator].line);
+    if (edit_history_moveto[edit_stack_iterator].file_vpath != NULL)
+        return edit_reload_line (edit, &edit_history_moveto[edit_stack_iterator]);
 
     return FALSE;
 }
@@ -2008,9 +2018,8 @@ edit_load_back_cmd (WEdit * edit)
         return FALSE;
 
     edit_stack_iterator--;
-    if (edit_history_moveto[edit_stack_iterator].filename_vpath != NULL)
-        return edit_reload_line (edit, edit_history_moveto[edit_stack_iterator].filename_vpath,
-                                 edit_history_moveto[edit_stack_iterator].line);
+    if (edit_history_moveto[edit_stack_iterator].file_vpath != NULL)
+        return edit_reload_line (edit, &edit_history_moveto[edit_stack_iterator]);
 
     return FALSE;
 }
diff --git a/src/editor/editmenu.c b/src/editor/editmenu.c
index f83742c5a..1de8884c0 100644
--- a/src/editor/editmenu.c
+++ b/src/editor/editmenu.c
@@ -43,12 +43,10 @@
 
 #include "lib/global.h"
 
-#include "lib/tty/tty.h"        /* KEY_F */
-#include "lib/tty/key.h"        /* XCTRL */
+#include "lib/tty/key.h"        /* ALT */
 #include "lib/widget.h"
 
 #include "src/setup.h"          /* drop_menus */
-#include "src/keymap.h"
 
 #include "edit-impl.h"
 #include "editwidget.h"
diff --git a/src/editor/editsearch.c b/src/editor/editsearch.c
index 646511ed8..86a5e08e1 100644
--- a/src/editor/editsearch.c
+++ b/src/editor/editsearch.c
@@ -300,18 +300,19 @@ edit_search_get_current_end_line_char (const WEdit * edit)
  */
 
 static edit_search_line_t
-edit_get_search_line_type (mc_search_t * search)
+edit_get_search_line_type (const mc_search_t * search)
 {
     edit_search_line_t search_line_type = 0;
 
-    if (search->search_type != MC_SEARCH_T_REGEX)
-        return search_line_type;
+    if (search->search_type == MC_SEARCH_T_REGEX)
+    {
+        if (search->original.str->str[0] == '^')
+            search_line_type |= AT_START_LINE;
 
-    if (search->original.str->str[0] == '^')
-        search_line_type |= AT_START_LINE;
+        if (search->original.str->str[search->original.str->len - 1] == '$')
+            search_line_type |= AT_END_LINE;
+    }
 
-    if (search->original.str->str[search->original.str->len - 1] == '$')
-        search_line_type |= AT_END_LINE;
     return search_line_type;
 }
 
diff --git a/src/editor/editwidget.c b/src/editor/editwidget.c
index 45be31e65..14c59dc16 100644
--- a/src/editor/editwidget.c
+++ b/src/editor/editwidget.c
@@ -60,7 +60,6 @@
 #include "src/execute.h"        /* toggle_subshell()  */
 #include "src/filemanager/cmd.h"        /* save_setup_cmd()  */
 #include "src/learn.h"          /* learn_keys() */
-#include "src/args.h"           /* mcedit_arg_t */
 
 #include "edit-impl.h"
 #include "editwidget.h"
@@ -406,7 +405,7 @@ edit_dialog_command_execute (WDialog * h, long command)
     switch (command)
     {
     case CK_EditNew:
-        edit_load_file_from_filename (h, NULL, 0);
+        edit_load_file_from_filename (h, NULL);
         break;
     case CK_EditFile:
         edit_load_cmd (h);
@@ -1197,13 +1196,12 @@ edit_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event)
  */
 
 gboolean
-edit_file (const vfs_path_t * file_vpath, long line)
+edit_file (const edit_arg_t * arg)
 {
-    mcedit_arg_t arg = { (vfs_path_t *) file_vpath, line };
     GList *files;
     gboolean ok;
 
-    files = g_list_prepend (NULL, &arg);
+    files = g_list_prepend (NULL, (edit_arg_t *) arg);
     ok = edit_files (files);
     g_list_free (files);
 
@@ -1270,10 +1268,9 @@ edit_files (const GList * files)
 
     for (file = files; file != NULL; file = g_list_next (file))
     {
-        mcedit_arg_t *f = (mcedit_arg_t *) file->data;
         gboolean f_ok;
 
-        f_ok = edit_load_file_from_filename (edit_dlg, f->file_vpath, f->line_number);
+        f_ok = edit_load_file_from_filename (edit_dlg, (const edit_arg_t *) file->data);
         /* at least one file has been opened succefully */
         ok = ok || f_ok;
     }
@@ -1289,14 +1286,6 @@ edit_files (const GList * files)
 
 /* --------------------------------------------------------------------------------------------- */
 
-const char *
-edit_get_file_name (const WEdit * edit)
-{
-    return vfs_path_as_str (edit->filename_vpath);
-}
-
-/* --------------------------------------------------------------------------------------------- */
-
 WEdit *
 edit_find_editor (const WDialog * h)
 {
@@ -1372,12 +1361,12 @@ edit_save_size (WEdit * edit)
  */
 
 gboolean
-edit_add_window (WDialog * h, const WRect * r, const vfs_path_t * f, long fline)
+edit_add_window (WDialog * h, const WRect * r, const edit_arg_t * arg)
 {
     WEdit *edit;
     Widget *w;
 
-    edit = edit_init (NULL, r, f, fline);
+    edit = edit_init (NULL, r, arg);
     if (edit == NULL)
         return FALSE;
 
diff --git a/src/editor/etags.c b/src/editor/etags.c
index ddc5ca8d6..40ea023b2 100644
--- a/src/editor/etags.c
+++ b/src/editor/etags.c
@@ -380,25 +380,21 @@ editcmd_dialog_select_definition_show (WEdit * edit, char *match_expr, GPtrArray
 
         if (curr != NULL && do_moveto && edit_stack_iterator + 1 < MAX_HISTORY_MOVETO)
         {
-            vfs_path_free (edit_history_moveto[edit_stack_iterator].filename_vpath, TRUE);
+            vfs_path_t *vpath;
 
             /* Is file path absolute? Prepend with dir_vpath if necessary */
             if (edit->filename_vpath != NULL && edit->filename_vpath->relative
                 && edit->dir_vpath != NULL)
-                edit_history_moveto[edit_stack_iterator].filename_vpath =
-                    vfs_path_append_vpath_new (edit->dir_vpath, edit->filename_vpath, NULL);
+                vpath = vfs_path_append_vpath_new (edit->dir_vpath, edit->filename_vpath, NULL);
             else
-                edit_history_moveto[edit_stack_iterator].filename_vpath =
-                    vfs_path_clone (edit->filename_vpath);
+                vpath = vfs_path_clone (edit->filename_vpath);
 
-            edit_history_moveto[edit_stack_iterator].line = edit->start_line + edit->curs_row + 1;
+            edit_arg_assign (&edit_history_moveto[edit_stack_iterator], vpath,
+                             edit->start_line + edit->curs_row + 1);
             edit_stack_iterator++;
-            vfs_path_free (edit_history_moveto[edit_stack_iterator].filename_vpath, TRUE);
-            edit_history_moveto[edit_stack_iterator].filename_vpath =
-                vfs_path_from_str ((char *) curr_def->fullpath);
-            edit_history_moveto[edit_stack_iterator].line = curr_def->line;
-            edit_reload_line (edit, edit_history_moveto[edit_stack_iterator].filename_vpath,
-                              edit_history_moveto[edit_stack_iterator].line);
+            edit_arg_assign (&edit_history_moveto[edit_stack_iterator],
+                             vfs_path_from_str ((char *) curr_def->fullpath), curr_def->line);
+            edit_reload_line (edit, &edit_history_moveto[edit_stack_iterator]);
         }
     }
 
diff --git a/src/execute.c b/src/execute.c
index ad60ef96b..f9beed140 100644
--- a/src/execute.c
+++ b/src/execute.c
@@ -425,7 +425,7 @@ shell_execute (const char *command, int flags)
 {
     char *cmd = NULL;
 
-    if (flags & EXECUTE_HIDE)
+    if ((flags & EXECUTE_HIDE) != 0)
     {
         cmd = g_strconcat (" ", command, (char *) NULL);
         flags ^= EXECUTE_HIDE;
@@ -435,13 +435,14 @@ shell_execute (const char *command, int flags)
     if (mc_global.tty.use_subshell)
     {
         if (subshell_state == INACTIVE)
-            do_execute (mc_global.shell->path, cmd ? cmd : command, flags | EXECUTE_AS_SHELL);
+            do_execute (mc_global.shell->path, cmd != NULL ? cmd : command,
+                        flags | EXECUTE_AS_SHELL);
         else
             message (D_ERROR, MSG_ERROR, "%s", _("The shell is already running a command"));
     }
     else
 #endif /* ENABLE_SUBSHELL */
-        do_execute (mc_global.shell->path, cmd ? cmd : command, flags | EXECUTE_AS_SHELL);
+        do_execute (mc_global.shell->path, cmd != NULL ? cmd : command, flags | EXECUTE_AS_SHELL);
 
     g_free (cmd);
 }
diff --git a/src/execute.h b/src/execute.h
index a326806df..8e1a205f4 100644
--- a/src/execute.h
+++ b/src/execute.h
@@ -5,7 +5,7 @@
 #ifndef MC__EXECUTE_H
 #define MC__EXECUTE_H
 
-#include "lib/utilunix.h"
+#include "lib/util.h"
 #include "lib/vfs/vfs.h"
 
 /*** typedefs(not structures) and defined constants **********************************************/
diff --git a/src/filemanager/boxes.c b/src/filemanager/boxes.c
index 2dbc75d65..6291ec5f0 100644
--- a/src/filemanager/boxes.c
+++ b/src/filemanager/boxes.c
@@ -1077,6 +1077,7 @@ char *
 tree_box (const char *current_dir)
 {
     WTree *mytree;
+    WRect r;
     WDialog *dlg;
     WGroup *g;
     Widget *wd;
@@ -1091,7 +1092,8 @@ tree_box (const char *current_dir)
     g = GROUP (dlg);
     wd = WIDGET (dlg);
 
-    mytree = tree_new (2, 2, wd->rect.lines - 6, wd->rect.cols - 5, FALSE);
+    rect_init (&r, 2, 2, wd->rect.lines - 6, wd->rect.cols - 5);
+    mytree = tree_new (&r, FALSE);
     group_add_widget_autopos (g, mytree, WPOS_KEEP_ALL, NULL);
     group_add_widget_autopos (g, hline_new (wd->rect.lines - 4, 1, -1), WPOS_KEEP_BOTTOM, NULL);
     bar = buttonbar_new ();
diff --git a/src/filemanager/cd.c b/src/filemanager/cd.c
index 65b1f6235..017d3ea81 100644
--- a/src/filemanager/cd.c
+++ b/src/filemanager/cd.c
@@ -36,7 +36,7 @@
 
 #include "lib/global.h"
 #include "lib/vfs/vfs.h"
-#include "lib/strescape.h"      /* strutils_shell_unescape() */
+#include "lib/strutil.h"
 #include "lib/util.h"           /* whitespace() */
 #include "lib/widget.h"         /* message() */
 
@@ -90,7 +90,7 @@ examine_cd (const char *_path)
     char *p;
 
     /* Tilde expansion */
-    path = strutils_shell_unescape (_path);
+    path = str_shell_unescape (_path);
     path_tilde = tilde_expand (path);
     g_free (path);
 
diff --git a/src/filemanager/cmd.c b/src/filemanager/cmd.c
index 0ef718499..1ddc3f311 100644
--- a/src/filemanager/cmd.c
+++ b/src/filemanager/cmd.c
@@ -664,7 +664,11 @@ edit_file_at_line (const vfs_path_t * what_vpath, gboolean internal, long start_
 
 #ifdef USE_INTERNAL_EDIT
     if (internal)
-        edit_file (what_vpath, start_line);
+    {
+        const edit_arg_t arg = { (vfs_path_t *) what_vpath, start_line };
+
+        edit_file (&arg);
+    }
     else
 #endif /* USE_INTERNAL_EDIT */
     {
diff --git a/src/filemanager/file.c b/src/filemanager/file.c
index cafa451c6..41bd86cab 100644
--- a/src/filemanager/file.c
+++ b/src/filemanager/file.c
@@ -64,7 +64,6 @@
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"
 #include "lib/search.h"
-#include "lib/strescape.h"
 #include "lib/strutil.h"
 #include "lib/util.h"
 #include "lib/vfs/vfs.h"
@@ -107,16 +106,15 @@ const char *op_names[3] = {
 /*** file scope type declarations ****************************************************************/
 
 /* This is a hard link cache */
-struct link
+typedef struct
 {
     const struct vfs_class *vfs;
     dev_t dev;
     ino_t ino;
-    short linkcount;
     mode_t st_mode;
     vfs_path_t *src_vpath;
     vfs_path_t *dst_vpath;
-};
+} link_t;
 
 /* Status of the destination file */
 typedef enum
@@ -189,14 +187,8 @@ static GSList *linklist = NULL;
 static GQueue *erase_list = NULL;
 
 /*
- * In copy_dir_dir we use two additional single linked lists: The first -
- * variable name 'parent_dirs' - holds information about already copied
- * directories and is used to detect cyclic symbolic links.
- * The second ('dest_dirs' below) holds information about just created
- * target directories and is used to detect when an directory is copied
- * into itself (we don't want to copy infinitely).
- * Both lists don't use the linkcount and name structure members of struct
- * link.
+ * This list holds information about just created target directories and is used to detect
+ * when an directory is copied into itself (we don't want to copy infinitely).
  */
 static GSList *dest_dirs = NULL;
 
@@ -310,7 +302,7 @@ build_dest (file_op_context_t * ctx, const char *src, const char *dest, FileProg
 static void
 free_link (void *data)
 {
-    struct link *lp = (struct link *) data;
+    link_t *lp = (link_t *) data;
 
     vfs_path_free (lp->src_vpath, TRUE);
     vfs_path_free (lp->dst_vpath, TRUE);
@@ -340,7 +332,7 @@ free_linklist (GSList * lp)
 
 /* --------------------------------------------------------------------------------------------- */
 
-static const struct link *
+static const link_t *
 is_in_linklist (const GSList * lp, const vfs_path_t * vpath, const struct stat *sb)
 {
     const struct vfs_class *class;
@@ -351,7 +343,7 @@ is_in_linklist (const GSList * lp, const vfs_path_t * vpath, const struct stat *
 
     for (; lp != NULL; lp = (const GSList *) g_slist_next (lp))
     {
-        const struct link *lnk = (const struct link *) lp->data;
+        const link_t *lnk = (const link_t *) lp->data;
 
         if (lnk->vfs == class && lnk->ino == ino && lnk->dev == dev)
             return lnk;
@@ -372,7 +364,7 @@ static hardlink_status_t
 check_hardlinks (const vfs_path_t * src_vpath, const struct stat *src_stat,
                  const vfs_path_t * dst_vpath, gboolean * skip_all)
 {
-    struct link *lnk;
+    link_t *lnk;
     ino_t ino = src_stat->st_ino;
     dev_t dev = src_stat->st_dev;
 
@@ -381,7 +373,7 @@ check_hardlinks (const vfs_path_t * src_vpath, const struct stat *src_stat,
     if ((vfs_file_class_flags (src_vpath) & VFSF_NOLINKS) != 0)
         return HARDLINK_UNSUPPORTED;
 
-    lnk = (struct link *) is_in_linklist (linklist, src_vpath, src_stat);
+    lnk = (link_t *) is_in_linklist (linklist, src_vpath, src_stat);
     if (lnk != NULL)
     {
         int stat_result;
@@ -482,13 +474,12 @@ check_hardlinks (const vfs_path_t * src_vpath, const struct stat *src_stat,
         return HARDLINK_ERROR;
     }
 
-    lnk = g_try_new (struct link, 1);
+    lnk = g_try_new (link_t, 1);
     if (lnk != NULL)
     {
         lnk->vfs = vfs_path_get_last_path_vfs (src_vpath);
         lnk->ino = ino;
         lnk->dev = dev;
-        lnk->linkcount = 0;
         lnk->st_mode = 0;
         lnk->src_vpath = vfs_path_clone (src_vpath);
         lnk->dst_vpath = vfs_path_clone (dst_vpath);
@@ -1582,9 +1573,9 @@ erase_dir_after_copy (file_op_total_context_t * tctx, file_op_context_t * ctx,
 
         while (!g_queue_is_empty (erase_list) && *status != FILE_ABORT)
         {
-            struct link *lp;
+            link_t *lp;
 
-            lp = (struct link *) g_queue_pop_head (erase_list);
+            lp = (link_t *) g_queue_pop_head (erase_list);
 
             if (S_ISDIR (lp->st_mode))
                 *status = erase_dir_iff_empty (ctx, lp->src_vpath, tctx->progress_count);
@@ -2952,7 +2943,7 @@ copy_dir_dir (file_op_total_context_t * tctx, file_op_context_t * ctx, const cha
     gboolean attrs_ok = ctx->preserve;
     DIR *reading;
     FileProgressStatus return_status = FILE_CONT;
-    struct link *lp;
+    link_t *lp;
     vfs_path_t *src_vpath, *dst_vpath;
     gboolean do_mkdir = TRUE;
 
@@ -3057,7 +3048,7 @@ copy_dir_dir (file_op_total_context_t * tctx, file_op_context_t * ctx, const cha
         goto ret_fast;
     }
 
-    lp = g_new0 (struct link, 1);
+    lp = g_new0 (link_t, 1);
     lp->vfs = vfs_path_get_last_path_vfs (src_vpath);
     lp->ino = src_stat.st_ino;
     lp->dev = src_stat.st_dev;
@@ -3132,7 +3123,7 @@ copy_dir_dir (file_op_total_context_t * tctx, file_op_context_t * ctx, const cha
                 goto ret;
         }
 
-        lp = g_new0 (struct link, 1);
+        lp = g_new0 (link_t, 1);
         mc_stat (dst_vpath, &dst_stat);
         lp->vfs = vfs_path_get_last_path_vfs (dst_vpath);
         lp->ino = dst_stat.st_ino;
@@ -3211,7 +3202,7 @@ copy_dir_dir (file_op_total_context_t * tctx, file_op_context_t * ctx, const cha
                 if (erase_list == NULL)
                     erase_list = g_queue_new ();
 
-                lp = g_new0 (struct link, 1);
+                lp = g_new0 (link_t, 1);
                 lp->src_vpath = tmp_vpath;
                 lp->st_mode = dst_stat.st_mode;
                 g_queue_push_tail (erase_list, lp);
diff --git a/src/filemanager/filegui.c b/src/filemanager/filegui.c
index 8e7777fb1..caa481e46 100644
--- a/src/filemanager/filegui.c
+++ b/src/filemanager/filegui.c
@@ -147,7 +147,6 @@ statfs (char const *filename, struct fs_info *buf)
 #include "lib/mcconfig.h"
 #include "lib/search.h"
 #include "lib/vfs/vfs.h"
-#include "lib/strescape.h"
 #include "lib/strutil.h"
 #include "lib/timefmt.h"        /* file_date() */
 #include "lib/util.h"
@@ -1300,6 +1299,7 @@ char *
 file_mask_dialog (file_op_context_t * ctx, gboolean only_one, const char *format, const void *text,
                   const char *def_text, gboolean * do_bg)
 {
+    gboolean preserve;
     size_t fmd_xlen;
     vfs_path_t *vpath;
     gboolean source_easy_patterns = easy_patterns;
@@ -1312,7 +1312,8 @@ file_mask_dialog (file_op_context_t * ctx, gboolean only_one, const char *format
         return NULL;
 
     /* unselect checkbox if target filesystem doesn't support attributes */
-    ctx->op_preserve = copymove_persistent_attr && filegui__check_attrs_on_fs (def_text);
+    preserve = copymove_persistent_attr && filegui__check_attrs_on_fs (def_text);
+
     ctx->stable_symlinks = FALSE;
     *do_bg = FALSE;
 
@@ -1322,9 +1323,9 @@ file_mask_dialog (file_op_context_t * ctx, gboolean only_one, const char *format
     vfs_path_free (vpath, TRUE);
 
     if (source_easy_patterns)
-        def_text_secure = strutils_glob_escape (tmp);
+        def_text_secure = str_glob_escape (tmp);
     else
-        def_text_secure = strutils_regex_escape (tmp);
+        def_text_secure = str_regex_escape (tmp);
     g_free (tmp);
 
     if (only_one)
@@ -1377,7 +1378,7 @@ file_mask_dialog (file_op_context_t * ctx, gboolean only_one, const char *format
             QUICK_SEPARATOR (TRUE),
             QUICK_START_COLUMNS,
                 QUICK_CHECKBOX (N_("Follow &links"), &ctx->follow_links, NULL),
-                QUICK_CHECKBOX (N_("Preserve &attributes"), &ctx->op_preserve, NULL),
+                QUICK_CHECKBOX (N_("Preserve &attributes"), &preserve, NULL),
             QUICK_NEXT_COLUMN,
                 QUICK_CHECKBOX (N_("Di&ve into subdir if exists"), &ctx->dive_into_subdirs, NULL),
                 QUICK_CHECKBOX (N_("&Stable symlinks"), &ctx->stable_symlinks, NULL),
@@ -1411,7 +1412,7 @@ file_mask_dialog (file_op_context_t * ctx, gboolean only_one, const char *format
 
             ctx->stat_func = ctx->follow_links ? mc_stat : mc_lstat;
 
-            if (ctx->op_preserve)
+            if (preserve)
             {
                 ctx->preserve = TRUE;
                 ctx->umask_kill = 0777777;
diff --git a/src/filemanager/filemanager.c b/src/filemanager/filemanager.c
index 1250dad09..2e8baca78 100644
--- a/src/filemanager/filemanager.c
+++ b/src/filemanager/filemanager.c
@@ -460,21 +460,11 @@ toggle_panels_split (void)
 #ifdef ENABLE_VFS
 /* event helper */
 static gboolean
-check_panel_timestamp (const WPanel * panel, panel_view_mode_t mode, struct vfs_class *vclass,
-                       vfsid id)
+check_panel_timestamp (const WPanel * panel, panel_view_mode_t mode, const struct vfs_class *vclass,
+                       const vfsid id)
 {
-    if (mode == view_listing)
-    {
-        const struct vfs_class *me;
-
-        me = vfs_path_get_last_path_vfs (panel->cwd_vpath);
-        if (me != vclass)
-            return FALSE;
-
-        if (vfs_getid (panel->cwd_vpath) != id)
-            return FALSE;
-    }
-    return TRUE;
+    return (mode != view_listing || (vfs_path_get_last_path_vfs (panel->cwd_vpath) == vclass
+                                     && vfs_getid (panel->cwd_vpath) == id));
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -797,8 +787,12 @@ put_tagged (WPanel * panel)
 {
     if (!command_prompt)
         return;
+
     input_disable_update (cmdline);
-    if (panel->marked)
+
+    if (panel->marked == 0)
+        command_insert (cmdline, panel_current_entry (panel)->fname->str, TRUE);
+    else
     {
         int i;
 
@@ -806,8 +800,6 @@ put_tagged (WPanel * panel)
             if (panel->dir.list[i].f.marked != 0)
                 command_insert (cmdline, panel->dir.list[i].fname->str, TRUE);
     }
-    else
-        command_insert (cmdline, panel_current_entry (panel)->fname->str, TRUE);
 
     input_enable_update (cmdline);
 }
diff --git a/src/filemanager/fileopctx.c b/src/filemanager/fileopctx.c
index 2da307269..72a51bafe 100644
--- a/src/filemanager/fileopctx.c
+++ b/src/filemanager/fileopctx.c
@@ -74,7 +74,6 @@ file_op_context_new (FileOperation op)
     ctx->operation = op;
     ctx->eta_secs = 0.0;
     ctx->progress_bytes = 0;
-    ctx->op_preserve = TRUE;
     ctx->do_reget = 1;
     ctx->stat_func = mc_lstat;
     ctx->preserve = TRUE;
diff --git a/src/filemanager/fileopctx.h b/src/filemanager/fileopctx.h
index ed0b5d625..1c26140dd 100644
--- a/src/filemanager/fileopctx.h
+++ b/src/filemanager/fileopctx.h
@@ -92,13 +92,6 @@ typedef struct
     size_t progress_count;
     uintmax_t progress_bytes;
 
-    /* The value of the "preserve Attributes" checkbox in the copy file dialog.
-     * We can't use the value of "ctx->preserve" because it can change in order
-     * to preserve file attributes when moving files across filesystem boundaries
-     * (we want to keep the value of the checkbox between copy operations).
-     */
-    gboolean op_preserve;
-
     /* Result from the recursive query */
     FileCopyMode recursive_result;
 
diff --git a/src/filemanager/find.c b/src/filemanager/find.c
index 93f89b131..7fb90e8d9 100644
--- a/src/filemanager/find.c
+++ b/src/filemanager/find.c
@@ -1931,13 +1931,18 @@ find_cmd (WPanel * panel)
                 dirname_vpath = vfs_path_from_str (dirname);
                 panel_cd (panel, dirname_vpath, cd_exact);
                 vfs_path_free (dirname_vpath, TRUE);
-                /* *INDENT-OFF* */
+
                 if (filename != NULL)
-                    panel_set_current_by_name (panel,
-                                               filename + (content_pattern != NULL
-                                                           ? strchr (filename + 4, ':') - filename + 1
-                                                           : 4));
-                /* *INDENT-ON* */
+                {
+                    size_t offset;
+
+                    if (content_pattern == NULL)
+                        offset = 4;
+                    else
+                        offset = strchr (filename + 4, ':') - filename + 1;
+
+                    panel_set_current_by_name (panel, filename + offset);
+                }
             }
             else if (filename != NULL)
             {
diff --git a/src/filemanager/info.c b/src/filemanager/info.c
index 584bc2af6..b23032276 100644
--- a/src/filemanager/info.c
+++ b/src/filemanager/info.c
@@ -262,23 +262,23 @@ info_show_info (WInfo * info)
     case 6:
         widget_gotoyx (w, 6, 3);
 
+#ifdef ENABLE_EXT2FS_ATTR
         {
             vfs_path_t *vpath;
-#ifdef ENABLE_EXT2FS_ATTR
             unsigned long attr;
-#endif
 
             vpath = vfs_path_from_str (fe->fname->str);
 
-#ifdef ENABLE_EXT2FS_ATTR
             if (mc_fgetflags (vpath, &attr) == 0)
                 tty_printf (_("Attributes: %s"), chattr_get_as_str (attr));
             else
-#endif
                 tty_print_string (_("Attributes: unavailable"));
 
             vfs_path_free (vpath, TRUE);
         }
+#else
+        tty_print_string (_("Attributes: unavailable"));
+#endif /* ENABLE_EXT2FS_ATTR */
         MC_FALLTHROUGH;
     case 5:
         widget_gotoyx (w, 5, 3);
@@ -361,15 +361,14 @@ info_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *da
 /* --------------------------------------------------------------------------------------------- */
 
 WInfo *
-info_new (int y, int x, int lines, int cols)
+info_new (const WRect * r)
 {
-    WRect r = { y, x, lines, cols };
     WInfo *info;
     Widget *w;
 
     info = g_new (struct WInfo, 1);
     w = WIDGET (info);
-    widget_init (w, &r, info_callback, NULL);
+    widget_init (w, r, info_callback, NULL);
 
     return info;
 }
diff --git a/src/filemanager/info.h b/src/filemanager/info.h
index cba2592e9..60bf3c6fc 100644
--- a/src/filemanager/info.h
+++ b/src/filemanager/info.h
@@ -18,7 +18,7 @@ typedef struct WInfo WInfo;
 
 /*** declarations of public functions ************************************************************/
 
-WInfo *info_new (int y, int x, int lines, int cols);
+WInfo *info_new (const WRect * r);
 
 /*** inline functions ****************************************************************************/
 #endif /* MC__INFO_H */
diff --git a/src/filemanager/ioblksize.h b/src/filemanager/ioblksize.h
index 91aa63325..fdd392838 100644
--- a/src/filemanager/ioblksize.h
+++ b/src/filemanager/ioblksize.h
@@ -21,8 +21,8 @@
 
 /* *INDENT-OFF* */
 
-/* As of May 2014, 128KiB is determined to be the minimum
-   blksize to best minimize system call overhead.
+/* As of Feb 2024, 256KiB is determined to be the best blksize
+   to minimize system call overhead across most systems.
    This can be tested with this script:
 
    for i in $(seq 0 10); do
@@ -41,21 +41,25 @@
    system #5: 2.30GHz i7-3615QM with 1600MHz DDR3, arch=x86_64
    system #6: 1.30GHz i5-4250U with 1-channel 1600MHz DDR3, arch=x86_64
    system #7: 3.55GHz IBM,8231-E2B with 1066MHz DDR3, POWER7 revision 2.1
+   system #8: 2.60GHz i7-5600U with 1600MHz DDR3, arch=x86_64
+   system #9: 3.80GHz IBM,02CY649 with 2666MHz DDR4, POWER9 revision 2.3
+   system 10: 2.95GHz IBM,9043-MRX, POWER10 revision 2.0
+   system 11: 3.23Ghz Apple M1 with 2666MHz DDR4, arch=arm64
 
                 per-system transfer rate (GB/s)
-   blksize   #1    #2    #3    #4    #5    #6    #7
+   blksize   #1    #2    #3    #4    #5    #6    #7    #8    #9     10    11
    ------------------------------------------------------------------------
-      1024  .73   1.7   2.6   .64   1.0   2.5   1.3
-      2048  1.3   3.0   4.4   1.2   2.0   4.4   2.5
-      4096  2.4   5.1   6.5   2.3   3.7   7.4   4.8
-      8192  3.5   7.3   8.5   4.0   6.0  10.4   9.2
-     16384  3.9   9.4  10.1   6.3   8.3  13.3  16.8
-     32768  5.2   9.9  11.1   8.1  10.7  13.2  28.0
-     65536  5.3  11.2  12.0  10.6  12.8  16.1  41.4
-    131072  5.5  11.8  12.3  12.1  14.0  16.7  54.8
-    262144  5.7  11.6  12.5  12.3  14.7  16.4  40.0
-    524288  5.7  11.4  12.5  12.1  14.7  15.5  34.5
-   1048576  5.8  11.4  12.6  12.2  14.9  15.7  36.5
+      1024  .73   1.7   2.6   .64   1.0   2.5   1.3    .9   1.2    2.5   2.0
+      2048  1.3   3.0   4.4   1.2   2.0   4.4   2.5   1.7   2.3    4.9   3.8
+      4096  2.4   5.1   6.5   2.3   3.7   7.4   4.8   3.1   4.6    9.6   6.9
+      8192  3.5   7.3   8.5   4.0   6.0  10.4   9.2   5.6   9.1   18.4  12.3
+     16384  3.9   9.4  10.1   6.3   8.3  13.3  16.8   8.6  17.3   33.6  19.8
+     32768  5.2   9.9  11.1   8.1  10.7  13.2  28.0  11.4  32.2   59.2  27.0
+     65536  5.3  11.2  12.0  10.6  12.8  16.1  41.4  14.9  56.9   95.4  34.1
+    131072  5.5  11.8  12.3  12.1  14.0  16.7  54.8  17.1  86.5  125.0  38.2
+ -> 262144  5.7  11.6  12.5  12.3  14.7  16.4  40.0  18.0 113.0  148.0  41.3 <-
+    524288  5.7  11.4  12.5  12.1  14.7  15.5  34.5  18.0 104.0  153.0  43.1
+   1048576  5.8  11.4  12.6  12.2  14.9  15.7  36.5  18.2  87.9  114.0  44.8
 
 
    Note that this is to minimize system call overhead.
@@ -73,7 +77,7 @@
  */
 
 
-enum { IO_BUFSIZE = 128 * 1024 };
+enum { IO_BUFSIZE = 256 * 1024 };
 
 /* *INDENT-ON* */
 
diff --git a/src/filemanager/layout.c b/src/filemanager/layout.c
index de326f375..a8dbcb793 100644
--- a/src/filemanager/layout.c
+++ b/src/filemanager/layout.c
@@ -649,7 +649,7 @@ panel_do_cols (int idx)
 /** Save current list_view widget directory into panel */
 
 static Widget *
-restore_into_right_dir_panel (int idx, gboolean last_was_panel, int y, int x, int lines, int cols)
+restore_into_right_dir_panel (int idx, gboolean last_was_panel, const WRect * r)
 {
     WPanel *new_widget;
     const char *p_name;
@@ -661,11 +661,11 @@ restore_into_right_dir_panel (int idx, gboolean last_was_panel, int y, int x, in
         vfs_path_t *saved_dir_vpath;
 
         saved_dir_vpath = vfs_path_from_str (panels[idx].last_saved_dir);
-        new_widget = panel_sized_with_dir_new (p_name, y, x, lines, cols, saved_dir_vpath);
+        new_widget = panel_sized_with_dir_new (p_name, r, saved_dir_vpath);
         vfs_path_free (saved_dir_vpath, TRUE);
     }
     else
-        new_widget = panel_sized_new (p_name, y, x, lines, cols);
+        new_widget = panel_sized_new (p_name, r);
 
     return WIDGET (new_widget);
 }
@@ -1123,10 +1123,8 @@ create_panel (int num, panel_view_mode_t type)
 {
     WRect r = { 0, 0, 0, 0 };
     unsigned int the_other = 0; /* Index to the other panel */
-    const char *file_name = NULL;       /* For Quick view */
     Widget *new_widget = NULL, *old_widget = NULL;
     panel_view_mode_t old_type = view_listing;
-    WPanel *the_other_panel = NULL;
 
     if (num >= MAX_VIEWS)
     {
@@ -1183,29 +1181,31 @@ create_panel (int num, panel_view_mode_t type)
             gboolean last_was_panel;
 
             last_was_panel = old_widget != NULL && get_panel_type (num) != view_listing;
-            new_widget =
-                restore_into_right_dir_panel (num, last_was_panel, r.y, r.x, r.lines, r.cols);
+            new_widget = restore_into_right_dir_panel (num, last_was_panel, &r);
             break;
         }
 
     case view_info:
-        new_widget = WIDGET (info_new (r.y, r.x, r.lines, r.cols));
+        new_widget = WIDGET (info_new (&r));
         break;
 
     case view_tree:
-        new_widget = WIDGET (tree_new (r.y, r.x, r.lines, r.cols, TRUE));
+        new_widget = WIDGET (tree_new (&r, TRUE));
         break;
 
     case view_quick:
-        new_widget = WIDGET (mcview_new (r.y, r.x, r.lines, r.cols, TRUE));
-        the_other_panel = PANEL (panels[the_other].widget);
-        if (the_other_panel != NULL)
-            file_name = panel_current_entry (the_other_panel)->fname->str;
-        else
-            file_name = "";
+        {
+            WPanel *the_other_panel;
+            const char *file_name = "";
 
-        mcview_load ((WView *) new_widget, 0, file_name, 0, 0, 0);
-        break;
+            new_widget = WIDGET (mcview_new (&r, TRUE));
+            the_other_panel = PANEL (panels[the_other].widget);
+            if (the_other_panel != NULL)
+                file_name = panel_current_entry (the_other_panel)->fname->str;
+
+            mcview_load ((WView *) new_widget, 0, file_name, 0, 0, 0);
+            break;
+        }
 
     default:
         break;
diff --git a/src/filemanager/panel.c b/src/filemanager/panel.c
index f14fd38d7..e6ead3567 100644
--- a/src/filemanager/panel.c
+++ b/src/filemanager/panel.c
@@ -41,7 +41,7 @@
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"        /* XCTRL and ALT macros  */
 #include "lib/skin.h"
-#include "lib/strescape.h"
+#include "lib/strutil.h"
 #include "lib/mcconfig.h"
 #include "lib/vfs/vfs.h"
 #include "lib/unixcompat.h"
@@ -2126,7 +2126,7 @@ panel_select_ext_cmd (WPanel * panel)
 
     do_select = (fe->f.marked == 0);
 
-    cur_file_ext = strutils_regex_escape (extension (filename->str));
+    cur_file_ext = str_regex_escape (extension (filename->str));
     if (cur_file_ext[0] != '\0')
         reg_exp = g_strconcat ("^.*\\.", cur_file_ext, "$", (char *) NULL);
     else
@@ -2810,7 +2810,7 @@ do_search (WPanel * panel, int c_code)
     }
 
     reg_exp = g_strdup_printf ("%s*", panel->quick_search.buffer->str);
-    esc_str = strutils_escape (reg_exp, -1, ",|\\{}[]", TRUE);
+    esc_str = str_escape (reg_exp, -1, ",|\\{}[]", TRUE);
     search = mc_search_new (esc_str, NULL);
     search->search_type = MC_SEARCH_T_GLOB;
     search->is_entire_line = TRUE;
@@ -4467,14 +4467,14 @@ panel_set_lwd (WPanel * panel, const vfs_path_t * vpath)
  * Creatie an empty panel with specified size.
  *
  * @param panel_name name of panel for setup receiving
+ * @param r panel areaa
  *
  * @return new instance of WPanel
  */
 
 WPanel *
-panel_sized_empty_new (const char *panel_name, int y, int x, int lines, int cols)
+panel_sized_empty_new (const char *panel_name, const WRect * r)
 {
-    WRect r = { y, x, lines, cols };
     WPanel *panel;
     Widget *w;
     char *section;
@@ -4482,7 +4482,7 @@ panel_sized_empty_new (const char *panel_name, int y, int x, int lines, int cols
 
     panel = g_new0 (WPanel, 1);
     w = WIDGET (panel);
-    widget_init (w, &r, panel_callback, panel_mouse_callback);
+    widget_init (w, r, panel_callback, panel_mouse_callback);
     w->options |= WOP_SELECTABLE | WOP_TOP_SELECT;
     w->keymap = panel_map;
 
@@ -4555,18 +4555,14 @@ panel_sized_empty_new (const char *panel_name, int y, int x, int lines, int cols
  * Panel creation for specified size and directory.
  *
  * @param panel_name name of panel for setup retrieving
- * @param y y coordinate of top-left corner
- * @param x x coordinate of top-left corner
- * @param lines vertical size
- * @param cols horizontal size
+ * @param r panel areaa
  * @param vpath working panel directory. If NULL then current directory is used
  *
  * @return new instance of WPanel
  */
 
 WPanel *
-panel_sized_with_dir_new (const char *panel_name, int y, int x, int lines, int cols,
-                          const vfs_path_t * vpath)
+panel_sized_with_dir_new (const char *panel_name, const WRect * r, const vfs_path_t * vpath)
 {
     WPanel *panel;
     char *curdir = NULL;
@@ -4574,7 +4570,7 @@ panel_sized_with_dir_new (const char *panel_name, int y, int x, int lines, int c
     const vfs_path_element_t *path_element;
 #endif
 
-    panel = panel_sized_empty_new (panel_name, y, x, lines, cols);
+    panel = panel_sized_empty_new (panel_name, r);
 
     if (vpath != NULL)
     {
diff --git a/src/filemanager/panel.h b/src/filemanager/panel.h
index 5bfc36cfe..0496f4396 100644
--- a/src/filemanager/panel.h
+++ b/src/filemanager/panel.h
@@ -152,8 +152,8 @@ extern mc_fhl_t *mc_filehighlight;
 
 /*** declarations of public functions ************************************************************/
 
-WPanel *panel_sized_empty_new (const char *panel_name, int y, int x, int lines, int cols);
-WPanel *panel_sized_with_dir_new (const char *panel_name, int y, int x, int lines, int cols,
+WPanel *panel_sized_empty_new (const char *panel_name, const WRect * r);
+WPanel *panel_sized_with_dir_new (const char *panel_name, const WRect * r,
                                   const vfs_path_t * vpath);
 
 void panel_clean_dir (WPanel * panel);
@@ -217,7 +217,9 @@ static inline WPanel *
 panel_empty_new (const char *panel_name)
 {
     /* Unknown sizes of the panel at startup */
-    return panel_sized_empty_new (panel_name, 0, 0, 1, 1);
+    WRect r = { 0, 0, 1, 1 };
+
+    return panel_sized_empty_new (panel_name, &r);
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -234,7 +236,9 @@ static inline WPanel *
 panel_with_dir_new (const char *panel_name, const vfs_path_t * vpath)
 {
     /* Unknown sizes of the panel at startup */
-    return panel_sized_with_dir_new (panel_name, 0, 0, 1, 1, vpath);
+    WRect r = { 0, 0, 1, 1 };
+
+    return panel_sized_with_dir_new (panel_name, &r, vpath);
 }
 
 
@@ -258,18 +262,15 @@ panel_new (const char *panel_name)
  * Panel creation with specified size.
  *
  * @param panel_name name of panel for setup retrieving
- * @param y y coordinate of top-left corner
- * @param x x coordinate of top-left corner
- * @param lines vertical size
- * @param cols horizontal size
+ * @param r panel area
  *
  * @return new instance of WPanel
  */
 
 static inline WPanel *
-panel_sized_new (const char *panel_name, int y, int x, int lines, int cols)
+panel_sized_new (const char *panel_name, const WRect * r)
 {
-    return panel_sized_with_dir_new (panel_name, y, x, lines, cols, NULL);
+    return panel_sized_with_dir_new (panel_name, r, NULL);
 }
 
 /* --------------------------------------------------------------------------------------------- */
diff --git a/src/filemanager/tree.c b/src/filemanager/tree.c
index 6f86693d2..2bfcf5051 100644
--- a/src/filemanager/tree.c
+++ b/src/filemanager/tree.c
@@ -762,7 +762,7 @@ tree_move (WTree * tree, const char *default_dest)
 
         dest_vpath = vfs_path_from_str (dest);
 
-        if (mc_stat (dest_vpath, &buf))
+        if (mc_stat (dest_vpath, &buf) != 0)
             message (D_ERROR, MSG_ERROR, _("Cannot stat the destination\n%s"),
                      unix_error_string (errno));
         else if (!S_ISDIR (buf.st_mode))
@@ -1282,16 +1282,15 @@ tree_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event)
 /* --------------------------------------------------------------------------------------------- */
 
 WTree *
-tree_new (int y, int x, int lines, int cols, gboolean is_panel)
+tree_new (const WRect * r, gboolean is_panel)
 {
-    WRect r = { y, x, lines, cols };
     WTree *tree;
     Widget *w;
 
     tree = g_new (WTree, 1);
 
     w = WIDGET (tree);
-    widget_init (w, &r, tree_callback, tree_mouse_callback);
+    widget_init (w, r, tree_callback, tree_mouse_callback);
     w->options |= WOP_SELECTABLE | WOP_TOP_SELECT;
     w->keymap = tree_map;
 
diff --git a/src/filemanager/tree.h b/src/filemanager/tree.h
index f1dbba686..5fda4a4fc 100644
--- a/src/filemanager/tree.h
+++ b/src/filemanager/tree.h
@@ -22,7 +22,7 @@ extern gboolean xtree_mode;
 
 /*** declarations of public functions ************************************************************/
 
-WTree *tree_new (int y, int x, int lines, int cols, gboolean is_panel);
+WTree *tree_new (const WRect * r, gboolean is_panel);
 
 void tree_chdir (WTree * tree, const vfs_path_t * dir);
 const vfs_path_t *tree_selected_name (const WTree * tree);
diff --git a/src/filemanager/treestore.c b/src/filemanager/treestore.c
index 984bb92d5..89420b613 100644
--- a/src/filemanager/treestore.c
+++ b/src/filemanager/treestore.c
@@ -54,7 +54,7 @@
 #include "lib/mcconfig.h"
 #include "lib/vfs/vfs.h"
 #include "lib/fileloc.h"
-#include "lib/strescape.h"
+#include "lib/strutil.h"
 #include "lib/hook.h"
 #include "lib/util.h"
 
@@ -322,7 +322,7 @@ tree_store_load_from (const char *name)
 static char *
 encode (const vfs_path_t * vpath, size_t offset)
 {
-    return strutils_escape (vfs_path_as_str (vpath) + offset, -1, "\n\\", FALSE);
+    return str_escape (vfs_path_as_str (vpath) + offset, -1, "\n\\", FALSE);
 }
 
 /* --------------------------------------------------------------------------------------------- */
diff --git a/src/learn.c b/src/learn.c
index f42aebf2d..949cc9b59 100644
--- a/src/learn.c
+++ b/src/learn.c
@@ -37,7 +37,6 @@
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"
 #include "lib/mcconfig.h"
-#include "lib/strescape.h"
 #include "lib/strutil.h"
 #include "lib/util.h"           /* convert_controls() */
 #include "lib/widget.h"
@@ -366,7 +365,7 @@ learn_save (void)
         {
             char *esc_str;
 
-            esc_str = strutils_escape (learnkeys[i].sequence, -1, ";\\", TRUE);
+            esc_str = str_escape (learnkeys[i].sequence, -1, ";\\", TRUE);
             mc_config_set_string_raw_value (mc_global.main_config, section,
                                             key_name_conv_tab[i].name, esc_str);
             g_free (esc_str);
diff --git a/src/main.c b/src/main.c
index fcc31bb1c..353aa3908 100644
--- a/src/main.c
+++ b/src/main.c
@@ -63,6 +63,10 @@
 #include "filemanager/command.h"        /* cmdline */
 #include "filemanager/panel.h"  /* panalized_panel */
 
+#ifdef USE_INTERNAL_EDIT
+#include "editor/edit.h"        /* edit_arg_free() */
+#endif
+
 #include "vfs/plugins_init.h"
 
 #include "events_init.h"
@@ -532,8 +536,10 @@ main (int argc, char *argv[])
 
     if (mc_global.mc_run_mode != MC_RUN_EDITOR)
         g_free (mc_run_param0);
+#ifdef USE_INTERNAL_EDIT
     else
-        g_list_free_full ((GList *) mc_run_param0, (GDestroyNotify) mcedit_arg_free);
+        g_list_free_full ((GList *) mc_run_param0, (GDestroyNotify) edit_arg_free);
+#endif /* USE_INTERNAL_EDIT */
 
     g_free (mc_run_param1);
     g_free (saved_other_dir);
diff --git a/src/selcodepage.c b/src/selcodepage.c
index 067ad67b1..4332b6266 100644
--- a/src/selcodepage.c
+++ b/src/selcodepage.c
@@ -93,19 +93,24 @@ select_charset (int center_y, int center_x, int current_charset, gboolean seldis
     /* insert all the items found */
     for (i = 0; i < codepages->len; i++)
     {
-        const char *name = ((codepage_desc *) g_ptr_array_index (codepages, i))->name;
+        const char *name;
+
+        name = ((codepage_desc *) g_ptr_array_index (codepages, i))->name;
         g_snprintf (buffer, sizeof (buffer), "%c  %s", get_hotkey (i), name);
         LISTBOX_APPEND_TEXT (listbox, get_hotkey (i), buffer, NULL, FALSE);
     }
+
     if (seldisplay)
     {
-        unsigned char hotkey = get_hotkey (codepages->len);
+        unsigned char hotkey;
+
+        hotkey = get_hotkey (codepages->len);
         g_snprintf (buffer, sizeof (buffer), "%c  %s", hotkey, _("Other 8 bit"));
         LISTBOX_APPEND_TEXT (listbox, hotkey, buffer, NULL, FALSE);
     }
 
     /* Select the default entry */
-    i = (seldisplay)
+    i = seldisplay
         ? ((current_charset < 0) ? codepages->len : (size_t) current_charset)
         : ((size_t) current_charset + 1);
 
@@ -114,25 +119,16 @@ select_charset (int center_y, int center_x, int current_charset, gboolean seldis
     listbox_result = listbox_run (listbox);
 
     if (listbox_result < 0)
-    {
         /* Cancel dialog */
         return SELECT_CHARSET_CANCEL;
-    }
-    else
-    {
-        /* some charset has been selected */
-        if (seldisplay)
-        {
-            /* charset list is finished with "Other 8 bit" item */
-            return (listbox_result >= (int) codepages->len)
-                ? SELECT_CHARSET_OTHER_8BIT : listbox_result;
-        }
-        else
-        {
-            /* charset list is began with "-  < No translation >" item */
-            return (listbox_result - 1);
-        }
-    }
+
+    /* some charset has been selected */
+    if (seldisplay)
+        /* charset list is finished with "Other 8 bit" item */
+        return (listbox_result >= (int) codepages->len) ? SELECT_CHARSET_OTHER_8BIT : listbox_result;
+
+    /* charset list is began with "-  < No translation >" item */
+    return (listbox_result - 1);
 }
 
 /* --------------------------------------------------------------------------------------------- */
diff --git a/src/textconf.c b/src/textconf.c
index 0a1f4cce9..553e09999 100644
--- a/src/textconf.c
+++ b/src/textconf.c
@@ -86,9 +86,9 @@ static const char *const features[] = {
 
 #ifdef USE_INTERNAL_EDIT
 #ifdef HAVE_ASPELL
-    N_("With builtin Editor and Aspell support"),
+    N_("With builtin editor and aspell support"),
 #else
-    N_("With builtin Editor"),
+    N_("With builtin editor"),
 #endif /* HAVE_ASPELL */
 #endif /* USE_INTERNAL_EDIT */
 
diff --git a/src/vfs/sfs/sfs.c b/src/vfs/sfs/sfs.c
index 58ce5a22d..7ebd2de19 100644
--- a/src/vfs/sfs/sfs.c
+++ b/src/vfs/sfs/sfs.c
@@ -47,8 +47,6 @@
 #include "lib/util.h"
 #include "lib/widget.h"         /* D_ERROR, D_NORMAL */
 
-#include "src/execute.h"        /* EXECUTE_AS_SHELL */
-
 #include "lib/vfs/vfs.h"
 #include "lib/vfs/utilvfs.h"
 #include "lib/vfs/xdirentry.h"
diff --git a/src/vfs/shell/shell.c b/src/vfs/shell/shell.c
index 74788d636..925f8161e 100644
--- a/src/vfs/shell/shell.c
+++ b/src/vfs/shell/shell.c
@@ -60,7 +60,7 @@
 
 #include "lib/global.h"
 #include "lib/tty/tty.h"        /* enable/disable interrupt key */
-#include "lib/strescape.h"
+#include "lib/strutil.h"
 #include "lib/unixcompat.h"
 #include "lib/fileloc.h"
 #include "lib/util.h"           /* my_exit() */
@@ -803,12 +803,12 @@ shell_parse_ls (char *buffer, struct vfs_s_entry *ent)
 
                 ent->name = g_strndup (filename, filename_bound - filename);
                 temp = ent->name;
-                ent->name = strutils_shell_unescape (ent->name);
+                ent->name = str_shell_unescape (ent->name);
                 g_free (temp);
 
                 ent->ino->linkname = g_strndup (linkname, linkname_bound - linkname);
                 temp = ent->ino->linkname;
-                ent->ino->linkname = strutils_shell_unescape (ent->ino->linkname);
+                ent->ino->linkname = str_shell_unescape (ent->ino->linkname);
                 g_free (temp);
             }
             else
@@ -828,7 +828,7 @@ shell_parse_ls (char *buffer, struct vfs_s_entry *ent)
 
                 ent->name = g_strndup (filename, filename_bound - filename);
                 temp = ent->name;
-                ent->name = strutils_shell_unescape (ent->name);
+                ent->name = str_shell_unescape (ent->name);
                 g_free (temp);
             }
             break;
@@ -927,7 +927,7 @@ shell_dir_load (struct vfs_class *me, struct vfs_s_inode *dir, const char *remot
 
     dir->timestamp = g_get_monotonic_time () + shell_directory_timeout * G_USEC_PER_SEC;
 
-    quoted_path = strutils_shell_escape (remote_path);
+    quoted_path = str_shell_escape (remote_path);
     (void) shell_command_v (me, super, NONE, SHELL_SUPER (super)->scr_ls, "SHELL_FILENAME=%s;\n",
                             quoted_path);
     g_free (quoted_path);
@@ -1033,7 +1033,7 @@ shell_file_store (struct vfs_class *me, vfs_file_handler_t * fh, char *name, cha
      *  algorithm for file appending case, therefore just "dd" is used for it.
      */
 
-    quoted_name = strutils_shell_escape (name);
+    quoted_name = str_shell_escape (name);
     vfs_print_message (_("shell: store %s: sending command..."), quoted_name);
 
     /* FIXME: File size is limited to ULONG_MAX */
@@ -1105,7 +1105,7 @@ shell_linear_start (struct vfs_class *me, vfs_file_handler_t * fh, off_t offset)
     name = vfs_s_fullpath (me, fh->ino);
     if (name == NULL)
         return 0;
-    quoted_name = strutils_shell_escape (name);
+    quoted_name = str_shell_escape (name);
     g_free (name);
     shell->append = FALSE;
 
@@ -1260,8 +1260,8 @@ shell_rename (const vfs_path_t * vpath1, const vfs_path_t * vpath2)
     if (crpath2 == NULL)
         return -1;
 
-    rpath1 = strutils_shell_escape (crpath1);
-    rpath2 = strutils_shell_escape (crpath2);
+    rpath1 = str_shell_escape (crpath1);
+    rpath2 = str_shell_escape (crpath2);
 
     me = VFS_CLASS (vfs_path_get_last_path_vfs (vpath1));
 
@@ -1294,8 +1294,8 @@ shell_link (const vfs_path_t * vpath1, const vfs_path_t * vpath2)
     if (crpath2 == NULL)
         return -1;
 
-    rpath1 = strutils_shell_escape (crpath1);
-    rpath2 = strutils_shell_escape (crpath2);
+    rpath1 = str_shell_escape (crpath1);
+    rpath2 = str_shell_escape (crpath2);
 
     me = VFS_CLASS (vfs_path_get_last_path_vfs (vpath1));
 
@@ -1325,8 +1325,8 @@ shell_symlink (const vfs_path_t * vpath1, const vfs_path_t * vpath2)
     if (crpath == NULL)
         return -1;
 
-    rpath = strutils_shell_escape (crpath);
-    qsetto = strutils_shell_escape (vfs_path_get_last_path_str (vpath1));
+    rpath = str_shell_escape (crpath);
+    qsetto = str_shell_escape (vfs_path_get_last_path_str (vpath1));
 
     me = VFS_CLASS (vfs_path_get_last_path_vfs (vpath2));
 
@@ -1391,7 +1391,7 @@ shell_chmod (const vfs_path_t * vpath, mode_t mode)
     if (crpath == NULL)
         return -1;
 
-    rpath = strutils_shell_escape (crpath);
+    rpath = str_shell_escape (crpath);
 
     me = VFS_CLASS (vfs_path_get_last_path_vfs (vpath));
 
@@ -1434,7 +1434,7 @@ shell_chown (const vfs_path_t * vpath, uid_t owner, gid_t group)
     if (crpath == NULL)
         return -1;
 
-    rpath = strutils_shell_escape (crpath);
+    rpath = str_shell_escape (crpath);
 
     me = VFS_CLASS (vfs_path_get_last_path_vfs (vpath));
 
@@ -1497,7 +1497,7 @@ shell_utime (const vfs_path_t * vpath, mc_timesbuf_t * times)
     if (crpath == NULL)
         return -1;
 
-    rpath = strutils_shell_escape (crpath);
+    rpath = str_shell_escape (crpath);
 
     shell_get_atime (times, &atime, &atime_nsec);
     gmt = gmtime (&atime);
@@ -1545,7 +1545,7 @@ shell_unlink (const vfs_path_t * vpath)
     if (crpath == NULL)
         return -1;
 
-    rpath = strutils_shell_escape (crpath);
+    rpath = str_shell_escape (crpath);
 
     me = VFS_CLASS (vfs_path_get_last_path_vfs (vpath));
 
@@ -1573,7 +1573,7 @@ shell_exists (const vfs_path_t * vpath)
     if (crpath == NULL)
         return -1;
 
-    rpath = strutils_shell_escape (crpath);
+    rpath = str_shell_escape (crpath);
 
     me = VFS_CLASS (vfs_path_get_last_path_vfs (vpath));
 
@@ -1603,7 +1603,7 @@ shell_mkdir (const vfs_path_t * vpath, mode_t mode)
     if (crpath == NULL)
         return -1;
 
-    rpath = strutils_shell_escape (crpath);
+    rpath = str_shell_escape (crpath);
 
     me = VFS_CLASS (vfs_path_get_last_path_vfs (vpath));
 
@@ -1638,7 +1638,7 @@ shell_rmdir (const vfs_path_t * vpath)
     if (crpath == NULL)
         return -1;
 
-    rpath = strutils_shell_escape (crpath);
+    rpath = str_shell_escape (crpath);
 
     me = VFS_CLASS (vfs_path_get_last_path_vfs (vpath));
 
diff --git a/src/vfs/tar/tar-internal.c b/src/vfs/tar/tar-internal.c
index 2c4a0ad99..263f64563 100644
--- a/src/vfs/tar/tar-internal.c
+++ b/src/vfs/tar/tar-internal.c
@@ -144,6 +144,10 @@ tar_seek_archive (tar_super_t * archive, off_t size)
     off_t nrec, nblk;
     off_t skipped;
 
+    /* If low level I/O is already at EOF, do not try to seek further. */
+    if (record_end < archive->record_start + blocking_factor)
+        return 0;
+
     skipped = (blocking_factor - (current_block - archive->record_start)) * BLOCKSIZE;
     if (size <= skipped)
         return 0;
diff --git a/src/viewer/mcviewer.c b/src/viewer/mcviewer.c
index 1ec75c3d3..ca567b027 100644
--- a/src/viewer/mcviewer.c
+++ b/src/viewer/mcviewer.c
@@ -195,16 +195,15 @@ mcview_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event)
 /* --------------------------------------------------------------------------------------------- */
 
 WView *
-mcview_new (int y, int x, int lines, int cols, gboolean is_panel)
+mcview_new (const WRect * r, gboolean is_panel)
 {
-    WRect r = { y, x, lines, cols };
     WView *view;
     Widget *w;
 
     view = g_new0 (WView, 1);
     w = WIDGET (view);
 
-    widget_init (w, &r, mcview_callback, mcview_mouse_callback);
+    widget_init (w, r, mcview_callback, mcview_mouse_callback);
     w->options |= WOP_SELECTABLE | WOP_TOP_SELECT;
     w->keymap = viewer_map;
 
@@ -243,6 +242,7 @@ mcview_viewer (const char *command, const vfs_path_t * file_vpath, int start_lin
     WDialog *view_dlg;
     Widget *vw, *b;
     WGroup *g;
+    WRect r;
 
     /* Create dialog and widgets, put them on the dialog */
     view_dlg = dlg_create (FALSE, 0, 0, 1, 1, WPOS_FULLSCREEN, FALSE, NULL, mcview_dialog_callback,
@@ -252,7 +252,9 @@ mcview_viewer (const char *command, const vfs_path_t * file_vpath, int start_lin
 
     g = GROUP (view_dlg);
 
-    lc_mcview = mcview_new (vw->rect.y, vw->rect.x, vw->rect.lines - 1, vw->rect.cols, FALSE);
+    r = vw->rect;
+    r.lines--;
+    lc_mcview = mcview_new (&r, FALSE);
     group_add_widget_autopos (g, lc_mcview, WPOS_KEEP_ALL, NULL);
 
     b = WIDGET (buttonbar_new ());
diff --git a/src/viewer/mcviewer.h b/src/viewer/mcviewer.h
index d90716c6e..e9b8577db 100644
--- a/src/viewer/mcviewer.h
+++ b/src/viewer/mcviewer.h
@@ -6,6 +6,7 @@
 #define MC__VIEWER_H
 
 #include "lib/global.h"
+#include "lib/widget.h"         /* WRect */
 
 /*** typedefs(not structures) and defined constants **********************************************/
 
@@ -37,10 +38,8 @@ extern char *mcview_show_eof;
 
 /*** declarations of public functions ************************************************************/
 
-/* Creates a new WView object with the given properties. Caveat: the
- * origin is in y-x order, while the extent is in x-y order. */
-extern WView *mcview_new (int y, int x, int lines, int cols, gboolean is_panel);
-
+/* Creates a new WView object with the given properties. */
+extern WView *mcview_new (const WRect * r, gboolean is_panel);
 
 /* Shows {file} or the output of {command} in the internal viewer,
  * starting in line {start_line}.
diff --git a/tests/lib/mcconfig/config_string.c b/tests/lib/mcconfig/config_string.c
index 535cc6aa8..15213ebf6 100644
--- a/tests/lib/mcconfig/config_string.c
+++ b/tests/lib/mcconfig/config_string.c
@@ -29,7 +29,6 @@
 
 #include "lib/mcconfig.h"
 #include "lib/strutil.h"
-#include "lib/strescape.h"
 #include "lib/vfs/vfs.h"
 #include "src/vfs/local/local.c"
 
@@ -215,7 +214,7 @@ START_TEST (emulate__learn_save)
     {
         char *esc_str;
 
-        esc_str = strutils_escape ("T;E\\X;T-FOR-\\T;E;S\\TI;N'G", -1, ";", TRUE);
+        esc_str = str_escape ("T;E\\X;T-FOR-\\T;E;S\\TI;N'G", -1, ";", TRUE);
         mc_config_set_string_raw (mc_config, "test-group1", "test-param1", esc_str);
         g_free (esc_str);
     }
diff --git a/tests/lib/mcconfig/user_configs_path.c b/tests/lib/mcconfig/user_configs_path.c
index 96b020530..cbddfa519 100644
--- a/tests/lib/mcconfig/user_configs_path.c
+++ b/tests/lib/mcconfig/user_configs_path.c
@@ -28,7 +28,6 @@
 #include "tests/mctest.h"
 
 #include "lib/strutil.h"
-#include "lib/strescape.h"
 #include "lib/vfs/vfs.h"
 #include "lib/fileloc.h"
 
diff --git a/tests/lib/utilunix__my_system-fork_child.c b/tests/lib/utilunix__my_system-fork_child.c
index 10d972e52..8c44bc781 100644
--- a/tests/lib/utilunix__my_system-fork_child.c
+++ b/tests/lib/utilunix__my_system-fork_child.c
@@ -28,7 +28,6 @@
 #include "tests/mctest.h"
 
 #include "lib/util.h"
-#include "lib/utilunix.h"
 
 #include "utilunix__my_system-common.c"
 
diff --git a/tests/lib/utilunix__my_system-fork_child_shell.c b/tests/lib/utilunix__my_system-fork_child_shell.c
index 6c9cb89d5..daceb80f8 100644
--- a/tests/lib/utilunix__my_system-fork_child_shell.c
+++ b/tests/lib/utilunix__my_system-fork_child_shell.c
@@ -28,7 +28,6 @@
 #include "tests/mctest.h"
 
 #include "lib/util.h"
-#include "lib/utilunix.h"
 
 #include "utilunix__my_system-common.c"
 
diff --git a/tests/lib/utilunix__my_system-fork_fail.c b/tests/lib/utilunix__my_system-fork_fail.c
index 975045d1a..94bf895cb 100644
--- a/tests/lib/utilunix__my_system-fork_fail.c
+++ b/tests/lib/utilunix__my_system-fork_fail.c
@@ -31,7 +31,6 @@
 #include <unistd.h>
 
 #include "lib/util.h"
-#include "lib/utilunix.h"
 
 #include "utilunix__my_system-common.c"
 
diff --git a/tests/src/editor/edit_complete_word_cmd.c b/tests/src/editor/edit_complete_word_cmd.c
index a75c98db0..77f75a262 100644
--- a/tests/src/editor/edit_complete_word_cmd.c
+++ b/tests/src/editor/edit_complete_word_cmd.c
@@ -152,6 +152,7 @@ static void
 my_setup (void)
 {
     WRect r;
+    edit_arg_t arg;
 
     str_init_strings (NULL);
 
@@ -171,7 +172,9 @@ my_setup (void)
     edit_options.filesize_threshold = (char *) "64M";
 
     rect_init (&r, 0, 0, 24, 80);
-    test_edit = edit_init (NULL, &r, vfs_path_from_str ("test-data.txt"), 1);
+    arg.file_vpath = vfs_path_from_str ("test-data.txt");
+    arg.line_number = 1;
+    test_edit = edit_init (NULL, &r, &arg);
     memset (&owner, 0, sizeof (owner));
     group_add_widget (&owner, WIDGET (test_edit));
     edit_completion_dialog_show__init ();