From 617fd4d9ff1ea489ae75b1dbca82fd69f9ab9070 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sat, 6 Jul 2019 12:19:42 +0300 Subject: [PATCH 01/35] Ticket #3997: code clean up before 4.8.24 release. * doc/NEWS: cosmetics. Signed-off-by: Andrew Borodin --- doc/NEWS | 60 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/doc/NEWS b/doc/NEWS index 648bbcd55..2dd3327da 100644 --- a/doc/NEWS +++ b/doc/NEWS @@ -2,48 +2,48 @@ Version 4.8.23 - Core - * Modify "File exists" query dialog (#3935): - * change layout - * rename "Update" button to "If older" - * add new "If smaller" button": overwrite file with smaller one - * add "Don't overwrite with zero length file" checkbox - * Speed up of large directory structures delete (#3958) - * Support key binding for menu (#212) + * Modify "File exists" query dialog (#3935): + - change layout + - rename "Update" button to "If older" + - add new "If smaller" button": overwrite file with smaller one + - add "Don't overwrite with zero length file" checkbox + * Speed up of large directory structures delete (#3958) + * Support key binding for menu (#212) - Editor - * Expanded syntax highlighting rules (#3975): - * expanded file name regexp for sh.syntax - * use ini.syntax for systemd cofiguration files - * Syntax updates: - * shell (#3981) - * ebuild (#3988) - * RPM spec (#3991) + * Expanded syntax highlighting rules (#3975): + - expanded file name regexp for sh.syntax + - use ini.syntax for systemd cofiguration files + * Syntax updates: + - shell (#3981) + - ebuild (#3988) + - RPM spec (#3991) - Viewer - * Quick one-off backwards search with N. New action SearchOppositeContinue for key bind (default is shift-n) (#3452) + * Quick one-off backwards search with N. New action SearchOppositeContinue for key bind (default is shift-n) (#3452) - Misc - * Code cleanup (#3955) - * Use Geeqie (a fork of GQview) as main image viewer, fallback to GQview (#3962) - * File highlighting updates (#3966) - * .go, .s: highlight as source - * .m4v: highlighting as media - * New skins: - * featured-plus: featured skin with alternative directory and file select/mark colors (#3973) + * Code cleanup (#3955) + * Use Geeqie (a fork of GQview) as main image viewer, fallback to GQview (#3962) + * File highlighting updates (#3966) + - .go, .s: highlight as source + - .m4v: highlighting as media + * New skins: + - featured-plus: featured skin with alternative directory and file select/mark colors (#3973) - Fixes - * Compilation fail on AIX (#3960) - * Incorrect file version sort (#3965, #3905) - * Garbage in the hardlink error creation message window (#3990) - * Cannot shell, or FTP, or SFTP link when the file panel is tree, or info, or quick view (#3948) - * Failed gpm connect attempt ... for vc /dev/tty0 (#3208, #3614) - * Incorrect include/editor order in mc.ext (#3965) - * mcedit: incorrect C/C++ syntax highlighting in some cases (#3487) - * Unknown type name 'sighandler_t' on Illumos (#3971) + * Compilation fail on AIX (#3960) + * Incorrect file version sort (#3965, #3905) + * Garbage in the hardlink error creation message window (#3990) + * Cannot shell, or FTP, or SFTP link when the file panel is tree, or info, or quick view (#3948) + * Failed gpm connect attempt ... for vc /dev/tty0 (#3208, #3614) + * Incorrect include/editor order in mc.ext (#3965) + * mcedit: incorrect C/C++ syntax highlighting in some cases (#3487) + * Unknown type name 'sighandler_t' on Illumos (#3971) Version 4.8.22 From 40f82f27322ec746a6de15c5ad55b2d8392043de Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sat, 6 Jul 2019 12:31:26 +0300 Subject: [PATCH 02/35] src/filemanager/find.c: fix coding style. Signed-off-by: Andrew Borodin --- src/filemanager/find.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/filemanager/find.c b/src/filemanager/find.c index 603bce02b..e521df3dc 100644 --- a/src/filemanager/find.c +++ b/src/filemanager/find.c @@ -905,9 +905,9 @@ insert_file (const char *dir, const char *file, gsize start, gsize end) while (IS_PATH_SEP (dir[0]) && IS_PATH_SEP (dir[1])) dir++; - if (old_dir) + if (old_dir != NULL) { - if (strcmp (old_dir, dir)) + if (strcmp (old_dir, dir) != 0) { g_free (old_dir); old_dir = g_strdup (dir); @@ -1065,6 +1065,7 @@ search_content (WDialog * h, const char *directory, const char *filename) while (!ret_val) { char ch = '\0'; + off += i + 1; /* the previous line, plus a newline character */ i = 0; @@ -1148,6 +1149,7 @@ search_content (WDialog * h, const char *directory, const char *filename) if ((line & 0xff) == 0) { FindProgressStatus res; + res = check_find_events (h); switch (res) { From d615e4b9b7bcecb14c6ab324ca4470aa36ef8cd9 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sat, 6 Jul 2019 12:35:14 +0300 Subject: [PATCH 03/35] src/filemanager/find.c: test verbose flag before call of find_rotate_dash(). Signed-off-by: Andrew Borodin --- src/filemanager/find.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/filemanager/find.c b/src/filemanager/find.c index e521df3dc..c66278e19 100644 --- a/src/filemanager/find.c +++ b/src/filemanager/find.c @@ -1249,9 +1249,6 @@ find_rotate_dash (const WDialog * h, gboolean show) static const char rotating_dash[4] = "|/-\\"; const Widget *w = CONST_WIDGET (h); - if (!verbose) - return; - tty_setcolor (h->color[DLG_COLOR_NORMAL]); widget_move (h, w->lines - 7, w->cols - 4); tty_print_char (show ? rotating_dash[pos] : ' '); @@ -1317,7 +1314,8 @@ do_search (WDialog * h) ignore_count), ignore_count); status_update (msg); } - find_rotate_dash (h, FALSE); + if (verbose) + find_rotate_dash (h, FALSE); stop_idle (h); return 0; } @@ -1403,7 +1401,8 @@ do_search (WDialog * h) ; } /* for */ - find_rotate_dash (h, TRUE); + if (verbose) + find_rotate_dash (h, TRUE); return 1; } From d76cf51d54e3130f4464fa94976b4f55efd3d1c4 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 14 Jul 2019 11:38:31 +0300 Subject: [PATCH 04/35] src/filemanager/boxes.[ch]: unify some function names. --- src/filemanager/boxes.c | 10 +++++----- src/filemanager/boxes.h | 10 +++++----- src/filemanager/cmd.c | 6 +++--- src/filemanager/midnight.c | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/filemanager/boxes.c b/src/filemanager/boxes.c index 6810f41d7..2b3262a49 100644 --- a/src/filemanager/boxes.c +++ b/src/filemanager/boxes.c @@ -1060,7 +1060,7 @@ tree_box (const char *current_dir) #ifdef ENABLE_VFS void -configure_vfs (void) +configure_vfs_box (void) { char buffer2[BUF_TINY]; #ifdef ENABLE_VFS_FTP @@ -1151,7 +1151,7 @@ configure_vfs (void) /* --------------------------------------------------------------------------------------------- */ char * -cd_dialog (void) +cd_box (void) { const Widget *w = CONST_WIDGET (current_panel); char *my_str; @@ -1174,8 +1174,8 @@ cd_dialog (void) /* --------------------------------------------------------------------------------------------- */ void -symlink_dialog (const vfs_path_t * existing_vpath, const vfs_path_t * new_vpath, - char **ret_existing, char **ret_new) +symlink_box (const vfs_path_t * existing_vpath, const vfs_path_t * new_vpath, + char **ret_existing, char **ret_new) { quick_widget_t quick_widgets[] = { /* *INDENT-OFF* */ @@ -1208,7 +1208,7 @@ symlink_dialog (const vfs_path_t * existing_vpath, const vfs_path_t * new_vpath, #ifdef ENABLE_BACKGROUND void -jobs_cmd (void) +jobs_box (void) { struct { diff --git a/src/filemanager/boxes.h b/src/filemanager/boxes.h index d358e31c4..4d6acc3a8 100644 --- a/src/filemanager/boxes.h +++ b/src/filemanager/boxes.h @@ -26,11 +26,11 @@ int panel_listing_box (WPanel * p, int num, char **user, char **mini, gboolean * const panel_field_t *sort_box (dir_sort_options_t * op, const panel_field_t * sort_field); void confirm_box (void); void display_bits_box (void); -void configure_vfs (void); -void jobs_cmd (void); -char *cd_dialog (void); -void symlink_dialog (const vfs_path_t * existing_vpath, const vfs_path_t * new_vpath, - char **ret_existing, char **ret_new); +void configure_vfs_box (void); +void jobs_box (void); +char *cd_box (void); +void symlink_box (const vfs_path_t * existing_vpath, const vfs_path_t * new_vpath, + char **ret_existing, char **ret_new); char *tree_box (const char *current_dir); /*** inline functions ****************************************************************************/ diff --git a/src/filemanager/cmd.c b/src/filemanager/cmd.c index 9fe726705..2f5eca9ed 100644 --- a/src/filemanager/cmd.c +++ b/src/filemanager/cmd.c @@ -90,7 +90,7 @@ #include "command.h" /* cmdline */ #include "layout.h" /* get_current_type() */ #include "ext.h" /* regex_command() */ -#include "boxes.h" /* cd_dialog() */ +#include "boxes.h" /* cd_box() */ #include "dir.h" #include "cmd.h" /* Our definitions */ @@ -393,7 +393,7 @@ do_link (link_type_t link_type, const char *fname) g_free (s_str); } - symlink_dialog (s, d, &dest, &src); + symlink_box (s, d, &dest, &src); vfs_path_free (d); vfs_path_free (s); @@ -1386,7 +1386,7 @@ undelete_cmd (void) void quick_cd_cmd (void) { - char *p = cd_dialog (); + char *p = cd_box (); if (p && *p) { diff --git a/src/filemanager/midnight.c b/src/filemanager/midnight.c index fea47e229..84ea82f5b 100644 --- a/src/filemanager/midnight.c +++ b/src/filemanager/midnight.c @@ -1167,7 +1167,7 @@ midnight_execute_cmd (Widget * sender, long command) break; #ifdef ENABLE_VFS case CK_OptionsVfs: - configure_vfs (); + configure_vfs_box (); break; #endif case CK_OptionsConfirm: @@ -1286,7 +1286,7 @@ midnight_execute_cmd (Widget * sender, long command) break; #ifdef ENABLE_BACKGROUND case CK_Jobs: - jobs_cmd (); + jobs_box (); break; #endif case CK_OptionsLayout: From 596a6edc5660fd15e00f7bc4dca964f7e3b3be4b Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 14 Jul 2019 11:56:44 +0300 Subject: [PATCH 05/35] src/filemanager/cmd.c: fix coding style. Signed-off-by: Andrew Borodin --- src/filemanager/cmd.c | 124 +++++++++++++++++++++--------------------- 1 file changed, 61 insertions(+), 63 deletions(-) diff --git a/src/filemanager/cmd.c b/src/filemanager/cmd.c index 2f5eca9ed..87b092f71 100644 --- a/src/filemanager/cmd.c +++ b/src/filemanager/cmd.c @@ -109,7 +109,9 @@ enum CompareMode { - compare_quick, compare_size_only, compare_thourough + compare_quick = 0, + compare_size_only, + compare_thourough }; /*** file scope variables ************************************************************************/ @@ -133,15 +135,11 @@ do_view_cmd (gboolean normal) { vfs_path_t *fname_vpath; - if (confirm_view_dir && (current_panel->marked || current_panel->dirs_marked)) - { - if (query_dialog - (_("Confirmation"), _("Files tagged, want to cd?"), D_NORMAL, 2, - _("&Yes"), _("&No")) != 0) - { - return; - } - } + if (confirm_view_dir && (current_panel->marked != 0 || current_panel->dirs_marked != 0) && + query_dialog (_("Confirmation"), _("Files tagged, want to cd?"), D_NORMAL, 2, + _("&Yes"), _("&No")) != 0) + return; + fname_vpath = vfs_path_from_str (selection (current_panel)->fname); if (!do_cd (fname_vpath, cd_exact)) message (D_ERROR, MSG_ERROR, _("Cannot change directory")); @@ -244,6 +242,7 @@ compare_files (const vfs_path_t * vpath1, const vfs_path_t * vpath2, off_t size) /* Don't have mmap() :( Even more ugly :) */ char buf1[BUFSIZ], buf2[BUFSIZ]; int n1, n2; + rotate_dash (TRUE); do { @@ -290,10 +289,9 @@ compare_dir (WPanel * panel, WPanel * other, enum CompareMode mode) /* Search the corresponding entry from the other panel */ for (j = 0; j < other->dir.len; j++) - { if (strcmp (source->fname, other->dir.list[j].fname) == 0) break; - } + if (j >= other->dir.len) /* Not found -> mark */ do_file_mark (panel, i, 1); @@ -303,19 +301,17 @@ compare_dir (WPanel * panel, WPanel * other, enum CompareMode mode) file_entry_t *target = &other->dir.list[j]; if (mode != compare_size_only) - { /* Older version is not marked */ if (source->st.st_mtime < target->st.st_mtime) continue; - } /* Newer version with different size is marked */ if (source->st.st_size != target->st.st_size) { do_file_mark (panel, i, 1); continue; - } + if (mode == compare_size_only) continue; @@ -324,9 +320,8 @@ compare_dir (WPanel * panel, WPanel * other, enum CompareMode mode) /* Thorough compare off, compare only time stamps */ /* Mark newer version, don't mark version with the same date */ if (source->st.st_mtime > target->st.st_mtime) - { do_file_mark (panel, i, 1); - } + continue; } @@ -362,6 +357,7 @@ do_link (link_type_t link_type, const char *fname) input_expand_dialog (_("Link"), src, MC_HISTORY_FM_LINK, "", INPUT_COMPLETE_FILENAMES); if (dest == NULL || *dest == '\0') goto cleanup; + save_cwds_stat (); fname_vpath = vfs_path_from_str (fname); @@ -399,6 +395,7 @@ do_link (link_type_t link_type, const char *fname) if (dest == NULL || *dest == '\0' || src == NULL || *src == '\0') goto cleanup; + save_cwds_stat (); dest_vpath = vfs_path_from_str_flags (dest, VPF_NO_CANON); @@ -777,6 +774,7 @@ void copy_cmd (void) { save_cwds_stat (); + if (panel_operate (current_panel, OP_COPY, FALSE)) { update_panels (UP_OPTIMIZE, UP_KEEPSEL); @@ -791,6 +789,7 @@ void rename_cmd (void) { save_cwds_stat (); + if (panel_operate (current_panel, OP_MOVE, FALSE)) { update_panels (UP_OPTIMIZE, UP_KEEPSEL); @@ -805,6 +804,7 @@ void copy_cmd_local (void) { save_cwds_stat (); + if (panel_operate (current_panel, OP_COPY, TRUE)) { update_panels (UP_OPTIMIZE, UP_KEEPSEL); @@ -819,6 +819,7 @@ void rename_cmd_local (void) { save_cwds_stat (); + if (panel_operate (current_panel, OP_MOVE, TRUE)) { update_panels (UP_OPTIMIZE, UP_KEEPSEL); @@ -862,16 +863,16 @@ mkdir_cmd (void) } save_cwds_stat (); - if (my_mkdir (absdir, 0777) == 0) + + if (my_mkdir (absdir, 0777) != 0) + message (D_ERROR, MSG_ERROR, "%s", unix_error_string (errno)); + else { update_panels (UP_OPTIMIZE, dir); repaint_screen (); select_item (current_panel); } - else - { - message (D_ERROR, MSG_ERROR, "%s", unix_error_string (errno)); - } + vfs_path_free (absdir); } g_free (dir); @@ -920,13 +921,13 @@ find_cmd (void) void filter_cmd (void) { - WPanel *p; + if (SELECTED_IS_PANEL) + { + WPanel *p; - if (!SELECTED_IS_PANEL) - return; - - p = MENU_PANEL; - set_panel_filter (p); + p = MENU_PANEL; + set_panel_filter (p); + } } /* --------------------------------------------------------------------------------------------- */ @@ -950,15 +951,13 @@ void ext_cmd (void) { vfs_path_t *extdir_vpath; - int dir; + int dir = 0; - dir = 0; if (geteuid () == 0) - { dir = query_dialog (_("Extension file edit"), _("Which extension file you want to edit?"), D_NORMAL, 2, _("&User"), _("&System Wide")); - } + extdir_vpath = vfs_path_build_filename (mc_global.sysconfig_dir, MC_LIB_EXT, (char *) NULL); if (dir == 0) @@ -980,6 +979,7 @@ ext_cmd (void) } do_edit (extdir_vpath); } + vfs_path_free (extdir_vpath); flush_extension_file (); } @@ -1050,16 +1050,13 @@ void edit_fhl_cmd (void) { vfs_path_t *fhlfile_vpath = NULL; + int dir = 0; - int dir; - - dir = 0; if (geteuid () == 0) - { dir = query_dialog (_("Highlighting groups file edit"), _("Which highlighting file you want to edit?"), D_NORMAL, 2, _("&User"), _("&System Wide")); - } + fhlfile_vpath = vfs_path_build_filename (mc_global.sysconfig_dir, MC_FHL_INI_FILE, (char *) NULL); @@ -1082,8 +1079,8 @@ edit_fhl_cmd (void) } do_edit (fhlfile_vpath); } - vfs_path_free (fhlfile_vpath); + vfs_path_free (fhlfile_vpath); /* refresh highlighting rules */ mc_fhl_free (&mc_filehighlight); mc_filehighlight = mc_fhl_new (TRUE); @@ -1120,9 +1117,12 @@ hotlist_cmd (void) do_cd_command (cmd); g_free (cmd); } + g_free (target); } +/* --------------------------------------------------------------------------------------------- */ + #ifdef ENABLE_VFS void vfs_list (void) @@ -1131,7 +1131,7 @@ vfs_list (void) vfs_path_t *target_vpath; target = hotlist_show (LIST_VFSLIST); - if (!target) + if (target == NULL) return; target_vpath = vfs_path_from_str (target); @@ -1166,10 +1166,8 @@ compare_dirs_cmd (void) compare_dir (other_panel, current_panel, thorough_flag); } else - { message (D_ERROR, MSG_ERROR, _("Both panels should be in the listing mode\nto use this command")); - } } /* --------------------------------------------------------------------------------------------- */ @@ -1179,18 +1177,18 @@ void diff_view_cmd (void) { /* both panels must be in the list mode */ - if (get_current_type () != view_listing || get_other_type () != view_listing) - return; + if (get_current_type () == view_listing && get_other_type () == view_listing) + { + if (get_current_index () == 0) + dview_diff_cmd (current_panel, other_panel); + else + dview_diff_cmd (other_panel, current_panel); - if (get_current_index () == 0) - dview_diff_cmd (current_panel, other_panel); - else - dview_diff_cmd (other_panel, current_panel); + if (mc_global.mc_run_mode == MC_RUN_FULL) + update_panels (UP_OPTIMIZE, UP_KEEPSEL); - if (mc_global.mc_run_mode == MC_RUN_FULL) - update_panels (UP_OPTIMIZE, UP_KEEPSEL); - - dialog_switch_process_pending (); + dialog_switch_process_pending (); + } } #endif @@ -1209,20 +1207,18 @@ swap_cmd (void) void view_other_cmd (void) { - static int message_flag = TRUE; + static gboolean message_flag = TRUE; - if (!mc_global.tty.xterm_flag && mc_global.tty.console_flag == '\0' - && !mc_global.tty.use_subshell && !output_starts_shell) + if (mc_global.tty.xterm_flag || mc_global.tty.console_flag != '\0' + || mc_global.tty.use_subshell || output_starts_shell) + toggle_panels (); + else { if (message_flag) message (D_ERROR, MSG_ERROR, _("Not an xterm or Linux console;\nthe panels cannot be toggled.")); message_flag = FALSE; } - else - { - toggle_panels (); - } } /* --------------------------------------------------------------------------------------------- */ @@ -1386,12 +1382,14 @@ undelete_cmd (void) void quick_cd_cmd (void) { - char *p = cd_box (); + char *p; - if (p && *p) + p = cd_box (); + if (p != NULL && *p != '\0') { - char *q = g_strconcat ("cd ", p, (char *) NULL); + char *q; + q = g_strconcat ("cd ", p, (char *) NULL); do_cd_command (q); g_free (q); } @@ -1482,8 +1480,8 @@ dirsizes_cmd (void) for (i = 0; i < panel->dir.len; i++) if (S_ISDIR (panel->dir.list[i].st.st_mode) - && ((panel->dirs_marked && panel->dir.list[i].f.marked) - || !panel->dirs_marked) && !DIR_IS_DOTDOT (panel->dir.list[i].fname)) + && ((panel->dirs_marked != 0 && panel->dir.list[i].f.marked) + || panel->dirs_marked == 0) && !DIR_IS_DOTDOT (panel->dir.list[i].fname)) { vfs_path_t *p; size_t dir_count = 0; From 500e49b50ad217969a775e0e23a2c935f9757873 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 28 Jul 2019 09:43:32 +0300 Subject: [PATCH 06/35] (fish_set_env): remove uneeded function call. Signed-off-by: Andrew Borodin --- src/vfs/fish/fish.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/vfs/fish/fish.c b/src/vfs/fish/fish.c index ce3f310ff..e46f71a4a 100644 --- a/src/vfs/fish/fish.c +++ b/src/vfs/fish/fish.c @@ -452,7 +452,6 @@ fish_set_env (int flags) GString *tmp; tmp = g_string_sized_new (250); - g_string_assign (tmp, ""); if ((flags & FISH_HAVE_HEAD) != 0) g_string_append (tmp, "FISH_HAVE_HEAD=1 export FISH_HAVE_HEAD; "); From 0efb799db3866b71e05f6f6aceb2ca7c2bfc2cb5 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 28 Jul 2019 10:28:26 +0300 Subject: [PATCH 07/35] lib/mcconfig: fix coding style; apply source file template. Unconstify some function arguments. Signed-off-by: Andrew Borodin --- lib/mcconfig.h | 94 ++++++++---------- lib/mcconfig/common.c | 50 +++++----- lib/mcconfig/get.c | 54 +++++----- lib/mcconfig/paths.c | 15 +-- lib/mcconfig/set.c | 98 ++++++++----------- lib/serialize.c | 2 +- lib/serialize.h | 2 +- ...xecute_get_external_cmd_opts_from_config.c | 2 +- 8 files changed, 149 insertions(+), 168 deletions(-) diff --git a/lib/mcconfig.h b/lib/mcconfig.h index 931342e64..81928de51 100644 --- a/lib/mcconfig.h +++ b/lib/mcconfig.h @@ -1,5 +1,5 @@ -#ifndef MC_CONFIG_H -#define MC_CONFIG_H +#ifndef MC__CONFIG_H +#define MC__CONFIG_H #include "lib/vfs/vfs.h" /* vfs_path_t */ @@ -30,89 +30,77 @@ typedef struct mc_config_t mc_config_t *mc_config_init (const gchar * ini_path, gboolean read_only); void mc_config_deinit (mc_config_t * mc_config); -gboolean mc_config_del_key (mc_config_t *, const char *, const gchar *); -gboolean mc_config_del_group (mc_config_t *, const char *); +gboolean mc_config_has_param (const mc_config_t * mc_config, const char *group, + const gchar * param); +gboolean mc_config_has_group (mc_config_t * mc_config, const char *group); -gboolean mc_config_has_param (const mc_config_t *, const char *, const gchar *); -gboolean mc_config_has_group (mc_config_t *, const char *); +gboolean mc_config_del_key (mc_config_t * mc_config, const char *group, const gchar * param); +gboolean mc_config_del_group (mc_config_t * mc_config, const char *group); gboolean mc_config_read_file (mc_config_t * mc_config, const gchar * ini_path, gboolean read_only, gboolean remove_empty); - -gboolean mc_config_save_file (mc_config_t * config, GError ** error); - -gboolean mc_config_save_to_file (mc_config_t * config, const gchar * filename, GError ** error); +gboolean mc_config_save_file (mc_config_t * config, GError ** mcerror); +gboolean mc_config_save_to_file (mc_config_t * mc_config, const gchar * ini_path, + GError ** mcerror); /* mcconfig/get.c: */ gchar **mc_config_get_groups (const mc_config_t * mc_config, gsize * len); - gchar **mc_config_get_keys (const mc_config_t * mc_config, const gchar * group, gsize * len); -gchar *mc_config_get_string (mc_config_t *, const gchar *, const gchar *, const gchar *); - -gchar *mc_config_get_string_raw (const mc_config_t *, const gchar *, const gchar *, const gchar *); - -gboolean mc_config_get_bool (mc_config_t *, const gchar *, const gchar *, gboolean); - -int mc_config_get_int (mc_config_t *, const gchar *, const gchar *, int); - +gchar *mc_config_get_string (mc_config_t * mc_config, const gchar * group, const gchar * param, + const gchar * def); +gchar *mc_config_get_string_raw (mc_config_t * mc_config, const gchar * group, const gchar * param, + const gchar * def); +gboolean mc_config_get_bool (mc_config_t * mc_config, const gchar * group, const gchar * param, + gboolean def); +int mc_config_get_int (mc_config_t * mc_config, const gchar * group, const gchar * param, int def); gchar **mc_config_get_string_list (mc_config_t * mc_config, const gchar * group, const gchar * param, gsize * length); - -gboolean *mc_config_get_bool_list (mc_config_t *, const gchar *, const gchar *, gsize *); - -int *mc_config_get_int_list (mc_config_t *, const gchar *, const gchar *, gsize *); +gboolean *mc_config_get_bool_list (mc_config_t * mc_config, const gchar * group, + const gchar * param, gsize * length); +int *mc_config_get_int_list (mc_config_t * mc_config, const gchar * group, const gchar * param, + gsize * length); /* mcconfig/set.c: */ -void mc_config_set_string_raw (mc_config_t *, const gchar *, const gchar *, const gchar *); - -void mc_config_set_string_raw_value (mc_config_t *, const gchar *, const gchar *, const gchar *); - -void mc_config_set_string (const mc_config_t *, const gchar *, const gchar *, const gchar *); - -void mc_config_set_bool (mc_config_t *, const gchar *, const gchar *, gboolean); - -void mc_config_set_int (mc_config_t *, const gchar *, const gchar *, int); +void mc_config_set_string_raw (mc_config_t * mc_config, const gchar * group, const gchar * param, + const gchar * value); +void mc_config_set_string_raw_value (mc_config_t * mc_config, const gchar * group, + const gchar * param, const gchar * value); +void mc_config_set_string (mc_config_t * mc_config, const gchar * group, const gchar * param, + const gchar * value); +void mc_config_set_bool (mc_config_t * mc_config, const gchar * group, const gchar * param, + gboolean value); +void mc_config_set_int (mc_config_t * mc_config, const gchar * group, const gchar * param, + int value); void -mc_config_set_string_list (mc_config_t *, const gchar *, - const gchar *, const gchar * const[], gsize); - -void mc_config_set_bool_list (mc_config_t *, const gchar *, const gchar *, gboolean[], gsize); - -void mc_config_set_int_list (mc_config_t *, const gchar *, const gchar *, int[], gsize); - - -/* mcconfig/dialog.c: */ - -void mc_config_show_dialog (void); +mc_config_set_string_list (mc_config_t * mc_config, const gchar * group, const gchar * param, + const gchar * const value[], gsize length); +void mc_config_set_bool_list (mc_config_t * mc_config, const gchar * group, const gchar * param, + gboolean value[], gsize length); +void mc_config_set_int_list (mc_config_t * mc_config, const gchar * group, const gchar * param, + int value[], gsize length); /* mcconfig/paths.c: */ void mc_config_init_config_paths (GError ** error); - void mc_config_deinit_config_paths (void); -gboolean mc_config_migrate_from_old_place (GError ** error, char **msg); - const char *mc_config_get_data_path (void); - const char *mc_config_get_cache_path (void); - -const char *mc_config_get_path (void); - const char *mc_config_get_home_dir (void); - +const char *mc_config_get_path (void); char *mc_config_get_full_path (const char *config_name); - vfs_path_t *mc_config_get_full_vpath (const char *config_name); +gboolean mc_config_migrate_from_old_place (GError ** mcerror, char **msg); + /*** inline functions ****************************************************************************/ -#endif +#endif /* MC__CONFIG_H */ diff --git a/lib/mcconfig/common.c b/lib/mcconfig/common.c index 10e4ab075..110b52086 100644 --- a/lib/mcconfig/common.c +++ b/lib/mcconfig/common.c @@ -30,18 +30,20 @@ #include "lib/global.h" #include "lib/vfs/vfs.h" /* mc_stat */ #include "lib/util.h" + #include "lib/mcconfig.h" -/*** global variables **************************************************/ +/*** global variables ****************************************************************************/ -/*** file scope macro definitions **************************************/ +/*** file scope macro definitions ****************************************************************/ -/*** file scope type declarations **************************************/ +/*** file scope type declarations ****************************************************************/ -/*** file scope variables **********************************************/ +/*** file scope variables ************************************************************************/ -/*** file scope functions **********************************************/ -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ +/*** file scope functions ************************************************************************/ +/* --------------------------------------------------------------------------------------------- */ static gboolean mc_config_new_or_override_file (mc_config_t * mc_config, const gchar * ini_path, GError ** mcerror) @@ -80,6 +82,7 @@ mc_config_new_or_override_file (mc_config_t * mc_config, const gchar * ini_path, (cur_written = mc_write (fd, (const void *) written_data, total_written)) > 0; written_data += cur_written, total_written -= cur_written) ; + mc_close (fd); g_free (data); @@ -94,9 +97,9 @@ mc_config_new_or_override_file (mc_config_t * mc_config, const gchar * ini_path, return TRUE; } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -/*** public functions **************************************************/ -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ +/*** public functions ****************************************************************************/ +/* --------------------------------------------------------------------------------------------- */ mc_config_t * mc_config_init (const gchar * ini_path, gboolean read_only) @@ -105,7 +108,6 @@ mc_config_init (const gchar * ini_path, gboolean read_only) struct stat st; mc_config = g_try_malloc0 (sizeof (mc_config_t)); - if (mc_config == NULL) return NULL; @@ -115,6 +117,7 @@ mc_config_init (const gchar * ini_path, gboolean read_only) g_free (mc_config); return NULL; } + if (ini_path == NULL) return mc_config; @@ -140,7 +143,7 @@ mc_config_init (const gchar * ini_path, gboolean read_only) return mc_config; } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ void mc_config_deinit (mc_config_t * mc_config) @@ -153,51 +156,51 @@ mc_config_deinit (mc_config_t * mc_config) } } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ gboolean mc_config_has_param (const mc_config_t * mc_config, const char *group, const gchar * param) { - if (!mc_config || !group || !param) + if (mc_config == NULL || group == NULL || param == NULL) return FALSE; return g_key_file_has_key (mc_config->handle, group, param, NULL); } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ gboolean mc_config_has_group (mc_config_t * mc_config, const char *group) { - if (!mc_config || !group) + if (mc_config == NULL || group == NULL) return FALSE; return g_key_file_has_group (mc_config->handle, group); } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ gboolean mc_config_del_key (mc_config_t * mc_config, const char *group, const gchar * param) { - if (!mc_config || !group || !param) + if (mc_config == NULL || group == NULL || param == NULL) return FALSE; return g_key_file_remove_key (mc_config->handle, group, param, NULL); } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ gboolean mc_config_del_group (mc_config_t * mc_config, const char *group) { - if (!mc_config || !group) + if (mc_config == NULL || group == NULL) return FALSE; return g_key_file_remove_group (mc_config->handle, group, NULL); } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ gboolean mc_config_read_file (mc_config_t * mc_config, const gchar * ini_path, gboolean read_only, @@ -247,7 +250,7 @@ mc_config_read_file (mc_config_t * mc_config, const gchar * ini_path, gboolean r return ok; } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ gboolean mc_config_save_file (mc_config_t * mc_config, GError ** mcerror) @@ -260,7 +263,7 @@ mc_config_save_file (mc_config_t * mc_config, GError ** mcerror) return mc_config_new_or_override_file (mc_config, mc_config->ini_path, mcerror); } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ gboolean mc_config_save_to_file (mc_config_t * mc_config, const gchar * ini_path, GError ** mcerror) @@ -271,7 +274,6 @@ mc_config_save_to_file (mc_config_t * mc_config, const gchar * ini_path, GError return FALSE; return mc_config_new_or_override_file (mc_config, ini_path, mcerror); - } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ diff --git a/lib/mcconfig/get.c b/lib/mcconfig/get.c index 72a3b80a6..fc8116c6a 100644 --- a/lib/mcconfig/get.c +++ b/lib/mcconfig/get.c @@ -24,19 +24,26 @@ #include "lib/global.h" #include "lib/strutil.h" + #include "lib/mcconfig.h" -/*** global variables **************************************************/ +/*** global variables ****************************************************************************/ -/*** file scope macro definitions **************************************/ +/*** file scope macro definitions ****************************************************************/ -/*** file scope type declarations **************************************/ +/*** file scope type declarations ****************************************************************/ -/*** file scope variables **********************************************/ +/*** file scope variables ************************************************************************/ -/*** file scope functions **********************************************/ +/*** file scope functions ************************************************************************/ -/*** public functions **************************************************/ +/* --------------------------------------------------------------------------------------------- */ +/*** file scope functions ************************************************************************/ +/* --------------------------------------------------------------------------------------------- */ + +/* --------------------------------------------------------------------------------------------- */ +/*** public functions ****************************************************************************/ +/* --------------------------------------------------------------------------------------------- */ gchar ** mc_config_get_groups (const mc_config_t * mc_config, gsize * len) @@ -56,7 +63,7 @@ mc_config_get_groups (const mc_config_t * mc_config, gsize * len) return ret; } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ gchar ** mc_config_get_keys (const mc_config_t * mc_config, const gchar * group, gsize * len) @@ -76,7 +83,7 @@ mc_config_get_keys (const mc_config_t * mc_config, const gchar * group, gsize * return ret; } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ gchar * mc_config_get_string (mc_config_t * mc_config, const gchar * group, @@ -87,7 +94,7 @@ mc_config_get_string (mc_config_t * mc_config, const gchar * group, gchar *ret; estr_t conv_res; - if (!mc_config || !group || !param) + if (mc_config == NULL || group == NULL || param == NULL) return g_strdup (def); if (!mc_config_has_param (mc_config, group, param)) @@ -123,15 +130,15 @@ mc_config_get_string (mc_config_t * mc_config, const gchar * group, return g_string_free (buffer, FALSE); } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ gchar * -mc_config_get_string_raw (const mc_config_t * mc_config, const gchar * group, +mc_config_get_string_raw (mc_config_t * mc_config, const gchar * group, const gchar * param, const gchar * def) { gchar *ret; - if (!mc_config || !group || !param) + if (mc_config == NULL || group == NULL || param == NULL) return g_strdup (def); if (!mc_config_has_param (mc_config, group, param)) @@ -146,12 +153,12 @@ mc_config_get_string_raw (const mc_config_t * mc_config, const gchar * group, return ret != NULL ? ret : g_strdup (def); } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ gboolean mc_config_get_bool (mc_config_t * mc_config, const gchar * group, const gchar * param, gboolean def) { - if (!mc_config || !group || !param) + if (mc_config == NULL || group == NULL || param == NULL) return def; if (!mc_config_has_param (mc_config, group, param)) @@ -163,12 +170,12 @@ mc_config_get_bool (mc_config_t * mc_config, const gchar * group, const gchar * return g_key_file_get_boolean (mc_config->handle, group, param, NULL); } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ int mc_config_get_int (mc_config_t * mc_config, const gchar * group, const gchar * param, int def) { - if (!mc_config || !group || !param) + if (mc_config == NULL || group == NULL || param == NULL) return def; if (!mc_config_has_param (mc_config, group, param)) @@ -180,41 +187,40 @@ mc_config_get_int (mc_config_t * mc_config, const gchar * group, const gchar * p return g_key_file_get_integer (mc_config->handle, group, param, NULL); } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ gchar ** mc_config_get_string_list (mc_config_t * mc_config, const gchar * group, const gchar * param, gsize * length) { - if (!mc_config || !group || !param) + if (mc_config == NULL || group == NULL || param == NULL) return NULL; return g_key_file_get_string_list (mc_config->handle, group, param, length, NULL); } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ gboolean * mc_config_get_bool_list (mc_config_t * mc_config, const gchar * group, const gchar * param, gsize * length) { - if (!mc_config || !group || !param) + if (mc_config == NULL || group == NULL || param == NULL) return NULL; return g_key_file_get_boolean_list (mc_config->handle, group, param, length, NULL); } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ int * mc_config_get_int_list (mc_config_t * mc_config, const gchar * group, const gchar * param, gsize * length) { - if (!mc_config || !group || !param) + if (mc_config == NULL || group == NULL || param == NULL) return NULL; return g_key_file_get_integer_list (mc_config->handle, group, param, length, NULL); } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ diff --git a/lib/mcconfig/paths.c b/lib/mcconfig/paths.c index 327b175ee..308f1d8a5 100644 --- a/lib/mcconfig/paths.c +++ b/lib/mcconfig/paths.c @@ -127,6 +127,7 @@ static const struct }; #endif /* MC_HOMEDIR_XDG */ +/* --------------------------------------------------------------------------------------------- */ /*** file scope functions *********************************************************************** */ /* --------------------------------------------------------------------------------------------- */ @@ -150,12 +151,11 @@ mc_config_init_one_config_path (const char *path_base, const char *subdir, GErro mc_return_val_if_error (mcerror, FALSE); full_path = g_build_filename (path_base, subdir, (char *) NULL); + if (g_file_test (full_path, G_FILE_TEST_EXISTS)) { if (g_file_test (full_path, G_FILE_TEST_IS_DIR)) - { config_dir_present = TRUE; - } else { fprintf (stderr, "%s %s\n", _("FATAL: not a directory:"), full_path); @@ -199,7 +199,6 @@ mc_config_copy (const char *old_name, const char *new_name, GError ** mcerror) if (g_file_test (old_name, G_FILE_TEST_IS_DIR)) { - GDir *dir; const char *dir_name; @@ -255,6 +254,7 @@ mc_config_fix_migrated_rules (void) rename (old_name, new_name); g_free (new_name); } + g_free (old_name); } } @@ -405,6 +405,7 @@ mc_config_get_home_dir (void) if (homedir == NULL || *homedir == '\0') homedir = g_get_home_dir (); } + return homedir; } @@ -445,6 +446,7 @@ mc_config_migrate_from_old_place (GError ** mcerror, char **msg) for (rule_index = 0; mc_config_files_reference[rule_index].old_filename != NULL; rule_index++) { char *old_name; + if (*mc_config_files_reference[rule_index].old_filename == '\0') continue; @@ -462,6 +464,7 @@ mc_config_migrate_from_old_place (GError ** mcerror, char **msg) mc_config_copy (old_name, new_name, mcerror); g_free (new_name); } + g_free (old_name); } @@ -501,14 +504,11 @@ mc_config_get_full_path (const char *config_name) mc_config_init_config_paths (NULL); for (rule_index = 0; mc_config_files_reference[rule_index].old_filename != NULL; rule_index++) - { if (strcmp (config_name, mc_config_files_reference[rule_index].new_filename) == 0) - { return g_build_filename (*mc_config_files_reference[rule_index].new_basedir, mc_config_files_reference[rule_index].new_filename, (char *) NULL); - } - } + return NULL; } @@ -530,6 +530,7 @@ mc_config_get_full_vpath (const char *config_name) ret_vpath = vfs_path_from_str (str_path); g_free (str_path); + return ret_vpath; } diff --git a/lib/mcconfig/set.c b/lib/mcconfig/set.c index 7ff60f50f..5d05df869 100644 --- a/lib/mcconfig/set.c +++ b/lib/mcconfig/set.c @@ -24,18 +24,20 @@ #include "lib/global.h" #include "lib/strutil.h" + #include "lib/mcconfig.h" -/*** global variables **************************************************/ +/*** global variables ****************************************************************************/ -/*** file scope macro definitions **************************************/ +/*** file scope macro definitions ****************************************************************/ -/*** file scope type declarations **************************************/ +/*** file scope type declarations ****************************************************************/ -/*** file scope variables **********************************************/ +/*** file scope variables ************************************************************************/ -/*** file scope functions **********************************************/ -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ +/*** file scope functions ************************************************************************/ +/* --------------------------------------------------------------------------------------------- */ static gchar * mc_config_normalize_before_save (const gchar * value) @@ -65,109 +67,91 @@ mc_config_normalize_before_save (const gchar * value) return g_string_free (buffer, FALSE); } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -/*** public functions **************************************************/ -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ +/*** public functions ****************************************************************************/ +/* --------------------------------------------------------------------------------------------- */ void mc_config_set_string_raw (mc_config_t * mc_config, const gchar * group, const gchar * param, const gchar * value) { - if (!mc_config || !group || !param || !value) - return; - - g_key_file_set_string (mc_config->handle, group, param, value); + if (mc_config != NULL && group != NULL && param != NULL && value != NULL) + g_key_file_set_string (mc_config->handle, group, param, value); } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ void mc_config_set_string_raw_value (mc_config_t * mc_config, const gchar * group, const gchar * param, const gchar * value) { - if (!mc_config || !group || !param || !value) - return; - - g_key_file_set_value (mc_config->handle, group, param, value); + if (mc_config != NULL && group != NULL && param != NULL && value != NULL) + g_key_file_set_value (mc_config->handle, group, param, value); } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ void -mc_config_set_string (const mc_config_t * mc_config, const gchar * group, +mc_config_set_string (mc_config_t * mc_config, const gchar * group, const gchar * param, const gchar * value) { - gchar *buffer; + if (mc_config != NULL && group != NULL && param != NULL && value != NULL) + { + gchar *buffer; - if (!mc_config || !group || !param || !value) - return; - - buffer = mc_config_normalize_before_save (value); - - g_key_file_set_string (mc_config->handle, group, param, buffer); - - g_free (buffer); + buffer = mc_config_normalize_before_save (value); + g_key_file_set_string (mc_config->handle, group, param, buffer); + g_free (buffer); + } } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ void mc_config_set_bool (mc_config_t * mc_config, const gchar * group, const gchar * param, gboolean value) { - if (!mc_config || !group || !param) - return; - - g_key_file_set_boolean (mc_config->handle, group, param, value); + if (mc_config != NULL && group != NULL && param != NULL) + g_key_file_set_boolean (mc_config->handle, group, param, value); } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ void mc_config_set_int (mc_config_t * mc_config, const gchar * group, const gchar * param, int value) { - if (!mc_config || !group || !param) - return; - - g_key_file_set_integer (mc_config->handle, group, param, value); + if (mc_config != NULL && group != NULL && param != NULL) + g_key_file_set_integer (mc_config->handle, group, param, value); } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ void mc_config_set_string_list (mc_config_t * mc_config, const gchar * group, const gchar * param, const gchar * const value[], gsize length) { - if (!mc_config || !group || !param || !value || length == 0) - return; - - g_key_file_set_string_list (mc_config->handle, group, param, value, length); + if (mc_config != NULL && group != NULL && param != NULL && value != NULL && length != 0) + g_key_file_set_string_list (mc_config->handle, group, param, value, length); } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - +/* --------------------------------------------------------------------------------------------- */ void mc_config_set_bool_list (mc_config_t * mc_config, const gchar * group, const gchar * param, gboolean value[], gsize length) { - if (!mc_config || !group || !param || !value || length == 0) - return; - - g_key_file_set_boolean_list (mc_config->handle, group, param, value, length); + if (mc_config != NULL && group != NULL && param != NULL && value != NULL && length != 0) + g_key_file_set_boolean_list (mc_config->handle, group, param, value, length); } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ void mc_config_set_int_list (mc_config_t * mc_config, const gchar * group, const gchar * param, int value[], gsize length) { - if (!mc_config || !group || !param || !value || length == 0) - return; - - g_key_file_set_integer_list (mc_config->handle, group, param, value, length); + if (mc_config != NULL && group != NULL && param != NULL && value != NULL && length != 0) + g_key_file_set_integer_list (mc_config->handle, group, param, value, length); } -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* --------------------------------------------------------------------------------------------- */ diff --git a/lib/serialize.c b/lib/serialize.c index 875cc13cb..f111966d3 100644 --- a/lib/serialize.c +++ b/lib/serialize.c @@ -193,7 +193,7 @@ mc_deserialize_str (const char prefix, const char *data, GError ** error) */ char * -mc_serialize_config (const mc_config_t * data, GError ** error) +mc_serialize_config (mc_config_t * data, GError ** error) { gchar **groups, **group_iterator; GString *buffer; diff --git a/lib/serialize.h b/lib/serialize.h index ac5725a98..ba24a809f 100644 --- a/lib/serialize.h +++ b/lib/serialize.h @@ -19,7 +19,7 @@ char *mc_serialize_str (const char prefix, const char *data, GError ** error); char *mc_deserialize_str (const char prefix, const char *data, GError ** error); -char *mc_serialize_config (const mc_config_t * data, GError ** error); +char *mc_serialize_config (mc_config_t * data, GError ** error); mc_config_t *mc_deserialize_config (const char *data, GError ** error); /*** inline functions ****************************************************************************/ diff --git a/tests/src/execute__execute_get_external_cmd_opts_from_config.c b/tests/src/execute__execute_get_external_cmd_opts_from_config.c index 5345dd7bd..1d913592b 100644 --- a/tests/src/execute__execute_get_external_cmd_opts_from_config.c +++ b/tests/src/execute__execute_get_external_cmd_opts_from_config.c @@ -48,7 +48,7 @@ static GPtrArray *mc_config_get_string__return_value; /* @Mock */ gchar * -mc_config_get_string_raw (const mc_config_t * config_ignored, const gchar * group, +mc_config_get_string_raw (mc_config_t * config_ignored, const gchar * group, const gchar * param, const gchar * default_value) { char *return_value; From 29110e56811a29ccf09feac7e7c39a9836627be0 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 28 Jul 2019 15:24:00 +0300 Subject: [PATCH 08/35] Move history operation routines from lib/widget/history.c to lib/mcconfig/history.c. Signed-off-by: Andrew Borodin --- lib/mcconfig.h | 12 +++ lib/mcconfig/Makefile.am | 1 + lib/mcconfig/history.c | 219 +++++++++++++++++++++++++++++++++++++++ lib/widget/dialog.c | 1 + lib/widget/history.c | 167 +---------------------------- lib/widget/history.h | 15 +-- lib/widget/input.c | 5 +- src/editor/editcmd.c | 2 +- src/filemanager/panel.c | 6 +- src/setup.c | 2 +- src/viewer/actions_cmd.c | 3 +- 11 files changed, 246 insertions(+), 187 deletions(-) create mode 100644 lib/mcconfig/history.c diff --git a/lib/mcconfig.h b/lib/mcconfig.h index 81928de51..e34ca6570 100644 --- a/lib/mcconfig.h +++ b/lib/mcconfig.h @@ -23,6 +23,8 @@ typedef struct mc_config_t /*** global variables defined in .c file *********************************************************/ +extern int num_history_items_recorded; + /*** declarations of public functions ************************************************************/ /* mcconfig/common.c: */ @@ -101,6 +103,16 @@ vfs_path_t *mc_config_get_full_vpath (const char *config_name); gboolean mc_config_migrate_from_old_place (GError ** mcerror, char **msg); +/* mcconfig/history.h */ + +/* read history to the mc_config, but don't save config to file */ +GList *mc_config_history_get (const char *name); +/* load history from the mc_config */ +GList *mc_config_history_load (mc_config_t * cfg, const char *name); +/* save history to the mc_config, but don't save config to file */ +void mc_config_history_save (mc_config_t * cfg, const char *name, GList * h); + + /*** inline functions ****************************************************************************/ #endif /* MC__CONFIG_H */ diff --git a/lib/mcconfig/Makefile.am b/lib/mcconfig/Makefile.am index 0cabd2f8a..ad62b9132 100644 --- a/lib/mcconfig/Makefile.am +++ b/lib/mcconfig/Makefile.am @@ -4,6 +4,7 @@ noinst_LTLIBRARIES = libmcconfig.la libmcconfig_la_SOURCES = \ common.c \ get.c \ + history.c \ set.c \ paths.c diff --git a/lib/mcconfig/history.c b/lib/mcconfig/history.c new file mode 100644 index 000000000..3174fd2ab --- /dev/null +++ b/lib/mcconfig/history.c @@ -0,0 +1,219 @@ +/* + Widgets for the Midnight Commander + + Copyright (C) 1994-2019 + Free Software Foundation, Inc. + + Authors: + Radek Doulik, 1994, 1995 + Miguel de Icaza, 1994, 1995 + Jakub Jelinek, 1995 + Andrej Borsenkow, 1996 + Norbert Warmuth, 1997 + Andrew Borodin , 2009-2019 + + This file is part of the Midnight Commander. + + The Midnight Commander is free software: you can redistribute it + and/or modify it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + The Midnight Commander is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + */ + +/** \file history.c + * \brief Source: save and load history + */ + +#include + +#include +#include + +#include "lib/global.h" + +#include "lib/fileloc.h" /* MC_HISTORY_FILE */ +#include "lib/strutil.h" +#include "lib/util.h" /* list_append_unique */ + +#include "lib/mcconfig.h" + +/*** global variables ****************************************************************************/ + +/* how much history items are used */ +int num_history_items_recorded = 60; + +/*** file scope macro definitions ****************************************************************/ + +/*** file scope type declarations ****************************************************************/ + +/*** file scope variables ************************************************************************/ + +/* --------------------------------------------------------------------------------------------- */ +/*** file scope functions ************************************************************************/ +/* --------------------------------------------------------------------------------------------- */ + +/* --------------------------------------------------------------------------------------------- */ +/*** public functions ****************************************************************************/ +/* --------------------------------------------------------------------------------------------- */ + +/** + * Load the history from the ${XDG_CACHE_HOME}/mc/history file. + * It is called with the widgets history name and returns the GList list. + */ + +GList * +mc_config_history_get (const char *name) +{ + GList *hist = NULL; + char *profile; + mc_config_t *cfg; + + if (num_history_items_recorded == 0) /* this is how to disable */ + return NULL; + if (name == NULL || *name == '\0') + return NULL; + + profile = mc_config_get_full_path (MC_HISTORY_FILE); + cfg = mc_config_init (profile, TRUE); + + hist = mc_config_history_load (cfg, name); + + mc_config_deinit (cfg); + g_free (profile); + + return hist; +} + +/* --------------------------------------------------------------------------------------------- */ + +/** + * Load history from the mc_config + */ +GList * +mc_config_history_load (mc_config_t * cfg, const char *name) +{ + size_t i; + GList *hist = NULL; + char **keys; + size_t keys_num = 0; + GIConv conv = INVALID_CONV; + GString *buffer; + + if (name == NULL || *name == '\0') + return NULL; + + /* get number of keys */ + keys = mc_config_get_keys (cfg, name, &keys_num); + g_strfreev (keys); + + /* create charset conversion handler to convert strings + from utf-8 to system codepage */ + if (!mc_global.utf8_display) + conv = str_crt_conv_from ("UTF-8"); + + buffer = g_string_sized_new (64); + + for (i = 0; i < keys_num; i++) + { + char key[BUF_TINY]; + char *this_entry; + + g_snprintf (key, sizeof (key), "%lu", (unsigned long) i); + this_entry = mc_config_get_string_raw (cfg, name, key, ""); + + if (this_entry == NULL) + continue; + + if (conv == INVALID_CONV) + hist = list_append_unique (hist, this_entry); + else + { + g_string_set_size (buffer, 0); + if (str_convert (conv, this_entry, buffer) == ESTR_FAILURE) + hist = list_append_unique (hist, this_entry); + else + { + hist = list_append_unique (hist, g_strndup (buffer->str, buffer->len)); + g_free (this_entry); + } + } + } + + g_string_free (buffer, TRUE); + if (conv != INVALID_CONV) + str_close_conv (conv); + + /* return pointer to the last entry in the list */ + return g_list_last (hist); +} + +/* --------------------------------------------------------------------------------------------- */ + +/** + * Save history to the mc_config, but don't save config to file + */ +void +mc_config_history_save (mc_config_t * cfg, const char *name, GList * h) +{ + GIConv conv = INVALID_CONV; + GString *buffer; + int i; + + if (name == NULL || *name == '\0' || h == NULL) + return; + + /* go to end of list */ + h = g_list_last (h); + + /* go back 60 places */ + for (i = 0; (i < num_history_items_recorded - 1) && (h->prev != NULL); i++) + h = g_list_previous (h); + + if (name != NULL) + mc_config_del_group (cfg, name); + + /* create charset conversion handler to convert strings + from system codepage to UTF-8 */ + if (!mc_global.utf8_display) + conv = str_crt_conv_to ("UTF-8"); + + buffer = g_string_sized_new (64); + + /* dump history into profile */ + for (i = 0; h != NULL; h = g_list_next (h)) + { + char key[BUF_TINY]; + char *text = (char *) h->data; + + /* We shouldn't have null entries, but let's be sure */ + if (text == NULL) + continue; + + g_snprintf (key, sizeof (key), "%d", i++); + + if (conv == INVALID_CONV) + mc_config_set_string_raw (cfg, name, key, text); + else + { + g_string_set_size (buffer, 0); + if (str_convert (conv, text, buffer) == ESTR_FAILURE) + mc_config_set_string_raw (cfg, name, key, text); + else + mc_config_set_string_raw (cfg, name, key, buffer->str); + } + } + + g_string_free (buffer, TRUE); + if (conv != INVALID_CONV) + str_close_conv (conv); +} + +/* --------------------------------------------------------------------------------------------- */ diff --git a/lib/widget/dialog.c b/lib/widget/dialog.c index 23359f6a9..1273b67b4 100644 --- a/lib/widget/dialog.c +++ b/lib/widget/dialog.c @@ -43,6 +43,7 @@ #include "lib/fileloc.h" /* MC_HISTORY_FILE */ #include "lib/event.h" /* mc_event_raise() */ #include "lib/util.h" /* MC_PTR_FREE */ +#include "lib/mcconfig.h" /* num_history_items_recorded */ #include "lib/widget.h" #include "lib/widget/mouse.h" diff --git a/lib/widget/history.c b/lib/widget/history.c index ae5ceb73f..e1bddf681 100644 --- a/lib/widget/history.c +++ b/lib/widget/history.c @@ -10,7 +10,7 @@ Jakub Jelinek, 1995 Andrej Borsenkow, 1996 Norbert Warmuth, 1997 - Andrew Borodin , 2009, 2010, 2011, 2012, 2013 + Andrew Borodin , 2009-2019 This file is part of the Midnight Commander. @@ -29,33 +29,23 @@ */ /** \file history.c - * \brief Source: save, load and show history + * \brief Source: show history */ #include -#include #include -#include -#include #include -#include #include "lib/global.h" #include "lib/tty/tty.h" /* LINES, COLS */ -#include "lib/mcconfig.h" /* for history loading and saving */ -#include "lib/fileloc.h" #include "lib/strutil.h" -#include "lib/util.h" /* list_append_unique */ #include "lib/widget.h" #include "lib/keybind.h" /* CK_* */ /*** global variables ****************************************************************************/ -/* how much history items are used */ -int num_history_items_recorded = 60; - /*** file scope macro definitions ****************************************************************/ #define B_VIEW (B_USER + 1) @@ -189,159 +179,6 @@ history_release_item (history_descriptor_t * hd, WLEntry * le) /*** public functions ****************************************************************************/ /* --------------------------------------------------------------------------------------------- */ -/** - * Load the history from the ${XDG_CACHE_HOME}/mc/history file. - * It is called with the widgets history name and returns the GList list. - */ - -GList * -history_get (const char *input_name) -{ - GList *hist = NULL; - char *profile; - mc_config_t *cfg; - - if (num_history_items_recorded == 0) /* this is how to disable */ - return NULL; - if ((input_name == NULL) || (*input_name == '\0')) - return NULL; - - profile = mc_config_get_full_path (MC_HISTORY_FILE); - cfg = mc_config_init (profile, TRUE); - - hist = history_load (cfg, input_name); - - mc_config_deinit (cfg); - g_free (profile); - - return hist; -} - -/* --------------------------------------------------------------------------------------------- */ - -/** - * Load history from the mc_config - */ -GList * -history_load (mc_config_t * cfg, const char *name) -{ - size_t i; - GList *hist = NULL; - char **keys; - size_t keys_num = 0; - GIConv conv = INVALID_CONV; - GString *buffer; - - if (name == NULL || *name == '\0') - return NULL; - - /* get number of keys */ - keys = mc_config_get_keys (cfg, name, &keys_num); - g_strfreev (keys); - - /* create charset conversion handler to convert strings - from utf-8 to system codepage */ - if (!mc_global.utf8_display) - conv = str_crt_conv_from ("UTF-8"); - - buffer = g_string_sized_new (64); - - for (i = 0; i < keys_num; i++) - { - char key[BUF_TINY]; - char *this_entry; - - g_snprintf (key, sizeof (key), "%lu", (unsigned long) i); - this_entry = mc_config_get_string_raw (cfg, name, key, ""); - - if (this_entry == NULL) - continue; - - if (conv == INVALID_CONV) - hist = list_append_unique (hist, this_entry); - else - { - g_string_set_size (buffer, 0); - if (str_convert (conv, this_entry, buffer) == ESTR_FAILURE) - hist = list_append_unique (hist, this_entry); - else - { - hist = list_append_unique (hist, g_strndup (buffer->str, buffer->len)); - g_free (this_entry); - } - } - } - - g_string_free (buffer, TRUE); - if (conv != INVALID_CONV) - str_close_conv (conv); - - /* return pointer to the last entry in the list */ - return g_list_last (hist); -} - -/* --------------------------------------------------------------------------------------------- */ - -/** - * Save history to the mc_config, but don't save config to file - */ -void -history_save (mc_config_t * cfg, const char *name, GList * h) -{ - GIConv conv = INVALID_CONV; - GString *buffer; - int i; - - if (name == NULL || *name == '\0' || h == NULL) - return; - - /* go to end of list */ - h = g_list_last (h); - - /* go back 60 places */ - for (i = 0; (i < num_history_items_recorded - 1) && (h->prev != NULL); i++) - h = g_list_previous (h); - - if (name != NULL) - mc_config_del_group (cfg, name); - - /* create charset conversion handler to convert strings - from system codepage to UTF-8 */ - if (!mc_global.utf8_display) - conv = str_crt_conv_to ("UTF-8"); - - buffer = g_string_sized_new (64); - /* dump history into profile */ - for (i = 0; h != NULL; h = g_list_next (h)) - { - char key[BUF_TINY]; - char *text = (char *) h->data; - - /* We shouldn't have null entries, but let's be sure */ - if (text == NULL) - continue; - - g_snprintf (key, sizeof (key), "%d", i++); - - if (conv == INVALID_CONV) - mc_config_set_string_raw (cfg, name, key, text); - else - { - g_string_set_size (buffer, 0); - if (str_convert (conv, text, buffer) == ESTR_FAILURE) - mc_config_set_string_raw (cfg, name, key, text); - else - mc_config_set_string_raw (cfg, name, key, buffer->str); - } - } - - g_string_free (buffer, TRUE); - if (conv != INVALID_CONV) - str_close_conv (conv); -} - -/* --------------------------------------------------------------------------------------------- */ - void history_descriptor_init (history_descriptor_t * hd, int y, int x, GList * history, int current) { diff --git a/lib/widget/history.h b/lib/widget/history.h index 4a8c5d668..9c4b403d1 100644 --- a/lib/widget/history.h +++ b/lib/widget/history.h @@ -1,13 +1,11 @@ /** \file lib/widget/history.h - * \brief Header: save, load and show history + * \brief Header: show history */ #ifndef MC__WIDGET_HISTORY_H #define MC__WIDGET_HISTORY_H -#include "lib/mcconfig.h" /* mc_config_t */ - /*** typedefs(not structures) and defined constants **********************************************/ /* forward declarations */ @@ -41,22 +39,11 @@ typedef struct history_descriptor_t /*** global variables defined in .c file *********************************************************/ -extern int num_history_items_recorded; - /*** declarations of public functions ************************************************************/ -/* read history to the mc_config, but don't save config to file */ -GList *history_get (const char *input_name); -/* load history from the mc_config */ -GList *history_load (mc_config_t * cfg, const char *name); -/* save history to the mc_config, but don't save config to file */ -void history_save (mc_config_t * cfg, const char *name, GList * h); - void history_descriptor_init (history_descriptor_t * hd, int y, int x, GList * history, int current); -/* for repositioning of history dialog we should pass widget to this - * function, as position of history dialog depends on widget's position */ void history_show (history_descriptor_t * hd); /*** inline functions ****************************************************************************/ diff --git a/lib/widget/input.c b/lib/widget/input.c index ce3905dd1..143e09b95 100644 --- a/lib/widget/input.c +++ b/lib/widget/input.c @@ -49,6 +49,7 @@ #include "lib/keybind.h" /* global_keymap_t */ #include "lib/widget.h" #include "lib/event.h" /* mc_event_raise() */ +#include "lib/mcconfig.h" /* mc_config_history_*() */ #include "input_complete.h" @@ -842,7 +843,7 @@ input_load_history (const gchar * event_group_name, const gchar * event_name, (void) event_group_name; (void) event_name; - in->history.list = history_load (ev->cfg, in->history.name); + in->history.list = mc_config_history_load (ev->cfg, in->history.name); in->history.current = in->history.list; if (in->init_from_history) @@ -876,7 +877,7 @@ input_save_history (const gchar * event_group_name, const gchar * event_name, push_history (in, in->buffer); if (in->history.changed) - history_save (ev->cfg, in->history.name, in->history.list); + mc_config_history_save (ev->cfg, in->history.name, in->history.list); in->history.changed = FALSE; } diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c index 99e8de5a9..24bafab0f 100644 --- a/src/editor/editcmd.c +++ b/src/editor/editcmd.c @@ -2806,7 +2806,7 @@ edit_search_cmd (WEdit * edit, gboolean again) /* find last search string in history */ GList *history; - history = history_get (MC_HISTORY_SHARED_SEARCH); + history = mc_config_history_get (MC_HISTORY_SHARED_SEARCH); if (history != NULL && history->data != NULL) { edit->last_search_string = (char *) history->data; diff --git a/src/filemanager/panel.c b/src/filemanager/panel.c index 24a17f373..d8d84d1cf 100644 --- a/src/filemanager/panel.c +++ b/src/filemanager/panel.c @@ -1433,9 +1433,9 @@ panel_load_history (const gchar * event_group_name, const gchar * event_name, if (ev->receiver == NULL || ev->receiver == WIDGET (p)) { if (ev->cfg != NULL) - p->dir_history = history_load (ev->cfg, p->hist_name); + p->dir_history = mc_config_history_load (ev->cfg, p->hist_name); else - p->dir_history = history_get (p->hist_name); + p->dir_history = mc_config_history_get (p->hist_name); directory_history_add (p, p->cwd_vpath); } @@ -1459,7 +1459,7 @@ panel_save_history (const gchar * event_group_name, const gchar * event_name, { ev_history_load_save_t *ev = (ev_history_load_save_t *) data; - history_save (ev->cfg, p->hist_name, p->dir_history); + mc_config_history_save (ev->cfg, p->hist_name, p->dir_history); } return TRUE; diff --git a/src/setup.c b/src/setup.c index 0b6f2f699..277b8363a 100644 --- a/src/setup.c +++ b/src/setup.c @@ -36,7 +36,7 @@ #include "lib/tty/tty.h" #include "lib/tty/key.h" -#include "lib/mcconfig.h" +#include "lib/mcconfig.h" /* num_history_items_recorded */ #include "lib/fileloc.h" #include "lib/timefmt.h" #include "lib/util.h" diff --git a/src/viewer/actions_cmd.c b/src/viewer/actions_cmd.c index e3bd3abeb..1ecce4e72 100644 --- a/src/viewer/actions_cmd.c +++ b/src/viewer/actions_cmd.c @@ -58,6 +58,7 @@ #include "lib/charsets.h" #endif #include "lib/event.h" /* mc_event_raise() */ +#include "lib/mcconfig.h" /* mc_config_history_get() */ #include "src/filemanager/layout.h" #include "src/filemanager/cmd.h" @@ -140,7 +141,7 @@ mcview_continue_search_cmd (WView * view) /* find last search string in history */ GList *history; - history = history_get (MC_HISTORY_SHARED_SEARCH); + history = mc_config_history_get (MC_HISTORY_SHARED_SEARCH); if (history != NULL && history->data != NULL) { view->last_search_string = (gchar *) g_strdup (history->data); From 02f49a8f6dd16b5b0f255ba4da3bcc684429ee4e Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sat, 10 Aug 2019 10:40:21 +0300 Subject: [PATCH 09/35] src/subshell/proxyfunc.c: fix up includes. Signed-off-by: Andrew Borodin --- src/subshell/proxyfunc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/subshell/proxyfunc.c b/src/subshell/proxyfunc.c index 258be4bd2..74fe4eeed 100644 --- a/src/subshell/proxyfunc.c +++ b/src/subshell/proxyfunc.c @@ -24,10 +24,12 @@ */ #include -#include + +#include /* kill() */ +#include +#include /* waitpid() */ #include "lib/global.h" -#include "lib/widget.h" #include "src/setup.h" /* quit */ #include "src/filemanager/midnight.h" /* current_panel */ From 247af01a8e7c24f8bc34e7a19807ccdff6f065e5 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sat, 10 Aug 2019 11:57:31 +0300 Subject: [PATCH 10/35] (toggle_panels): join with view_other_cmd and rename to toggle_subshell. Signed-off-by: Andrew Borodin --- lib/global.h | 2 +- src/diffviewer/ydiff.c | 5 +++-- src/editor/editwidget.c | 5 +++-- src/execute.c | 14 +++++++++++++- src/execute.h | 2 +- src/filemanager/cmd.c | 19 ------------------- src/filemanager/cmd.h | 1 - src/filemanager/midnight.c | 3 ++- src/viewer/actions_cmd.c | 3 +-- 9 files changed, 24 insertions(+), 30 deletions(-) diff --git a/lib/global.h b/lib/global.h index 4653be32b..2d12cb1e7 100644 --- a/lib/global.h +++ b/lib/global.h @@ -253,7 +253,7 @@ typedef struct #endif /* !ENABLE_SUBSHELL */ /* This flag is set by xterm detection routine in function main() */ - /* It is used by function view_other_cmd() */ + /* It is used by function toggle_subshell() */ gboolean xterm_flag; /* disable x11 support */ diff --git a/src/diffviewer/ydiff.c b/src/diffviewer/ydiff.c index fb7fb2851..b2d06cfd8 100644 --- a/src/diffviewer/ydiff.c +++ b/src/diffviewer/ydiff.c @@ -50,10 +50,11 @@ #endif #include "lib/event.h" /* mc_event_raise() */ -#include "src/filemanager/cmd.h" /* edit_file_at_line(), view_other_cmd() */ +#include "src/filemanager/cmd.h" /* edit_file_at_line() */ #include "src/filemanager/panel.h" #include "src/filemanager/layout.h" /* Needed for get_current_index and get_other_panel */ +#include "src/execute.h" /* toggle_subshell() */ #include "src/keybind-defaults.h" #include "src/setup.h" #include "src/history.h" @@ -3253,7 +3254,7 @@ dview_execute_cmd (WDiff * dview, long command) dview->skip_cols = 0; break; case CK_Shell: - view_other_cmd (); + toggle_subshell (); break; case CK_Quit: dview->view_quit = TRUE; diff --git a/src/editor/editwidget.c b/src/editor/editwidget.c index 04461476d..65f9874fc 100644 --- a/src/editor/editwidget.c +++ b/src/editor/editwidget.c @@ -57,7 +57,8 @@ #include "src/keybind-defaults.h" /* keybind_lookup_keymap_command() */ #include "src/setup.h" /* home_dir */ -#include "src/filemanager/cmd.h" /* view_other_cmd(), save_setup_cmd() */ +#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 */ @@ -467,7 +468,7 @@ edit_dialog_command_execute (WDialog * h, long command) edit_refresh_cmd (); break; case CK_Shell: - view_other_cmd (); + toggle_subshell (); break; case CK_LearnKeys: learn_keys (); diff --git a/src/execute.c b/src/execute.c index 6afebe37a..cab598140 100644 --- a/src/execute.c +++ b/src/execute.c @@ -446,14 +446,26 @@ shell_execute (const char *command, int flags) /* --------------------------------------------------------------------------------------------- */ void -toggle_panels (void) +toggle_subshell (void) { + static gboolean message_flag = TRUE; + #ifdef ENABLE_SUBSHELL vfs_path_t *new_dir_vpath = NULL; #endif /* ENABLE_SUBSHELL */ SIG_ATOMIC_VOLATILE_T was_sigwinch = 0; + if (!(mc_global.tty.xterm_flag || mc_global.tty.console_flag != '\0' + || mc_global.tty.use_subshell || output_starts_shell)) + { + if (message_flag) + message (D_ERROR, MSG_ERROR, + _("Not an xterm or Linux console;\nthe panels cannot be toggled.")); + message_flag = FALSE; + return; + } + channels_down (); disable_mouse (); disable_bracketed_paste (); diff --git a/src/execute.h b/src/execute.h index 56d24c546..a326806df 100644 --- a/src/execute.h +++ b/src/execute.h @@ -32,7 +32,7 @@ extern int pause_after_run; void shell_execute (const char *command, int flags); /* Handle toggling panels by Ctrl-O */ -void toggle_panels (void); +void toggle_subshell (void); /* Handle toggling panels by Ctrl-Z */ gboolean execute_suspend (const gchar * event_group_name, const gchar * event_name, diff --git a/src/filemanager/cmd.c b/src/filemanager/cmd.c index 87b092f71..5076875a6 100644 --- a/src/filemanager/cmd.c +++ b/src/filemanager/cmd.c @@ -1204,25 +1204,6 @@ swap_cmd (void) /* --------------------------------------------------------------------------------------------- */ -void -view_other_cmd (void) -{ - static gboolean message_flag = TRUE; - - if (mc_global.tty.xterm_flag || mc_global.tty.console_flag != '\0' - || mc_global.tty.use_subshell || output_starts_shell) - toggle_panels (); - else - { - if (message_flag) - message (D_ERROR, MSG_ERROR, - _("Not an xterm or Linux console;\nthe panels cannot be toggled.")); - message_flag = FALSE; - } -} - -/* --------------------------------------------------------------------------------------------- */ - void link_cmd (link_type_t link_type) { diff --git a/src/filemanager/cmd.h b/src/filemanager/cmd.h index 072234d06..20e9f191f 100644 --- a/src/filemanager/cmd.h +++ b/src/filemanager/cmd.h @@ -80,7 +80,6 @@ void panel_tree_cmd (void); void link_cmd (link_type_t link_type); void edit_symlink_cmd (void); void swap_cmd (void); -void view_other_cmd (void); void quick_cd_cmd (void); void save_setup_cmd (void); void user_file_menu_cmd (void); diff --git a/src/filemanager/midnight.c b/src/filemanager/midnight.c index 84ea82f5b..395c93c58 100644 --- a/src/filemanager/midnight.c +++ b/src/filemanager/midnight.c @@ -58,6 +58,7 @@ #ifdef ENABLE_SUBSHELL #include "src/subshell/subshell.h" #endif +#include "src/execute.h" /* toggle_subshell */ #include "src/setup.h" /* variables */ #include "src/learn.h" /* learn_keys() */ #include "src/keybind-defaults.h" @@ -1367,7 +1368,7 @@ midnight_execute_cmd (Widget * sender, long command) res = send_message (current_panel, midnight_dlg, MSG_ACTION, command, NULL); break; case CK_Shell: - view_other_cmd (); + toggle_subshell (); break; case CK_DirSize: smart_dirsize_cmd (); diff --git a/src/viewer/actions_cmd.c b/src/viewer/actions_cmd.c index 1ecce4e72..59f180f9e 100644 --- a/src/viewer/actions_cmd.c +++ b/src/viewer/actions_cmd.c @@ -61,7 +61,6 @@ #include "lib/mcconfig.h" /* mc_config_history_get() */ #include "src/filemanager/layout.h" -#include "src/filemanager/cmd.h" #include "src/filemanager/midnight.h" /* current_panel */ #include "src/filemanager/ext.h" /* regex_command_for() */ @@ -538,7 +537,7 @@ mcview_execute_cmd (WView * view, long command) mcview_moveto_bottom (view); break; case CK_Shell: - view_other_cmd (); + toggle_subshell (); break; case CK_Ruler: mcview_display_toggle_ruler (view); From 35d259089342f9f35c8ff348c9bd5e0a48f14427 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 11 Aug 2019 19:18:43 +0300 Subject: [PATCH 11/35] (create_file_manager): clarufy value of hint transparency. --- src/filemanager/midnight.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/filemanager/midnight.c b/src/filemanager/midnight.c index 395c93c58..dec82e916 100644 --- a/src/filemanager/midnight.c +++ b/src/filemanager/midnight.c @@ -931,7 +931,7 @@ create_file_manager (void) add_widget (midnight_dlg, get_panel_widget (1)); the_hint = label_new (0, 0, 0); - the_hint->transparent = 1; + the_hint->transparent = TRUE; the_hint->auto_adjust_cols = 0; WIDGET (the_hint)->cols = COLS; add_widget (midnight_dlg, the_hint); From 9c0c2b77af4c150210e63e239ecbe14a0243b266 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Tue, 13 Aug 2019 16:47:36 +0300 Subject: [PATCH 12/35] Document alternate_plus_minus option. Signed-off-by: Andrew Borodin --- doc/man/mc.1.in | 4 ++++ doc/man/ru/mc.1.in | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/doc/man/mc.1.in b/doc/man/mc.1.in index c2d7257d6..cfc34e0ab 100644 --- a/doc/man/mc.1.in +++ b/doc/man/mc.1.in @@ -4120,6 +4120,10 @@ don't need to quote those characters in the middle of the command line. On the other hand, you cannot use them to change selection when the command line is not empty. .TP +.I alternate_plus_minus +If true, use '+', '\-', '\\' and '*' keys normally. For select/unselect, +use 'M\-+', 'M\--' and 'M\-*'. +.TP .I show_output_starts_shell This variable only works if you are not using the subshell support. When you use the C\-o keystroke to go back to the user screen, if this diff --git a/doc/man/ru/mc.1.in b/doc/man/ru/mc.1.in index bf1403018..547b8fdfb 100644 --- a/doc/man/ru/mc.1.in +++ b/doc/man/ru/mc.1.in @@ -4482,6 +4482,12 @@ router). Эта опция работает только в том случае, использовать эти символы для таких операций, если командная строка не пуста. .PP +.I alternate_plus_minus +.IP +Если установлена, символы '+', '\-', '\\' and '*' обрабатываются обычным образом. +Чтобы выбрать файлы, отменить или инвертировать выбор, используйте 'M\-+', 'M\--' +и 'M\-*' соответственно. +.PP .I show_output_starts_shell .IP Эта переменная работает только в том случае, когда не включена поддержка From 2b55c54efc8a274967f4f20e6c2574f4e3f9a3fd Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Wed, 14 Aug 2019 11:37:50 +0300 Subject: [PATCH 13/35] Menubar is always on top line of screen. Signed-off-by: Andrew Borodin --- lib/widget/menu.c | 5 +++-- lib/widget/menu.h | 2 +- src/editor/editwidget.c | 2 +- src/filemanager/midnight.c | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/widget/menu.c b/lib/widget/menu.c index 95127260b..e75f0738e 100644 --- a/lib/widget/menu.c +++ b/lib/widget/menu.c @@ -935,14 +935,15 @@ destroy_menu (menu_t * menu) /* --------------------------------------------------------------------------------------------- */ WMenuBar * -menubar_new (int y, int x, int cols, GList * menu, gboolean visible) +menubar_new (GList * menu, gboolean visible) { WMenuBar *menubar; Widget *w; menubar = g_new0 (WMenuBar, 1); w = WIDGET (menubar); - widget_init (w, y, x, 1, cols, menubar_callback, menubar_mouse_callback); + widget_init (w, 0, 0, 1, COLS, menubar_callback, menubar_mouse_callback); + w->pos_flags = WPOS_KEEP_HORZ | WPOS_KEEP_TOP; /* initially, menubar is not selectable */ widget_set_options (w, WOP_SELECTABLE, FALSE); w->options |= WOP_TOP_SELECT; diff --git a/lib/widget/menu.h b/lib/widget/menu.h index 5d9323517..c522a16c8 100644 --- a/lib/widget/menu.h +++ b/lib/widget/menu.h @@ -48,7 +48,7 @@ menu_t *create_menu (const char *name, GList * entries, const char *help_node); void menu_set_name (menu_t * menu, const char *name); void destroy_menu (menu_t * menu); -WMenuBar *menubar_new (int y, int x, int cols, GList * menu, gboolean visible); +WMenuBar *menubar_new (GList * menu, gboolean visible); void menubar_set_menu (WMenuBar * menubar, GList * menu); void menubar_add_menu (WMenuBar * menubar, menu_t * menu); void menubar_arrange (WMenuBar * menubar); diff --git a/src/editor/editwidget.c b/src/editor/editwidget.c index 65f9874fc..33b902f78 100644 --- a/src/editor/editwidget.c +++ b/src/editor/editwidget.c @@ -1251,7 +1251,7 @@ edit_files (const GList * files) edit_dlg->get_shortcut = edit_get_shortcut; edit_dlg->get_title = edit_get_title; - menubar = menubar_new (0, 0, COLS, NULL, TRUE); + menubar = menubar_new (NULL, TRUE); add_widget (edit_dlg, menubar); edit_init_menu (menubar); diff --git a/src/filemanager/midnight.c b/src/filemanager/midnight.c index dec82e916..8da538d8b 100644 --- a/src/filemanager/midnight.c +++ b/src/filemanager/midnight.c @@ -922,7 +922,7 @@ create_file_manager (void) /* allow rebind tab */ widget_want_tab (WIDGET (midnight_dlg), TRUE); - the_menubar = menubar_new (0, 0, COLS, NULL, menubar_visible); + the_menubar = menubar_new (NULL, menubar_visible); add_widget (midnight_dlg, the_menubar); init_menu (); From f6c4ae2f31a348dd3c7cc7955719524033aa8fb4 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Wed, 14 Aug 2019 11:39:08 +0300 Subject: [PATCH 14/35] (setup_panels): refactoring: optimization ..,and change order of widget origin/size calculation. Signed-off-by: Andrew Borodin --- src/filemanager/layout.c | 73 +++++++++++++++++++++++++++------------- 1 file changed, 49 insertions(+), 24 deletions(-) diff --git a/src/filemanager/layout.c b/src/filemanager/layout.c index a4c9d09da..63e5dd17e 100644 --- a/src/filemanager/layout.c +++ b/src/filemanager/layout.c @@ -711,17 +711,47 @@ panel_update_cols (Widget * widget, panel_display_t frame_size) void setup_panels (void) { + /* File manager screen layout: + * + * +---------------------------------------------------------------+ + * | Menu bar | + * +-------------------------------+-------------------------------+ + * | | | + * | | | + * | | | + * | | | + * | Left panel | Right panel | + * | | | + * | | | + * | | | + * | | | + * +-------------------------------+-------------------------------+ + * | Hint (message) bar | + * +---------------------------------------------------------------+ + * | | + * | Console content | + * | | + * +--------+------------------------------------------------------+ + * | Prompt | Command line | + * | Key (button) bar | + * +--------+------------------------------------------------------+ + */ + int start_y; + /* iniitial height of panels */ + height = + LINES - menubar_visible - mc_global.message_visible - (command_prompt ? 1 : 0) - + mc_global.keybar_visible; + if (mc_global.tty.console_flag != '\0') { int minimum; if (output_lines < 0) output_lines = 0; - height = - LINES - mc_global.keybar_visible - (command_prompt ? 1 : 0) - menubar_visible - - output_lines - mc_global.message_visible; + else + height -= output_lines; minimum = MINHEIGHT * (1 + panels_layout.horizontal_split); if (height < minimum) { @@ -729,12 +759,9 @@ setup_panels (void) height = minimum; } } - else - { - height = - LINES - menubar_visible - (command_prompt ? 1 : 0) - mc_global.keybar_visible - - mc_global.message_visible; - } + + widget_set_size (WIDGET (the_menubar), 0, 0, 1, COLS); + menubar_set_visible (the_menubar, menubar_visible); check_split (&panels_layout); start_y = menubar_visible; @@ -758,7 +785,19 @@ setup_panels (void) panels[1].widget->cols); } - widget_set_size (WIDGET (the_menubar), 0, 0, 1, COLS); + if (mc_global.message_visible) + widget_set_size (WIDGET (the_hint), height + start_y, 0, 1, COLS); + else + widget_set_size (WIDGET (the_hint), 0, 0, 0, 0); + + /* Output window */ + if (mc_global.tty.console_flag != '\0' && output_lines) + { + output_start_y = LINES - (command_prompt ? 1 : 0) - mc_global.keybar_visible - output_lines; + show_console_contents (output_start_y, + LINES - output_lines - mc_global.keybar_visible - 1, + LINES - mc_global.keybar_visible - 1); + } if (command_prompt) { @@ -776,20 +815,6 @@ setup_panels (void) widget_set_size (WIDGET (the_bar), LINES - 1, 0, mc_global.keybar_visible, COLS); buttonbar_set_visible (the_bar, mc_global.keybar_visible); - /* Output window */ - if (mc_global.tty.console_flag != '\0' && output_lines) - { - output_start_y = LINES - (command_prompt ? 1 : 0) - mc_global.keybar_visible - output_lines; - show_console_contents (output_start_y, - LINES - output_lines - mc_global.keybar_visible - 1, - LINES - mc_global.keybar_visible - 1); - } - - if (mc_global.message_visible) - widget_set_size (WIDGET (the_hint), height + start_y, 0, 1, COLS); - else - widget_set_size (WIDGET (the_hint), 0, 0, 0, 0); - update_xterm_title_path (); } From 297391fd6014f59562928015c7d8787afc1748e7 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Mon, 10 Oct 2016 10:20:27 +0300 Subject: [PATCH 15/35] (dlg_adjust_position): rename to widget_adjust_position and make public. Signed-off-by: Andrew Borodin --- lib/widget/dialog.c | 34 ++-------------------------------- lib/widget/widget-common.c | 30 ++++++++++++++++++++++++++++++ lib/widget/widget-common.h | 1 + 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/lib/widget/dialog.c b/lib/widget/dialog.c index 1273b67b4..ebfaedb0a 100644 --- a/lib/widget/dialog.c +++ b/lib/widget/dialog.c @@ -604,36 +604,6 @@ dlg_widget_set_position (gpointer data, gpointer user_data) widget_set_size (c, y, x, lines, cols); } -/* --------------------------------------------------------------------------------------------- */ - -static void -dlg_adjust_position (widget_pos_flags_t pos_flags, int *y, int *x, int *lines, int *cols) -{ - if ((pos_flags & WPOS_FULLSCREEN) != 0) - { - *y = 0; - *x = 0; - *lines = LINES; - *cols = COLS; - } - else - { - if ((pos_flags & WPOS_CENTER_HORZ) != 0) - *x = (COLS - *cols) / 2; - - if ((pos_flags & WPOS_CENTER_VERT) != 0) - *y = (LINES - *lines) / 2; - - if ((pos_flags & WPOS_TRYUP) != 0) - { - if (*y > 3) - *y -= 2; - else if (*y == 3) - *y = 2; - } - } -} - /* --------------------------------------------------------------------------------------------- */ /*** public functions ****************************************************************************/ /* --------------------------------------------------------------------------------------------- */ @@ -712,7 +682,7 @@ dlg_set_size (WDialog * h, int lines, int cols) { int x = 0, y = 0; - dlg_adjust_position (WIDGET (h)->pos_flags, &y, &x, &lines, &cols); + widget_adjust_position (WIDGET (h)->pos_flags, &y, &x, &lines, &cols); dlg_set_position (h, y, x, lines, cols); } @@ -771,7 +741,7 @@ dlg_create (gboolean modal, int y1, int x1, int lines, int cols, widget_pos_flag new_d = g_new0 (WDialog, 1); w = WIDGET (new_d); - dlg_adjust_position (pos_flags, &y1, &x1, &lines, &cols); + widget_adjust_position (pos_flags, &y1, &x1, &lines, &cols); widget_init (w, y1, x1, lines, cols, (callback != NULL) ? callback : dlg_default_callback, mouse_callback); w->pos_flags = pos_flags; diff --git a/lib/widget/widget-common.c b/lib/widget/widget-common.c index 5cb2dbff2..f1e263c16 100644 --- a/lib/widget/widget-common.c +++ b/lib/widget/widget-common.c @@ -329,6 +329,36 @@ widget_set_state (Widget * w, widget_state_t state, gboolean enable) /* --------------------------------------------------------------------------------------------- */ +void +widget_adjust_position (widget_pos_flags_t pos_flags, int *y, int *x, int *lines, int *cols) +{ + if ((pos_flags & WPOS_FULLSCREEN) != 0) + { + *y = 0; + *x = 0; + *lines = LINES; + *cols = COLS; + } + else + { + if ((pos_flags & WPOS_CENTER_HORZ) != 0) + *x = (COLS - *cols) / 2; + + if ((pos_flags & WPOS_CENTER_VERT) != 0) + *y = (LINES - *lines) / 2; + + if ((pos_flags & WPOS_TRYUP) != 0) + { + if (*y > 3) + *y -= 2; + else if (*y == 3) + *y = 2; + } + } +} + +/* --------------------------------------------------------------------------------------------- */ + void widget_set_size (Widget * widget, int y, int x, int lines, int cols) { diff --git a/lib/widget/widget-common.h b/lib/widget/widget-common.h index 936d3fa55..5ce18ad57 100644 --- a/lib/widget/widget-common.h +++ b/lib/widget/widget-common.h @@ -180,6 +180,7 @@ cb_ret_t widget_default_callback (Widget * w, Widget * sender, widget_msg_t msg, void *data); void widget_set_options (Widget * w, widget_options_t options, gboolean enable); cb_ret_t widget_set_state (Widget * w, widget_state_t state, gboolean enable); +void widget_adjust_position (widget_pos_flags_t pos_flags, int *y, int *x, int *lines, int *cols); void widget_set_size (Widget * widget, int y, int x, int lines, int cols); /* select color for widget in dependance of state */ void widget_selectcolor (Widget * w, gboolean focused, gboolean hotkey); From 5ca0dbab010aaaadcf172968850600b89bb73b4f Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Mon, 10 Oct 2016 10:21:33 +0300 Subject: [PATCH 16/35] mcedit: refactoring of MSG_RESIZE handling. Signed-off-by: Andrew Borodin --- src/editor/editwidget.c | 56 ++++++++++++----------------------------- 1 file changed, 16 insertions(+), 40 deletions(-) diff --git a/src/editor/editwidget.c b/src/editor/editwidget.c index 33b902f78..461b03242 100644 --- a/src/editor/editwidget.c +++ b/src/editor/editwidget.c @@ -178,31 +178,6 @@ edit_help (void) mc_event_raise (MCEVENT_GROUP_CORE, "help", &event_data); } -/* --------------------------------------------------------------------------------------------- */ -/** - * Callback for the iteration of objects in the 'editors' array. - * Resize the editor window. - * - * @param data probably WEdit object - * @param user_data unused - */ - -static void -edit_dialog_resize_cb (void *data, void *user_data) -{ - Widget *w = WIDGET (data); - - (void) user_data; - - if (edit_widget_is_editor (w) && ((WEdit *) w)->fullscreen) - { - Widget *wh = WIDGET (w->owner); - - w->lines = wh->lines - 2; - w->cols = wh->cols; - } -} - /* --------------------------------------------------------------------------------------------- */ /** * Restore saved window size. @@ -771,8 +746,6 @@ edit_update_cursor (WEdit * edit, const mouse_event_t * event) static cb_ret_t edit_dialog_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data) { - WMenuBar *menubar; - WButtonBar *buttonbar; WDialog *h = DIALOG (w); switch (msg) @@ -788,15 +761,8 @@ edit_dialog_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, v return MSG_HANDLED; case MSG_RESIZE: - menubar = find_menubar (h); - buttonbar = find_buttonbar (h); - /* dlg_set_size() is surplus for this case */ - w->lines = LINES; - w->cols = COLS; - widget_set_size (WIDGET (buttonbar), w->lines - 1, w->x, 1, w->cols); - widget_set_size (WIDGET (menubar), w->y, w->x, 1, w->cols); - menubar_arrange (menubar); - g_list_foreach (h->widgets, (GFunc) edit_dialog_resize_cb, NULL); + dlg_default_callback (w, NULL, MSG_RESIZE, 0, NULL); + menubar_arrange (find_menubar (h)); return MSG_HANDLED; case MSG_ACTION: @@ -1222,6 +1188,7 @@ edit_files (const GList * files) static gboolean made_directory = FALSE; WDialog *edit_dlg; WMenuBar *menubar; + Widget *w; const GList *file; gboolean ok = FALSE; @@ -1252,10 +1219,12 @@ edit_files (const GList * files) edit_dlg->get_title = edit_get_title; menubar = menubar_new (NULL, TRUE); - add_widget (edit_dlg, menubar); + w = WIDGET (menubar); + add_widget_autopos (edit_dlg, w, w->pos_flags, NULL); edit_init_menu (menubar); - add_widget (edit_dlg, buttonbar_new (TRUE)); + w = WIDGET (buttonbar_new (TRUE)); + add_widget_autopos (edit_dlg, w, w->pos_flags, NULL); for (file = files; file != NULL; file = g_list_next (file)) { @@ -1381,7 +1350,7 @@ edit_add_window (WDialog * h, int y, int x, int lines, int cols, const vfs_path_ w->callback = edit_callback; w->mouse_callback = edit_mouse_callback; - add_widget (h, w); + add_widget_autopos (h, w, WPOS_KEEP_ALL, NULL); edit_set_buttonbar (edit, find_buttonbar (h)); dlg_redraw (h); @@ -1517,18 +1486,25 @@ edit_handle_move_resize (WEdit * edit, long command) void edit_toggle_fullscreen (WEdit * edit) { + Widget *w = WIDGET (edit); + edit->fullscreen = !edit->fullscreen; edit->force = REDRAW_COMPLETELY; if (!edit->fullscreen) + { edit_restore_size (edit); + /* do not follow screen size on resize */ + w->pos_flags = WPOS_KEEP_DEFAULT; + } else { - Widget *w = WIDGET (edit); Widget *h = WIDGET (w->owner); edit_save_size (edit); widget_set_size (w, h->y + 1, h->x, h->lines - 2, h->cols); + /* follow screen size on resize */ + w->pos_flags = WPOS_KEEP_ALL; edit->force |= REDRAW_PAGE; edit_update_screen (edit); } From 2ddd6b41a0124de9e5b24beb0750f39bffb86254 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Mon, 10 Oct 2016 10:41:11 +0300 Subject: [PATCH 17/35] mcviewer: refactoring of MSG_RESIZE handling. Signed-off-by: Andrew Borodin --- src/viewer/actions_cmd.c | 20 +++++--------------- src/viewer/mcviewer.c | 13 ++++++++----- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/src/viewer/actions_cmd.c b/src/viewer/actions_cmd.c index 59f180f9e..9c20daa2e 100644 --- a/src/viewer/actions_cmd.c +++ b/src/viewer/actions_cmd.c @@ -622,18 +622,8 @@ mcview_handle_key (WView * view, int key) /* --------------------------------------------------------------------------------------------- */ static inline void -mcview_adjust_size (WDialog * h) +mcview_resize (WView * view) { - WView *view; - WButtonBar *b; - - /* Look up the viewer and the buttonbar, we assume only two widgets here */ - view = (WView *) find_widget_type (h, mcview_callback); - b = find_buttonbar (h); - - widget_set_size (WIDGET (view), 0, 0, LINES - 1, COLS); - widget_set_size (WIDGET (b), LINES - 1, 0, 1, COLS); - view->dpy_wrap_dirty = TRUE; mcview_compute_areas (view); mcview_update_bytes_per_line (view); @@ -725,6 +715,10 @@ mcview_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void * mcview_update (view); return MSG_HANDLED; + case MSG_RESIZE: + mcview_resize (view); + return MSG_HANDLED; + case MSG_DESTROY: if (mcview_is_in_panel (view)) { @@ -773,10 +767,6 @@ mcview_dialog_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, switch (msg) { - case MSG_RESIZE: - mcview_adjust_size (h); - return MSG_HANDLED; - case MSG_ACTION: /* Handle shortcuts. */ diff --git a/src/viewer/mcviewer.c b/src/viewer/mcviewer.c index 5abab8944..6410e9d4f 100644 --- a/src/viewer/mcviewer.c +++ b/src/viewer/mcviewer.c @@ -234,16 +234,19 @@ mcview_viewer (const char *command, const vfs_path_t * file_vpath, int start_lin gboolean succeeded; WView *lc_mcview; WDialog *view_dlg; + Widget *vw, *b; /* 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, NULL, "[Internal File Viewer]", NULL); - widget_want_tab (WIDGET (view_dlg), TRUE); + vw = WIDGET (view_dlg); + widget_want_tab (vw, TRUE); - lc_mcview = mcview_new (0, 0, LINES - 1, COLS, FALSE); - add_widget (view_dlg, lc_mcview); + lc_mcview = mcview_new (vw->y, vw->x, vw->lines - 1, vw->cols, FALSE); + add_widget_autopos (view_dlg, lc_mcview, WPOS_KEEP_ALL, NULL); - add_widget (view_dlg, buttonbar_new (TRUE)); + b = WIDGET (buttonbar_new (TRUE)); + add_widget_autopos (view_dlg, b, b->pos_flags, NULL); view_dlg->get_title = mcview_get_title; @@ -256,7 +259,7 @@ mcview_viewer (const char *command, const vfs_path_t * file_vpath, int start_lin else dlg_stop (view_dlg); - if (widget_get_state (WIDGET (view_dlg), WST_CLOSED)) + if (widget_get_state (vw, WST_CLOSED)) dlg_destroy (view_dlg); return succeeded; From 6e4ea30fc3fa2795eb161b1d00228e631017d750 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Mon, 10 Oct 2016 10:59:13 +0300 Subject: [PATCH 18/35] diffviewer: refactoring of MSG_RESIZE handling. Signed-off-by: Andrew Borodin --- src/diffviewer/ydiff.c | 50 ++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 33 deletions(-) diff --git a/src/diffviewer/ydiff.c b/src/diffviewer/ydiff.c index b2d06cfd8..c53281788 100644 --- a/src/diffviewer/ydiff.c +++ b/src/diffviewer/ydiff.c @@ -2272,9 +2272,11 @@ dview_compute_split (WDiff * dview, int i) static void dview_compute_areas (WDiff * dview) { - dview->height = LINES - 2; - dview->half1 = COLS / 2; - dview->half2 = COLS - dview->half1; + Widget *w = WIDGET (dview); + + dview->height = w->lines - 1; + dview->half1 = w->cols / 2; + dview->half2 = w->cols - dview->half1; dview_compute_split (dview, 0); } @@ -3336,6 +3338,10 @@ dview_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d dview_update (dview); return i; + case MSG_RESIZE: + dview_compute_areas (dview); + return MSG_HANDLED; + case MSG_DESTROY: dview_save_options (dview); dview_fini (dview); @@ -3375,23 +3381,6 @@ dview_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event) /* --------------------------------------------------------------------------------------------- */ -static void -dview_adjust_size (WDialog * h) -{ - WDiff *dview; - WButtonBar *bar; - - /* Look up the viewer and the buttonbar, we assume only two widgets here */ - dview = (WDiff *) find_widget_type (h, dview_callback); - bar = find_buttonbar (h); - widget_set_size (WIDGET (dview), 0, 0, LINES - 1, COLS); - widget_set_size (WIDGET (bar), LINES - 1, 0, 1, COLS); - - dview_compute_areas (dview); -} - -/* --------------------------------------------------------------------------------------------- */ - static cb_ret_t dview_dialog_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data) { @@ -3400,10 +3389,6 @@ dview_dialog_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, switch (msg) { - case MSG_RESIZE: - dview_adjust_size (h); - return MSG_HANDLED; - case MSG_ACTION: /* Handle shortcuts. */ @@ -3458,33 +3443,32 @@ diff_view (const char *file1, const char *file2, const char *label1, const char WDiff *dview; Widget *w; WDialog *dview_dlg; + Widget *dw; /* Create dialog and widgets, put them on the dialog */ dview_dlg = dlg_create (FALSE, 0, 0, 1, 1, WPOS_FULLSCREEN, FALSE, NULL, dview_dialog_callback, NULL, "[Diff Viewer]", NULL); - widget_want_tab (WIDGET (dview_dlg), TRUE); + dw = WIDGET (dview_dlg); + widget_want_tab (dw, TRUE); dview = g_new0 (WDiff, 1); w = WIDGET (dview); - widget_init (w, 0, 0, LINES - 1, COLS, dview_callback, dview_mouse_callback); + widget_init (w, dw->y, dw->x, dw->lines - 1, dw->cols, dview_callback, dview_mouse_callback); w->options |= WOP_SELECTABLE; + add_widget_autopos (dview_dlg, w, WPOS_KEEP_ALL, NULL); - add_widget (dview_dlg, dview); - add_widget (dview_dlg, buttonbar_new (TRUE)); + w = WIDGET (buttonbar_new (TRUE)); + add_widget_autopos (dview_dlg, w, w->pos_flags, NULL); dview_dlg->get_title = dview_get_title; error = dview_init (dview, "-a", file1, file2, label1, label2, DATA_SRC_MEM); /* XXX binary diff? */ - /* Please note that if you add another widget, - * you have to modify dview_adjust_size to - * be aware of it - */ if (error == 0) dlg_run (dview_dlg); - if (error != 0 || widget_get_state (WIDGET (dview_dlg), WST_CLOSED)) + if (error != 0 || widget_get_state (dw, WST_CLOSED)) dlg_destroy (dview_dlg); return error == 0 ? 1 : 0; From 97bc63d7acee44ff2cc179dbc60a5fbac7ba2e6b Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Mon, 10 Oct 2016 12:56:56 +0300 Subject: [PATCH 19/35] File manager: refactoring of MSG_RESIZE handling. Signed-off-by: Andrew Borodin --- src/filemanager/layout.c | 91 ++++++++++++++++++++++---------------- src/filemanager/midnight.c | 4 +- 2 files changed, 53 insertions(+), 42 deletions(-) diff --git a/src/filemanager/layout.c b/src/filemanager/layout.c index 63e5dd17e..8bdd01acd 100644 --- a/src/filemanager/layout.c +++ b/src/filemanager/layout.c @@ -204,12 +204,14 @@ check_split (panels_layout_t * layout) } else { + int md_cols = CONST_WIDGET (midnight_dlg)->cols; + if (layout->vertical_equal) - layout->left_panel_size = COLS / 2; + layout->left_panel_size = md_cols / 2; else if (layout->left_panel_size < MINWIDTH) layout->left_panel_size = MINWIDTH; - else if (layout->left_panel_size > COLS - MINWIDTH) - layout->left_panel_size = COLS - MINWIDTH; + else if (layout->left_panel_size > md_cols - MINWIDTH) + layout->left_panel_size = md_cols - MINWIDTH; } } @@ -240,7 +242,7 @@ update_split (const WDialog * h) if (panels_layout.horizontal_split) tty_printf ("%03d", height - panels_layout.top_panel_size); else - tty_printf ("%03d", COLS - panels_layout.left_panel_size); + tty_printf ("%03d", CONST_WIDGET (midnight_dlg)->cols - panels_layout.left_panel_size); widget_move (h, 6, 12); tty_print_char ('='); @@ -331,6 +333,7 @@ layout_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void * case MSG_POST_KEY: { + const Widget *mw = CONST_WIDGET (midnight_dlg); int _menubar_visible, _command_prompt, _keybar_visible, _message_visible; _menubar_visible = check_options[1].widget->state; @@ -345,8 +348,8 @@ layout_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void * if (_output_lines < 0) _output_lines = 0; height = - LINES - _keybar_visible - _command_prompt - _menubar_visible - _output_lines - - _message_visible; + mw->lines - _keybar_visible - _command_prompt - _menubar_visible - + _output_lines - _message_visible; minimum = MINHEIGHT * (1 + panels_layout.horizontal_split); if (height < minimum) { @@ -356,8 +359,8 @@ layout_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void * } else height = - LINES - _keybar_visible - _command_prompt - _menubar_visible - _output_lines - - _message_visible; + mw->lines - _keybar_visible - _command_prompt - _menubar_visible - + _output_lines - _message_visible; if (old_output_lines != _output_lines) { @@ -388,7 +391,7 @@ layout_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void * { eq = panels_layout.vertical_equal; if (eq) - panels_layout.left_panel_size = COLS / 2; + panels_layout.left_panel_size = CONST_WIDGET (midnight_dlg)->cols / 2; } widget_disable (WIDGET (bleft_widget), eq); @@ -672,7 +675,8 @@ layout_box (void) void panel_update_cols (Widget * widget, panel_display_t frame_size) { - int cols, origin; + const Widget *mw = CONST_WIDGET (midnight_dlg); + int cols, x; /* don't touch panel if it is not in dialog yet */ /* if panel is not in dialog it is not in widgets list @@ -682,28 +686,28 @@ panel_update_cols (Widget * widget, panel_display_t frame_size) if (panels_layout.horizontal_split) { - widget->cols = COLS; + widget->cols = mw->cols; return; } if (frame_size == frame_full) { - cols = COLS; - origin = 0; + cols = mw->cols; + x = mw->x; } else if (widget == get_panel_widget (0)) { cols = panels_layout.left_panel_size; - origin = 0; + x = mw->x; } else { - cols = COLS - panels_layout.left_panel_size; - origin = panels_layout.left_panel_size; + cols = mw->cols - panels_layout.left_panel_size; + x = mw->x + panels_layout.left_panel_size; } widget->cols = cols; - widget->x = origin; + widget->x = x; } /* --------------------------------------------------------------------------------------------- */ @@ -737,11 +741,12 @@ setup_panels (void) * +--------+------------------------------------------------------+ */ + const Widget *mw = CONST_WIDGET (midnight_dlg); int start_y; /* iniitial height of panels */ height = - LINES - menubar_visible - mc_global.message_visible - (command_prompt ? 1 : 0) - + mw->lines - menubar_visible - mc_global.message_visible - (command_prompt ? 1 : 0) - mc_global.keybar_visible; if (mc_global.tty.console_flag != '\0') @@ -760,11 +765,11 @@ setup_panels (void) } } - widget_set_size (WIDGET (the_menubar), 0, 0, 1, COLS); + widget_set_size (WIDGET (the_menubar), mw->y, mw->x, 1, mw->cols); menubar_set_visible (the_menubar, menubar_visible); check_split (&panels_layout); - start_y = menubar_visible; + start_y = mw->y + menubar_visible; /* update columns first... */ panel_do_cols (0); @@ -773,30 +778,34 @@ setup_panels (void) /* ...then rows and origin */ if (panels_layout.horizontal_split) { - widget_set_size (panels[0].widget, start_y, 0, panels_layout.top_panel_size, - panels[0].widget->cols); - widget_set_size (panels[1].widget, start_y + panels_layout.top_panel_size, 0, - height - panels_layout.top_panel_size, panels[1].widget->cols); + widget_set_size (panels[0].widget, start_y, panels[0].widget->x, + panels_layout.top_panel_size, panels[0].widget->cols); + widget_set_size (panels[1].widget, start_y + panels_layout.top_panel_size, + panels[1].widget->x, height - panels_layout.top_panel_size, + panels[1].widget->cols); } else { - widget_set_size (panels[0].widget, start_y, 0, height, panels[0].widget->cols); + widget_set_size (panels[0].widget, start_y, panels[0].widget->x, height, + panels[0].widget->cols); widget_set_size (panels[1].widget, start_y, panels[1].widget->x, height, panels[1].widget->cols); } if (mc_global.message_visible) - widget_set_size (WIDGET (the_hint), height + start_y, 0, 1, COLS); + widget_set_size (WIDGET (the_hint), height + start_y, mw->x, 1, mw->cols); else + /* make invisible */ widget_set_size (WIDGET (the_hint), 0, 0, 0, 0); /* Output window */ if (mc_global.tty.console_flag != '\0' && output_lines) { - output_start_y = LINES - (command_prompt ? 1 : 0) - mc_global.keybar_visible - output_lines; + output_start_y = + mw->lines - (command_prompt ? 1 : 0) - mc_global.keybar_visible - output_lines; show_console_contents (output_start_y, - LINES - output_lines - mc_global.keybar_visible - 1, - LINES - mc_global.keybar_visible - 1); + mw->lines - output_lines - mc_global.keybar_visible - 1, + mw->lines - mc_global.keybar_visible - 1); } if (command_prompt) @@ -808,11 +817,12 @@ setup_panels (void) } else { + /* make invisible */ widget_set_size (WIDGET (cmdline), 0, 0, 0, 0); - widget_set_size (WIDGET (the_prompt), LINES, COLS, 0, 0); + widget_set_size (WIDGET (the_prompt), mw->lines, mw->cols, 0, 0); } - widget_set_size (WIDGET (the_bar), LINES - 1, 0, mc_global.keybar_visible, COLS); + widget_set_size (WIDGET (the_bar), mw->lines - 1, mw->x, mc_global.keybar_visible, mw->cols); buttonbar_set_visible (the_bar, mc_global.keybar_visible); update_xterm_title_path (); @@ -876,6 +886,7 @@ panels_split_less (void) void setup_cmdline (void) { + const Widget *mw = CONST_WIDGET (midnight_dlg); int prompt_width; int y; char *tmp_prompt = (char *) mc_prompt; @@ -891,11 +902,11 @@ setup_cmdline (void) prompt_width = str_term_width1 (tmp_prompt); /* Check for prompts too big */ - if (COLS > 8 && prompt_width > COLS - 8) + if (mw->cols > 8 && prompt_width > mw->cols - 8) { int prompt_len; - prompt_width = COLS - 8; + prompt_width = mw->cols - 8; prompt_len = str_offset_to_pos (tmp_prompt, prompt_width); tmp_prompt[prompt_len] = '\0'; } @@ -909,11 +920,11 @@ setup_cmdline (void) } #endif - y = LINES - 1 - mc_global.keybar_visible; + y = mw->lines - 1 - mc_global.keybar_visible; - widget_set_size (WIDGET (the_prompt), y, 0, 1, prompt_width); + widget_set_size (WIDGET (the_prompt), y, mw->x, 1, prompt_width); label_set_text (the_prompt, mc_prompt); - widget_set_size (WIDGET (cmdline), y, prompt_width, 1, COLS - prompt_width); + widget_set_size (WIDGET (cmdline), y, mw->x + prompt_width, 1, mw->cols - prompt_width); } /* --------------------------------------------------------------------------------------------- */ @@ -942,7 +953,7 @@ set_hintbar (const char *str) void rotate_dash (gboolean show) { - Widget *w = WIDGET (midnight_dlg); + const Widget *w = CONST_WIDGET (midnight_dlg); if (!nice_rotating_dash || (ok_to_refresh <= 0)) return; @@ -1034,14 +1045,16 @@ create_panel (int num, panel_view_mode_t type) if (old_type == view_listing && panel->frame_size == frame_full && type != view_listing) { + int md_cols = CONST_WIDGET (midnight_dlg)->cols; + if (panels_layout.horizontal_split) { - cols = COLS; + cols = md_cols; x = 0; } else { - cols = COLS - panels_layout.left_panel_size; + cols = md_cols - panels_layout.left_panel_size; if (num == 1) x = panels_layout.left_panel_size; } diff --git a/src/filemanager/midnight.c b/src/filemanager/midnight.c index 8da538d8b..b6d63ff80 100644 --- a/src/filemanager/midnight.c +++ b/src/filemanager/midnight.c @@ -1508,9 +1508,7 @@ midnight_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void return MSG_HANDLED; case MSG_RESIZE: - /* dlg_set_size() is surplus for this case */ - w->lines = LINES; - w->cols = COLS; + widget_adjust_position (w->pos_flags, &w->y, &w->x, &w->lines, &w->cols); setup_panels (); menubar_arrange (the_menubar); return MSG_HANDLED; From 07d2f117127364859effde9daa7325c0fc3eaa95 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sat, 17 Aug 2019 14:07:05 +0300 Subject: [PATCH 20/35] (save_panel_dir): minor refactoring. Signed-off-by: Andrew Borodin --- src/filemanager/layout.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/filemanager/layout.c b/src/filemanager/layout.c index 8bdd01acd..b884da969 100644 --- a/src/filemanager/layout.c +++ b/src/filemanager/layout.c @@ -1345,16 +1345,20 @@ get_other_type (void) void save_panel_dir (int idx) { - panel_view_mode_t type = get_panel_type (idx); - Widget *widget = get_panel_widget (idx); + panel_view_mode_t type; - if ((type == view_listing) && (widget != NULL)) + type = get_panel_type (idx); + if (type == view_listing) { - WPanel *w = PANEL (widget); + WPanel *p; - g_free (panels[idx].last_saved_dir); /* last path no needed */ - /* Because path can be nonlocal */ - panels[idx].last_saved_dir = g_strdup (vfs_path_as_str (w->cwd_vpath)); + p = PANEL (get_panel_widget (idx)); + if (p != NULL) + { + g_free (panels[idx].last_saved_dir); /* last path no needed */ + /* Because path can be nonlocal */ + panels[idx].last_saved_dir = g_strdup (vfs_path_as_str (p->cwd_vpath)); + } } } From 3b39cee81fe38a4ad6d0c3fb61b3f75bc738d4e3 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sat, 17 Aug 2019 14:07:43 +0300 Subject: [PATCH 21/35] src/filemanager/layout.c: fix coding style. Signed-off-by: Andrew Borodin --- src/filemanager/layout.c | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/src/filemanager/layout.c b/src/filemanager/layout.c index b884da969..d0921979f 100644 --- a/src/filemanager/layout.c +++ b/src/filemanager/layout.c @@ -341,7 +341,11 @@ layout_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void * _keybar_visible = check_options[3].widget->state; _message_visible = check_options[4].widget->state; - if (mc_global.tty.console_flag != '\0') + if (mc_global.tty.console_flag == '\0') + height = + mw->lines - _keybar_visible - _command_prompt - _menubar_visible - + _output_lines - _message_visible; + else { int minimum; @@ -357,10 +361,6 @@ layout_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void * height = minimum; } } - else - height = - mw->lines - _keybar_visible - _command_prompt - _menubar_visible - - _output_lines - _message_visible; if (old_output_lines != _output_lines) { @@ -375,7 +375,9 @@ layout_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void * case MSG_NOTIFY: if (sender == WIDGET (radio_widget)) { - if (panels_layout.horizontal_split != radio_widget->sel) + if (panels_layout.horizontal_split == radio_widget->sel) + update_split (h); + else { int eq; @@ -401,8 +403,6 @@ layout_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void * layout_change (); do_refresh (); } - else - update_split (h); return MSG_HANDLED; } @@ -980,11 +980,12 @@ rotate_dash (gboolean show) const char * get_nth_panel_name (int num) { - if (!num) + if (num == 0) return "New Left Panel"; - else if (num == 1) + + if (num == 1) return "New Right Panel"; - else + { static char buffer[BUF_SMALL]; @@ -1293,10 +1294,7 @@ get_panel_widget (int idx) int get_current_index (void) { - if (panels[0].widget == WIDGET (current_panel)) - return 0; - else - return 1; + return (panels[0].widget == WIDGET (current_panel) ? 0 : 1); } /* --------------------------------------------------------------------------------------------- */ @@ -1304,7 +1302,7 @@ get_current_index (void) int get_other_index (void) { - return !get_current_index (); + return (get_current_index () == 0 ? 1 : 0); } /* --------------------------------------------------------------------------------------------- */ @@ -1321,10 +1319,7 @@ get_other_panel (void) panel_view_mode_t get_current_type (void) { - if (panels[0].widget == WIDGET (current_panel)) - return panels[0].type; - else - return panels[1].type; + return (panels[0].widget == WIDGET (current_panel) ? panels[0].type : panels[1].type); } /* --------------------------------------------------------------------------------------------- */ @@ -1333,10 +1328,7 @@ get_current_type (void) panel_view_mode_t get_other_type (void) { - if (panels[0].widget == WIDGET (current_panel)) - return panels[1].type; - else - return panels[0].type; + return (panels[0].widget == WIDGET (current_panel) ? panels[1].type : panels[0].type); } /* --------------------------------------------------------------------------------------------- */ From f22353ed3dbb71222dabcea9614593b8aec874f4 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 18 Aug 2019 14:08:06 +0300 Subject: [PATCH 22/35] (tty_init): clarify screen size limitation. S_Lang: pre2.3.3-8 (55f58798c267d76a1b93d0d916027b71a10ac1ee): removed static buffers dependent upon SLTT_MAX_SCREEN_ROWS/COLS in favor of dynamically allocated arrays. Signed-off-by: Andrew Borodin --- lib/tty/tty-slang.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/tty/tty-slang.c b/lib/tty/tty-slang.c index cc1467983..533f606a8 100644 --- a/lib/tty/tty-slang.c +++ b/lib/tty/tty-slang.c @@ -282,10 +282,15 @@ tty_init (gboolean mouse_enable, gboolean is_xterm) * string such as "linux" or "xterm" S-Lang will go on, but the * terminal size and several other variables won't be initialized * (as of S-Lang 1.4.4). Detect it and abort. Also detect extremely - * small, large and negative screen dimensions. + * small screen dimensions. */ if ((COLS < 10) || (LINES < 5) - || (COLS > SLTT_MAX_SCREEN_COLS) || (LINES > SLTT_MAX_SCREEN_ROWS)) +#if SLANG_VERSION < 20303 + /* Beginning from pre2.3.3-8 (55f58798c267d76a1b93d0d916027b71a10ac1ee), + these limitations were eliminated. */ + || (COLS > SLTT_MAX_SCREEN_COLS) || (LINES > SLTT_MAX_SCREEN_ROWS) +#endif + ) { fprintf (stderr, _("Screen size %dx%d is not supported.\n" From eb2943aed20437b854861e04299602674b22a1af Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 18 Aug 2019 14:13:06 +0300 Subject: [PATCH 23/35] (tty_init): remove stuff that SLang_init_tty() already done. --- lib/tty/tty-slang.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/lib/tty/tty-slang.c b/lib/tty/tty-slang.c index 533f606a8..99372d046 100644 --- a/lib/tty/tty-slang.c +++ b/lib/tty/tty-slang.c @@ -305,23 +305,7 @@ tty_init (gboolean mouse_enable, gboolean is_xterm) if (mc_global.tty.ugly_line_drawing) SLtt_Has_Alt_Charset = 0; - /* If SLang uses fileno(stderr) for terminal input MC will hang - if we call SLang_getkey between calls to open_error_pipe and - close_error_pipe, e.g. when we do a growing view of an gzipped - file. */ - if (SLang_TT_Read_FD == fileno (stderr)) - SLang_TT_Read_FD = fileno (stdin); - - if (tcgetattr (SLang_TT_Read_FD, &new_mode) == 0) - { -#ifdef VDSUSP - new_mode.c_cc[VDSUSP] = NULL_VALUE; /* to ignore ^Y */ -#endif -#ifdef VLNEXT - new_mode.c_cc[VLNEXT] = NULL_VALUE; /* to ignore ^V */ -#endif - tcsetattr (SLang_TT_Read_FD, TCSADRAIN, &new_mode); - } + tcgetattr (SLang_TT_Read_FD, &new_mode); tty_reset_prog_mode (); load_terminfo_keys (); From 13597ebd671a83af3c0345dc5f86890650490bdc Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sat, 24 Aug 2019 17:12:13 +0300 Subject: [PATCH 24/35] lib/tty/tty-internal.h: fix typo. Signed-off-by: Andrew Borodin --- lib/tty/tty-internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tty/tty-internal.h b/lib/tty/tty-internal.h index 9bef67497..5b367f41a 100644 --- a/lib/tty/tty-internal.h +++ b/lib/tty/tty-internal.h @@ -1,6 +1,6 @@ /** \file tty-internal.h - * \brief Header: internal suff of the terminal controlling library + * \brief Header: internal stuff of the terminal controlling library */ #ifndef MC__TTY_INTERNAL_H From ea0fcc0fb8e97b3a37ad7dbd64d292febdd09c45 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sat, 24 Aug 2019 20:55:34 +0300 Subject: [PATCH 25/35] (handle_dirent): change parameters type from int* to gboolean*. (dir_list_load): change variable type and reduce scope. (dir_list_reload): likewise. Signed-off-by: Andrew Borodin --- src/filemanager/dir.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/filemanager/dir.c b/src/filemanager/dir.c index 6474aa2f2..8753991ae 100644 --- a/src/filemanager/dir.c +++ b/src/filemanager/dir.c @@ -147,11 +147,10 @@ clean_sort_keys (dir_list * list, int start, int count) */ static gboolean -handle_dirent (struct dirent *dp, const char *fltr, struct stat *buf1, int *link_to_dir, - int *stale_link) +handle_dirent (struct dirent *dp, const char *fltr, struct stat *buf1, gboolean * link_to_dir, + gboolean * stale_link) { vfs_path_t *vpath; - gboolean stale; if (DIR_IS_DOT (dp->d_name) || DIR_IS_DOTDOT (dp->d_name)) return FALSE; @@ -175,12 +174,11 @@ handle_dirent (struct dirent *dp, const char *fltr, struct stat *buf1, int *link tree_store_mark_checked (dp->d_name); /* A link to a file or a directory? */ - *link_to_dir = file_is_symlink_to_dir (vpath, buf1, &stale) ? 1 : 0; - *stale_link = stale ? 1 : 0; + *link_to_dir = file_is_symlink_to_dir (vpath, buf1, stale_link); vfs_path_free (vpath); - return (S_ISDIR (buf1->st_mode) || *link_to_dir != 0 || fltr == NULL + return (S_ISDIR (buf1->st_mode) || *link_to_dir || fltr == NULL || mc_search (fltr, NULL, dp->d_name, MC_SEARCH_T_GLOB)); } @@ -628,7 +626,6 @@ dir_list_load (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, { DIR *dirp; struct dirent *dp; - int link_to_dir, stale_link; struct stat st; file_entry_t *fentry; const char *vpath_str; @@ -657,10 +654,12 @@ dir_list_load (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, while ((dp = mc_readdir (dirp)) != NULL) { + gboolean link_to_dir, stale_link; + if (!handle_dirent (dp, fltr, &st, &link_to_dir, &stale_link)) continue; - if (!dir_list_append (list, dp->d_name, &st, link_to_dir != 0, stale_link != 0)) + if (!dir_list_append (list, dp->d_name, &st, link_to_dir, stale_link)) goto ret; if ((list->len & 31) == 0) @@ -696,7 +695,7 @@ dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, { DIR *dirp; struct dirent *dp; - int i, link_to_dir, stale_link; + int i; struct stat st; int marked_cnt; GHashTable *marked_files; @@ -769,11 +768,12 @@ dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, while ((dp = mc_readdir (dirp)) != NULL) { file_entry_t *fentry; + gboolean link_to_dir, stale_link; if (!handle_dirent (dp, fltr, &st, &link_to_dir, &stale_link)) continue; - if (!dir_list_append (list, dp->d_name, &st, link_to_dir != 0, stale_link != 0)) + if (!dir_list_append (list, dp->d_name, &st, link_to_dir, stale_link)) { mc_closedir (dirp); /* Norbert (Feb 12, 1997): From fcc8639169ea56444c2a706bff82aaea2262aa4a Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 25 Aug 2019 12:31:28 +0300 Subject: [PATCH 26/35] (handle_path): change parameters type from int* to gboolean*. (do_find): change variable type and reduce scope. (do_external_panelize): change variable type. Signed-off-by: Andrew Borodin --- src/filemanager/dir.c | 8 ++++---- src/filemanager/dir.h | 3 ++- src/filemanager/find.c | 6 +++--- src/filemanager/panelize.c | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/filemanager/dir.c b/src/filemanager/dir.c index 8753991ae..1d72cf1fe 100644 --- a/src/filemanager/dir.c +++ b/src/filemanager/dir.c @@ -583,7 +583,7 @@ dir_list_init (dir_list * list) /* Return values: FALSE = don't add, TRUE = add to the list */ gboolean -handle_path (const char *path, struct stat * buf1, int *link_to_dir, int *stale_link) +handle_path (const char *path, struct stat * buf1, gboolean * link_to_dir, gboolean * stale_link) { vfs_path_t *vpath; @@ -601,8 +601,8 @@ handle_path (const char *path, struct stat * buf1, int *link_to_dir, int *stale_ tree_store_mark_checked (path); /* A link to a file or a directory? */ - *link_to_dir = 0; - *stale_link = 0; + *link_to_dir = FALSE; + *stale_link = FALSE; if (S_ISLNK (buf1->st_mode)) { struct stat buf2; @@ -610,7 +610,7 @@ handle_path (const char *path, struct stat * buf1, int *link_to_dir, int *stale_ if (mc_stat (vpath, &buf2) == 0) *link_to_dir = S_ISDIR (buf2.st_mode) != 0; else - *stale_link = 1; + *stale_link = TRUE; } vfs_path_free (vpath); diff --git a/src/filemanager/dir.h b/src/filemanager/dir.h index f04065e68..b41b51fa7 100644 --- a/src/filemanager/dir.h +++ b/src/filemanager/dir.h @@ -56,7 +56,8 @@ void dir_list_sort (dir_list * list, GCompareFunc sort, const dir_sort_options_t gboolean dir_list_init (dir_list * list); void dir_list_clean (dir_list * list); void dir_list_free_list (dir_list * list); -gboolean handle_path (const char *path, struct stat *buf1, int *link_to_dir, int *stale_link); +gboolean handle_path (const char *path, struct stat *buf1, gboolean * link_to_dir, + gboolean * stale_link); /* Sorting functions */ int unsorted (file_entry_t * a, file_entry_t * b); diff --git a/src/filemanager/find.c b/src/filemanager/find.c index c66278e19..6cdfb5766 100644 --- a/src/filemanager/find.c +++ b/src/filemanager/find.c @@ -1773,7 +1773,6 @@ do_find (const char *start_dir, ssize_t start_dir_len, const char *ignore_dirs, if (return_value == B_PANELIZE && *filename) { - int link_to_dir, stale_link; int i; struct stat st; GList *entry; @@ -1790,6 +1789,7 @@ do_find (const char *start_dir, ssize_t start_dir_len, const char *ignore_dirs, WLEntry *le = LENTRY (entry->data); find_match_location_t *location = le->data; char *p; + gboolean link_to_dir, stale_link; if ((le->text == NULL) || (location == NULL) || (location->dir == NULL)) continue; @@ -1833,8 +1833,8 @@ do_find (const char *start_dir, ssize_t start_dir_len, const char *ignore_dirs, list->list[list->len].fnamelen = strlen (p); list->list[list->len].fname = g_strndup (p, list->list[list->len].fnamelen); list->list[list->len].f.marked = 0; - list->list[list->len].f.link_to_dir = link_to_dir; - list->list[list->len].f.stale_link = stale_link; + list->list[list->len].f.link_to_dir = link_to_dir ? 1 : 0; + list->list[list->len].f.stale_link = stale_link ? 1 : 0; list->list[list->len].f.dir_size_computed = 0; list->list[list->len].st = st; list->list[list->len].sort_key = NULL; diff --git a/src/filemanager/panelize.c b/src/filemanager/panelize.c index 0564d84c9..5ea782837 100644 --- a/src/filemanager/panelize.c +++ b/src/filemanager/panelize.c @@ -321,7 +321,7 @@ do_external_panelize (char *command) char line[MC_MAXPATHLEN]; size_t len; char *name; - int link_to_dir, stale_link; + gboolean link_to_dir, stale_link; struct stat st; clearerr (external); @@ -345,7 +345,7 @@ do_external_panelize (char *command) if (!handle_path (name, &st, &link_to_dir, &stale_link)) continue; - if (!dir_list_append (list, name, &st, link_to_dir != 0, stale_link != 0)) + if (!dir_list_append (list, name, &st, link_to_dir, stale_link)) break; file_mark (current_panel, list->len - 1, 0); From 8c5737f558484711539d3a8fe4186bdc06597375 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 25 Aug 2019 11:55:20 +0300 Subject: [PATCH 27/35] (dir_list_load): show error message outside of this function. (dir_list_reload): likewise. Signed-off-by: Andrew Borodin --- src/filemanager/dir.c | 27 +++++++++++++++------------ src/filemanager/dir.h | 8 ++++---- src/filemanager/panel.c | 16 ++++++++++------ src/viewer/actions_cmd.c | 39 ++++++++++++++++++++++++--------------- 4 files changed, 53 insertions(+), 37 deletions(-) diff --git a/src/filemanager/dir.c b/src/filemanager/dir.c index 1d72cf1fe..5ea72c6fb 100644 --- a/src/filemanager/dir.c +++ b/src/filemanager/dir.c @@ -42,7 +42,6 @@ #include "lib/fs.h" #include "lib/strutil.h" #include "lib/util.h" -#include "lib/widget.h" /* message() */ #include "src/setup.h" /* panels_options */ @@ -620,7 +619,7 @@ handle_path (const char *path, struct stat * buf1, gboolean * link_to_dir, gbool /* --------------------------------------------------------------------------------------------- */ -void +gboolean dir_list_load (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, const dir_sort_options_t * sort_op, const char *fltr) { @@ -629,10 +628,11 @@ dir_list_load (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, struct stat st; file_entry_t *fentry; const char *vpath_str; + gboolean ret = TRUE; /* ".." (if any) must be the first entry in the list */ if (!dir_list_init (list)) - return; + return FALSE; fentry = &list->list[0]; if (dir_get_dotdot_stat (vpath, &st)) @@ -640,10 +640,7 @@ dir_list_load (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, dirp = mc_opendir (vpath); if (dirp == NULL) - { - message (D_ERROR, MSG_ERROR, _("Cannot read directory contents")); - return; - } + return FALSE; tree_store_start_check (vpath); @@ -660,7 +657,10 @@ dir_list_load (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, continue; if (!dir_list_append (list, dp->d_name, &st, link_to_dir, stale_link)) + { + ret = FALSE; goto ret; + } if ((list->len & 31) == 0) rotate_dash (TRUE); @@ -672,6 +672,8 @@ dir_list_load (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, mc_closedir (dirp); tree_store_end_check (); rotate_dash (FALSE); + + return ret; } /* --------------------------------------------------------------------------------------------- */ @@ -689,7 +691,7 @@ if_link_is_exe (const vfs_path_t * full_name_vpath, const file_entry_t * file) /* --------------------------------------------------------------------------------------------- */ /** If fltr is null, then it is a match */ -void +gboolean dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, const dir_sort_options_t * sort_op, const char *fltr) { @@ -704,10 +706,9 @@ dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, dirp = mc_opendir (vpath); if (dirp == NULL) { - message (D_ERROR, MSG_ERROR, _("Cannot read directory contents")); dir_list_clean (list); dir_list_init (list); - return; + return FALSE; } tree_store_start_check (vpath); @@ -753,7 +754,7 @@ dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, if (!dir_list_init (list)) { dir_list_free_list (&dir_copy); - return; + return FALSE; } if (dir_get_dotdot_stat (vpath, &st)) @@ -788,7 +789,7 @@ dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, */ tree_store_end_check (); g_hash_table_destroy (marked_files); - return; + return FALSE; } fentry = &list->list[list->len - 1]; @@ -816,6 +817,8 @@ dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, dir_list_free_list (&dir_copy); rotate_dash (FALSE); + + return TRUE; } /* --------------------------------------------------------------------------------------------- */ diff --git a/src/filemanager/dir.h b/src/filemanager/dir.h index b41b51fa7..c82fabcb4 100644 --- a/src/filemanager/dir.h +++ b/src/filemanager/dir.h @@ -48,10 +48,10 @@ gboolean dir_list_grow (dir_list * list, int delta); gboolean dir_list_append (dir_list * list, const char *fname, const struct stat *st, gboolean link_to_dir, gboolean stale_link); -void dir_list_load (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, - const dir_sort_options_t * sort_op, const char *fltr); -void dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, - const dir_sort_options_t * sort_op, const char *fltr); +gboolean dir_list_load (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, + const dir_sort_options_t * sort_op, const char *fltr); +gboolean dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, + const dir_sort_options_t * sort_op, const char *fltr); void dir_list_sort (dir_list * list, GCompareFunc sort, const dir_sort_options_t * sort_op); gboolean dir_list_init (dir_list * list); void dir_list_clean (dir_list * list); diff --git a/src/filemanager/panel.c b/src/filemanager/panel.c index d8d84d1cf..29a9ee4c1 100644 --- a/src/filemanager/panel.c +++ b/src/filemanager/panel.c @@ -3277,8 +3277,10 @@ _do_panel_cd (WPanel * panel, const vfs_path_t * new_dir_vpath, enum cd_enum cd_ /* Reload current panel */ panel_clean_dir (panel); - dir_list_load (&panel->dir, panel->cwd_vpath, panel->sort_field->sort_routine, - &panel->sort_info, panel->filter); + if (!dir_list_load (&panel->dir, panel->cwd_vpath, panel->sort_field->sort_routine, + &panel->sort_info, panel->filter)) + message (D_ERROR, MSG_ERROR, _("Cannot read directory contents")); + try_to_select (panel, get_parent_dir_name (panel->cwd_vpath, olddir_vpath)); load_hint (FALSE); @@ -4364,8 +4366,9 @@ panel_sized_with_dir_new (const char *panel_name, int y, int x, int lines, int c } /* Load the default format */ - dir_list_load (&panel->dir, panel->cwd_vpath, panel->sort_field->sort_routine, - &panel->sort_info, panel->filter); + if (!dir_list_load (&panel->dir, panel->cwd_vpath, panel->sort_field->sort_routine, + &panel->sort_info, panel->filter)) + message (D_ERROR, MSG_ERROR, _("Cannot read directory contents")); /* Restore old right path */ if (curdir != NULL) @@ -4411,8 +4414,9 @@ panel_reload (WPanel * panel) memset (&(panel->dir_stat), 0, sizeof (panel->dir_stat)); show_dir (panel); - dir_list_reload (&panel->dir, panel->cwd_vpath, panel->sort_field->sort_routine, - &panel->sort_info, panel->filter); + if (!dir_list_reload (&panel->dir, panel->cwd_vpath, panel->sort_field->sort_routine, + &panel->sort_info, panel->filter)) + message (D_ERROR, MSG_ERROR, _("Cannot read directory contents")); panel->dirty = 1; if (panel->selected >= panel->dir.len) diff --git a/src/viewer/actions_cmd.c b/src/viewer/actions_cmd.c index 9c20daa2e..5a600ea55 100644 --- a/src/viewer/actions_cmd.c +++ b/src/viewer/actions_cmd.c @@ -300,30 +300,39 @@ mcview_load_next_prev_init (WView * view) /* TODO: check mtime of directory to reload it */ - const char *fname; - size_t fname_len; - int i; dir_sort_options_t sort_op = { FALSE, TRUE, FALSE }; /* load directory where requested file is */ view->dir = g_new0 (dir_list, 1); view->dir_idx = g_new (int, 1); - dir_list_load (view->dir, view->workdir_vpath, (GCompareFunc) sort_name, &sort_op, NULL); - - fname = x_basename (vfs_path_as_str (view->filename_vpath)); - fname_len = strlen (fname); - - /* search current file in the list */ - for (i = 0; i != view->dir->len; i++) + if (dir_list_load + (view->dir, view->workdir_vpath, (GCompareFunc) sort_name, &sort_op, NULL)) { - const file_entry_t *fe = &view->dir->list[i]; + const char *fname; + size_t fname_len; + int i; - if (fname_len == fe->fnamelen && strncmp (fname, fe->fname, fname_len) == 0) - break; + fname = x_basename (vfs_path_as_str (view->filename_vpath)); + fname_len = strlen (fname); + + /* search current file in the list */ + for (i = 0; i != view->dir->len; i++) + { + const file_entry_t *fe = &view->dir->list[i]; + + if (fname_len == fe->fnamelen && strncmp (fname, fe->fname, fname_len) == 0) + break; + } + + *view->dir_idx = i; + } + else + { + message (D_ERROR, MSG_ERROR, _("Cannot read directory contents")); + MC_PTR_FREE (view->dir); + MC_PTR_FREE (view->dir_idx); } - - *view->dir_idx = i; } } From 284c3de727a0ae6ff90c9f8467f4c51aed53cde9 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 25 Aug 2019 12:25:07 +0300 Subject: [PATCH 28/35] Add dir_list callback to visualize of directory reading. Signed-off-by: Andrew Borodin --- src/filemanager/dir.c | 20 +++++++++++++++++++- src/filemanager/dir.h | 11 +++++++++++ src/filemanager/panel.c | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/filemanager/dir.c b/src/filemanager/dir.c index 5ea72c6fb..dbd162811 100644 --- a/src/filemanager/dir.c +++ b/src/filemanager/dir.c @@ -72,7 +72,7 @@ static gboolean case_sensitive = OS_SORT_CASE_SENSITIVE_DEFAULT; /* Are the exec_bit files top in list */ static gboolean exec_first = TRUE; -static dir_list dir_copy = { NULL, 0, 0 }; +static dir_list dir_copy = { NULL, 0, 0, NULL }; /*** file scope functions ************************************************************************/ /* --------------------------------------------------------------------------------------------- */ @@ -638,6 +638,8 @@ dir_list_load (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, if (dir_get_dotdot_stat (vpath, &st)) fentry->st = st; + if (list->callback != NULL) + list->callback (DIR_OPEN, (void *) vpath); dirp = mc_opendir (vpath); if (dirp == NULL) return FALSE; @@ -653,6 +655,9 @@ dir_list_load (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, { gboolean link_to_dir, stale_link; + if (list->callback != NULL) + list->callback (DIR_READ, dp); + if (!handle_dirent (dp, fltr, &st, &link_to_dir, &stale_link)) continue; @@ -669,6 +674,8 @@ dir_list_load (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, dir_list_sort (list, sort, sort_op); ret: + if (list->callback != NULL) + list->callback (DIR_CLOSE, NULL); mc_closedir (dirp); tree_store_end_check (); rotate_dash (FALSE); @@ -703,6 +710,8 @@ dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, GHashTable *marked_files; const char *tmp_path; + if (list->callback != NULL) + list->callback (DIR_OPEN, (void *) vpath); dirp = mc_opendir (vpath); if (dirp == NULL) { @@ -771,11 +780,16 @@ dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, file_entry_t *fentry; gboolean link_to_dir, stale_link; + if (list->callback != NULL) + list->callback (DIR_READ, dp); + if (!handle_dirent (dp, fltr, &st, &link_to_dir, &stale_link)) continue; if (!dir_list_append (list, dp->d_name, &st, link_to_dir, stale_link)) { + if (list->callback != NULL) + list->callback (DIR_CLOSE, NULL); mc_closedir (dirp); /* Norbert (Feb 12, 1997): Just in case someone finds this memory leak: @@ -809,7 +823,11 @@ dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, if ((list->len & 15) == 0) rotate_dash (TRUE); } + + if (list->callback != NULL) + list->callback (DIR_CLOSE, NULL); mc_closedir (dirp); + tree_store_end_check (); g_hash_table_destroy (marked_files); diff --git a/src/filemanager/dir.h b/src/filemanager/dir.h index c82fabcb4..a159271f5 100644 --- a/src/filemanager/dir.h +++ b/src/filemanager/dir.h @@ -16,6 +16,16 @@ #define DIR_LIST_MIN_SIZE 128 #define DIR_LIST_RESIZE_STEP 128 +typedef enum +{ + DIR_OPEN = 0, + DIR_READ, + DIR_CLOSE +} dir_list_cb_state_t; + +/* dir_list callback */ +typedef void (*dir_list_cb_fn) (dir_list_cb_state_t state, void *data); + /*** enums ***************************************************************************************/ /*** structures declarations (and typedefs of structures)*****************************************/ @@ -28,6 +38,7 @@ typedef struct file_entry_t *list; /**< list of file_entry_t objects */ int size; /**< number of allocated elements in list (capacity) */ int len; /**< number of used elements in list */ + dir_list_cb_fn callback; /**< callback to visualize of directory read */ } dir_list; /** diff --git a/src/filemanager/panel.c b/src/filemanager/panel.c index 29a9ee4c1..6d56d09ce 100644 --- a/src/filemanager/panel.c +++ b/src/filemanager/panel.c @@ -85,7 +85,7 @@ hook_t *select_file_hook = NULL; /* *INDENT-OFF* */ -panelized_panel_t panelized_panel = { {NULL, 0, -1}, NULL }; +panelized_panel_t panelized_panel = { {NULL, 0, -1, NULL}, NULL }; /* *INDENT-ON* */ static const char *string_file_name (file_entry_t *, int); From 564351e1e508de4ced0aee30def4ed78fb8856f6 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 25 Aug 2019 12:47:58 +0300 Subject: [PATCH 29/35] Refactoring of directory read visualization. Use dir_list callback to show rotaing dash. Now src/filenamager/dir.c does not depend on the Widget subsystem. Signed-off-by: Andrew Borodin --- src/filemanager/dir.c | 9 --------- src/filemanager/panel.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/src/filemanager/dir.c b/src/filemanager/dir.c index dbd162811..f37f5d135 100644 --- a/src/filemanager/dir.c +++ b/src/filemanager/dir.c @@ -48,7 +48,6 @@ #include "treestore.h" #include "file.h" /* file_is_symlink_to_dir() */ #include "dir.h" -#include "layout.h" /* rotate_dash() */ /*** global variables ****************************************************************************/ @@ -666,9 +665,6 @@ dir_list_load (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, ret = FALSE; goto ret; } - - if ((list->len & 31) == 0) - rotate_dash (TRUE); } dir_list_sort (list, sort, sort_op); @@ -678,7 +674,6 @@ dir_list_load (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, list->callback (DIR_CLOSE, NULL); mc_closedir (dirp); tree_store_end_check (); - rotate_dash (FALSE); return ret; } @@ -819,9 +814,6 @@ dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, fentry->f.marked = 1; marked_cnt--; } - - if ((list->len & 15) == 0) - rotate_dash (TRUE); } if (list->callback != NULL) @@ -834,7 +826,6 @@ dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, dir_list_sort (list, sort, sort_op); dir_list_free_list (&dir_copy); - rotate_dash (FALSE); return TRUE; } diff --git a/src/filemanager/panel.c b/src/filemanager/panel.c index 6d56d09ce..e0b5e048a 100644 --- a/src/filemanager/panel.c +++ b/src/filemanager/panel.c @@ -4179,6 +4179,36 @@ panel_recursive_cd_to_parent (const vfs_path_t * vpath) return cwd_vpath; } +/* --------------------------------------------------------------------------------------------- */ + +static void +panel_dir_list_callback (dir_list_cb_state_t state, void *data) +{ + static int count = 0; + + (void) data; + + switch (state) + { + case DIR_OPEN: + count = 0; + break; + + case DIR_READ: + count++; + if ((count & 15) == 0) + rotate_dash (TRUE); + break; + + case DIR_CLOSE: + rotate_dash (FALSE); + break; + + default: + g_assert_not_reached (); + } +} + /* --------------------------------------------------------------------------------------------- */ /*** public functions ****************************************************************************/ /* --------------------------------------------------------------------------------------------- */ @@ -4270,6 +4300,7 @@ panel_sized_empty_new (const char *panel_name, int y, int x, int lines, int cols panel->dir.size = DIR_LIST_MIN_SIZE; panel->dir.list = g_new (file_entry_t, panel->dir.size); panel->dir.len = 0; + panel->dir.callback = panel_dir_list_callback; panel->list_cols = 1; panel->brief_cols = 2; From ef2931272b6f917e0a6faeaad824a99d5f584561 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 25 Aug 2019 13:45:20 +0300 Subject: [PATCH 30/35] (dir_list_load): get rid of goto. Signed-off-by: Andrew Borodin --- src/filemanager/dir.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/filemanager/dir.c b/src/filemanager/dir.c index f37f5d135..39a727eb1 100644 --- a/src/filemanager/dir.c +++ b/src/filemanager/dir.c @@ -650,7 +650,7 @@ dir_list_load (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, if (IS_PATH_SEP (vpath_str[0]) && vpath_str[1] == '\0') dir_list_clean (list); - while ((dp = mc_readdir (dirp)) != NULL) + while (ret && (dp = mc_readdir (dirp)) != NULL) { gboolean link_to_dir, stale_link; @@ -661,15 +661,12 @@ dir_list_load (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, continue; if (!dir_list_append (list, dp->d_name, &st, link_to_dir, stale_link)) - { ret = FALSE; - goto ret; - } } - dir_list_sort (list, sort, sort_op); + if (ret) + dir_list_sort (list, sort, sort_op); - ret: if (list->callback != NULL) list->callback (DIR_CLOSE, NULL); mc_closedir (dirp); From ef085af3acdc24e00dc6c4cdb55ce5981235362f Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 25 Aug 2019 13:56:19 +0300 Subject: [PATCH 31/35] (dir_list_reload): refactoring. Signed-off-by: Andrew Borodin --- src/filemanager/dir.c | 57 ++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 36 deletions(-) diff --git a/src/filemanager/dir.c b/src/filemanager/dir.c index 39a727eb1..1781b4938 100644 --- a/src/filemanager/dir.c +++ b/src/filemanager/dir.c @@ -701,6 +701,7 @@ dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, int marked_cnt; GHashTable *marked_files; const char *tmp_path; + gboolean ret = TRUE; if (list->callback != NULL) list->callback (DIR_OPEN, (void *) vpath); @@ -767,9 +768,8 @@ dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, } } - while ((dp = mc_readdir (dirp)) != NULL) + while (ret && (dp = mc_readdir (dirp)) != NULL) { - file_entry_t *fentry; gboolean link_to_dir, stale_link; if (list->callback != NULL) @@ -779,52 +779,37 @@ dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, continue; if (!dir_list_append (list, dp->d_name, &st, link_to_dir, stale_link)) + ret = FALSE; + else { - if (list->callback != NULL) - list->callback (DIR_CLOSE, NULL); - mc_closedir (dirp); - /* Norbert (Feb 12, 1997): - Just in case someone finds this memory leak: - -1 means big trouble (at the moment no memory left), - I don't bother with further cleanup because if one gets to - this point he will have more problems than a few memory - leaks and because one 'dir_list_clean' would not be enough (and - because I don't want to spent the time to make it working, - IMHO it's not worthwhile). - dir_list_clean (&dir_copy); + file_entry_t *fentry; + + fentry = &list->list[list->len - 1]; + + /* + * If we have marked files in the copy, scan through the copy + * to find matching file. Decrease number of remaining marks if + * we copied one. */ - tree_store_end_check (); - g_hash_table_destroy (marked_files); - return FALSE; - } - fentry = &list->list[list->len - 1]; - - fentry->f.marked = 0; - - /* - * If we have marked files in the copy, scan through the copy - * to find matching file. Decrease number of remaining marks if - * we copied one. - */ - if (marked_cnt > 0 && g_hash_table_lookup (marked_files, dp->d_name) != NULL) - { - fentry->f.marked = 1; - marked_cnt--; + fentry->f.marked = (marked_cnt > 0 + && g_hash_table_lookup (marked_files, dp->d_name) != NULL); + if (fentry->f.marked) + marked_cnt--; } } + if (ret) + dir_list_sort (list, sort, sort_op); + if (list->callback != NULL) list->callback (DIR_CLOSE, NULL); mc_closedir (dirp); - tree_store_end_check (); + g_hash_table_destroy (marked_files); - - dir_list_sort (list, sort, sort_op); - dir_list_free_list (&dir_copy); - return TRUE; + return ret; } /* --------------------------------------------------------------------------------------------- */ From 2b982dc6dc74897e6fe9c4b071eacfae5c05890d Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 1 Sep 2019 19:58:06 +0300 Subject: [PATCH 32/35] tests: editcmd__edit_complete_word_cmd.c: override mc_refresh() ...after refactoring of SIGWINCH handling (37ffc024225fd2ef1016babf3cbbeabce4a32899). Replacing variable with pipe cause a timeout in original tty_got_winch() in this test and test fails. Use an empty replacement of mc_refresh(). Signed-off-by: Andrew Borodin --- tests/src/editor/editcmd__edit_complete_word_cmd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/src/editor/editcmd__edit_complete_word_cmd.c b/tests/src/editor/editcmd__edit_complete_word_cmd.c index 5d7cedd9d..758d1550b 100644 --- a/tests/src/editor/editcmd__edit_complete_word_cmd.c +++ b/tests/src/editor/editcmd__edit_complete_word_cmd.c @@ -45,6 +45,13 @@ static WEdit *test_edit; +/* --------------------------------------------------------------------------------------------- */ +/* @Mock */ +void +mc_refresh (void) +{ +} + /* --------------------------------------------------------------------------------------------- */ /* @Mock */ void From ba2ef0d876afc412c9900d722c1f942c45d2ed51 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 1 Sep 2019 20:05:28 +0300 Subject: [PATCH 33/35] Update po/*.po files. Signed-off-by: Andrew Borodin --- po/az.po | 33 +- po/be.po | 39 ++- po/bg.po | 39 ++- po/ca.po | 39 ++- po/cs.po | 39 ++- po/da.po | 39 ++- po/de.po | 39 ++- po/de_CH.po | 33 +- po/el.po | 35 ++- po/en_GB.po | 34 ++- po/eo.po | 39 ++- po/es.po | 39 ++- po/et.po | 39 ++- po/eu.po | 39 ++- po/fa.po | 34 ++- po/fi.po | 35 ++- po/fr.po | 39 ++- po/fr_CA.po | 33 +- po/gl.po | 39 ++- po/hr.po | 33 +- po/hu.po | 39 ++- po/ia.po | 34 ++- po/id.po | 35 ++- po/it.po | 39 ++- po/ja.po | 34 ++- po/ka.po | 34 ++- po/kk.po | 33 +- po/ko.po | 39 ++- po/lt.po | 35 ++- po/lv.po | 33 +- po/mc.pot | 863 +++++++++++++++++++++++++++------------------------- po/mn.po | 33 +- po/nb.po | 33 +- po/nl.po | 39 ++- po/pl.po | 39 ++- po/pt.po | 39 ++- po/pt_BR.po | 39 ++- po/ro.po | 39 ++- po/ru.po | 39 ++- po/sk.po | 39 ++- po/sl.po | 33 +- po/sr.po | 39 ++- po/sv.po | 39 ++- po/szl.po | 33 +- po/ta.po | 33 +- po/te.po | 33 +- po/tr.po | 39 ++- po/uk.po | 39 ++- po/vi.po | 33 +- po/wa.po | 33 +- po/zh_CN.po | 39 ++- po/zh_TW.po | 33 +- 52 files changed, 1787 insertions(+), 934 deletions(-) diff --git a/po/az.po b/po/az.po index 458ac4525..6111f2319 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Azerbaijani (http://www.transifex.com/mc/mc/language/az/)\n" @@ -459,6 +459,15 @@ msgstr "" msgid "The TERM environment variable is unset!\n" msgstr "TERM dəyişəni bildirilməyib!\n" +msgid "Cannot create pipe for SIGWINCH" +msgstr "" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1284,6 +1293,9 @@ msgstr "" msgid "&Close" msgstr "" +msgid "&History..." +msgstr "" + msgid "Save &as..." msgstr "" @@ -1712,6 +1724,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2261,11 +2278,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2328,9 +2340,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "" - msgid "Parameter" msgstr "" @@ -3198,6 +3207,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3423,6 +3435,9 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "" + msgid "User supplied format looks invalid, reverting to default." msgstr "" "İstifadəçi tərəfindən bildirlən şəkillandirmə düzgün deyil, əsasa keçirəm." diff --git a/po/be.po b/po/be.po index 16760f7be..7dff1199c 100644 --- a/po/be.po +++ b/po/be.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-06-16 17:59+0000\n" "Last-Translator: Yury V. Zaytsev \n" "Language-Team: Belarusian (http://www.transifex.com/mc/mc/language/be/)\n" @@ -491,6 +491,16 @@ msgstr "Shift" msgid "The TERM environment variable is unset!\n" msgstr "Зменную асяроддзя «TERM» не вызначылі!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Немагчыма стварыць паток каналу" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1374,6 +1384,10 @@ msgstr "Новы(&N)" msgid "&Close" msgstr "Закрыць(&C)" +#, fuzzy +msgid "&History..." +msgstr "Гісторыя" + msgid "Save &as..." msgstr "Захаваць як(&A)…" @@ -1810,6 +1824,13 @@ msgstr "Немагчыма атрымаць лакальную копію «%s» msgid "The shell is already running a command" msgstr "Абалонка ўжо выконвае загад" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"Гэта не xterm альбо кансоль Linux;\n" +"панэлі немагчыма выключыць." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Увядзіце «exit», каб вярнуцца ў Midnight Commander" @@ -2369,13 +2390,6 @@ msgstr "" "Каб выканаць загад, патрэбна, каб абедзве панэлі\n" "адлюстроўваліся спісамі" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"Гэта не xterm альбо кансоль Linux;\n" -"панэлі немагчыма выключыць." - #, c-format msgid "'%s' is not a symbolic link" msgstr "«%s» не з’яўляецца сімвалічнай спасылкай" @@ -2442,9 +2456,6 @@ msgstr "" "Немагчыма перайсці ў «%s»\n" "%s" -msgid "Cannot read directory contents" -msgstr "Немагчыма прачытаць змесціва каталога" - msgid "Parameter" msgstr "Параметр" @@ -3397,6 +3408,9 @@ msgstr "Памеры каталогаў(&I)" msgid "Command &history" msgstr "Гісторыя загадаў(&H)" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "Спіс каталогаў(&R)" @@ -3626,6 +3640,9 @@ msgstr "Не абіраць" msgid "Do you really want to execute?" msgstr "Сапраўды выканаць?" +msgid "Cannot read directory contents" +msgstr "Немагчыма прачытаць змесціва каталога" + msgid "User supplied format looks invalid, reverting to default." msgstr "Вяртаем да прадвызначанага: здаецца, карыстальнік падаў хібны фармат." diff --git a/po/bg.po b/po/bg.po index 85860b212..eb797f86c 100644 --- a/po/bg.po +++ b/po/bg.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Bulgarian (http://www.transifex.com/mc/mc/language/bg/)\n" @@ -487,6 +487,16 @@ msgstr "Shift" msgid "The TERM environment variable is unset!\n" msgstr "Променливата TERM не е установена!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Не могат да се създадат потоци на канала" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1357,6 +1367,10 @@ msgstr "&Нов" msgid "&Close" msgstr "&Затваряне" +#, fuzzy +msgid "&History..." +msgstr "История" + msgid "Save &as..." msgstr "Запис &като..." @@ -1793,6 +1807,13 @@ msgstr "Не може да се добие локално копие от %s" msgid "The shell is already running a command" msgstr "Обвивката вече изпълнява команда" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +" Не е xterm или Линукс конзола;\n" +"панелите не могат да бъдат показвани/скривани." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Напишете 'exit', за да се върнете в Midnight Commander-а" @@ -2352,13 +2373,6 @@ msgstr "" "Двата панела би трябвало да бъдат в\n" "списъчен режим, за да можете да използвате тази команда" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -" Не е xterm или Линукс конзола;\n" -"панелите не могат да бъдат показвани/скривани." - #, c-format msgid "'%s' is not a symbolic link" msgstr "'%s' не е символичен линк" @@ -2425,9 +2439,6 @@ msgstr "" "Не може да се chdir в \"%s\"\n" "%s" -msgid "Cannot read directory contents" -msgstr "Не може да се прочете съдържанието на директорията" - msgid "Parameter" msgstr "Параметър" @@ -3380,6 +3391,9 @@ msgstr "Показване на &размерите на директориит msgid "Command &history" msgstr "Командна &история" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "Списък за бърз достъп до дире&ктории" @@ -3605,6 +3619,9 @@ msgstr "Деселектиране" msgid "Do you really want to execute?" msgstr "Наистина ли искате на изпълните това?" +msgid "Cannot read directory contents" +msgstr "Не може да се прочете съдържанието на директорията" + msgid "User supplied format looks invalid, reverting to default." msgstr "Потребителският формат изглежда невалиден, връщам се към стандартния." diff --git a/po/ca.po b/po/ca.po index e382e87d4..6f2719b3b 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-24 14:13+0000\n" "Last-Translator: Antoni Bella Pérez \n" "Language-Team: Catalan (http://www.transifex.com/mc/mc/language/ca/)\n" @@ -493,6 +493,16 @@ msgstr "Maj" msgid "The TERM environment variable is unset!\n" msgstr "La variable d'entorn TERM no està definida!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "No s'han pogut crear fluxos de la canonada" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1382,6 +1392,10 @@ msgstr "&Nou" msgid "&Close" msgstr "Tan&ca" +#, fuzzy +msgid "&History..." +msgstr "Historial" + msgid "Save &as..." msgstr "Desa com &a..." @@ -1818,6 +1832,13 @@ msgstr "No s'ha pogut obtenir una còpia local de %s" msgid "The shell is already running a command" msgstr "La shell ja està executant una ordre" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"No feu servir ni xterm ni una consola Linux.\n" +"No podreu alternar entre els plafons." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Escriviu «exit» per tornar al Midnight Commander" @@ -2377,13 +2398,6 @@ msgstr "" "Ambdós plafons han d'estar en el mode de llistat\n" "per usar aquesta ordre" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"No feu servir ni xterm ni una consola Linux.\n" -"No podreu alternar entre els plafons." - #, c-format msgid "'%s' is not a symbolic link" msgstr "«%s» no és un enllaç simbòlic" @@ -2450,9 +2464,6 @@ msgstr "" "No s'ha pogut fer chdir a «%s»\n" "%s" -msgid "Cannot read directory contents" -msgstr "No s'ha pogut llegir el contingut del directori" - msgid "Parameter" msgstr "Paràmetre" @@ -3408,6 +3419,9 @@ msgstr "Mostra les m&ides dels directoris" msgid "Command &history" msgstr "&Historial de les ordres" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "Favorits dels di&rectoris" @@ -3633,6 +3647,9 @@ msgstr "No seleccionis" msgid "Do you really want to execute?" msgstr "Realment el voleu executar?" +msgid "Cannot read directory contents" +msgstr "No s'ha pogut llegir el contingut del directori" + msgid "User supplied format looks invalid, reverting to default." msgstr "" "El format facilitat per l'usuari sembla que no és vàlid, s'està tornant al " diff --git a/po/cs.po b/po/cs.po index 65ae14f48..b47008f06 100644 --- a/po/cs.po +++ b/po/cs.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-03 09:55+0000\n" "Last-Translator: Pavel Borecki \n" "Language-Team: Czech (http://www.transifex.com/mc/mc/language/cs/)\n" @@ -490,6 +490,16 @@ msgstr "Shift" msgid "The TERM environment variable is unset!\n" msgstr "Proměnná prostředí TERM není nastavena!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Nelze vytvořit sekvence příkazů (pipe streams)" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1373,6 +1383,10 @@ msgstr "&Nový" msgid "&Close" msgstr "&Zavřít" +#, fuzzy +msgid "&History..." +msgstr "Historie" + msgid "Save &as..." msgstr "Uložit j&ako…" @@ -1810,6 +1824,13 @@ msgstr "Nedaří se získat místní kopii souboru %s" msgid "The shell is already running a command" msgstr "V shellu je už spuštěný příkaz" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"Toto není xterm nebo linuxová konzola;\n" +"panely nelze přepnout." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Do Midnight Commander se vrátíte zadáním příkazu „exit“" @@ -2369,13 +2390,6 @@ msgstr "" "Pro použití tohoto příkazu je třeba, aby\n" "oba panely zobrazovaly seznam souborů" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"Toto není xterm nebo linuxová konzola;\n" -"panely nelze přepnout." - #, c-format msgid "'%s' is not a symbolic link" msgstr "„%s“ není symbolický odkaz" @@ -2444,9 +2458,6 @@ msgstr "" "Nedaří se přejít do složky „%s“\n" "%s" -msgid "Cannot read directory contents" -msgstr "Nedaří se načíst obsah složky" - msgid "Parameter" msgstr "Parametr" @@ -3405,6 +3416,9 @@ msgstr "Zobrazit velikost&i složek" msgid "Command &history" msgstr "&Historie příkazů" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "&Rychlý přístup ke složkám" @@ -3634,6 +3648,9 @@ msgstr "Zrušit výběr" msgid "Do you really want to execute?" msgstr "Opravdu chcete spustit?" +msgid "Cannot read directory contents" +msgstr "Nedaří se načíst obsah složky" + msgid "User supplied format looks invalid, reverting to default." msgstr "Chybný formát zadaný uživatelem, náhradně bude použit výchozí." diff --git a/po/da.po b/po/da.po index 7c63708a6..a37b732cb 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-04 17:03+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/mc/mc/language/da/)\n" @@ -488,6 +488,16 @@ msgstr "Skift" msgid "The TERM environment variable is unset!\n" msgstr "TERM-miljøvariabelen er ikke sat!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Kan ikke oprette datakanalstrømme" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1371,6 +1381,10 @@ msgstr "&Ny" msgid "&Close" msgstr "&Luk" +#, fuzzy +msgid "&History..." +msgstr "Historik" + msgid "Save &as..." msgstr "Gem &som..." @@ -1807,6 +1821,13 @@ msgstr "Kan ikke hente en lokal kopi af %s" msgid "The shell is already running a command" msgstr "Skallen kører allerede en kommando" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"Ikke en xterm eller Linuxkonsol;\n" +"panelerne kan ikke skiftes." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Skriv 'exit' for at vende tilbage til Midnight Commander" @@ -2367,13 +2388,6 @@ msgstr "" "Begge paneler skal være i listeformat\n" "for at bruge denne kommando" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"Ikke en xterm eller Linuxkonsol;\n" -"panelerne kan ikke skiftes." - #, c-format msgid "'%s' is not a symbolic link" msgstr "'%s' er ikke en symbolsk henvisning" @@ -2440,9 +2454,6 @@ msgstr "" "Kan ikke chdir til »%s«\n" "%s" -msgid "Cannot read directory contents" -msgstr "Kan ikke læse mappeindhold" - msgid "Parameter" msgstr "Parameter" @@ -3397,6 +3408,9 @@ msgstr "Vis &mappestørrelser" msgid "Command &history" msgstr "Kommando&historik" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "&Mappehotlist" @@ -3622,6 +3636,9 @@ msgstr "Fravælg" msgid "Do you really want to execute?" msgstr "Ønsker du virkelig at køre?" +msgid "Cannot read directory contents" +msgstr "Kan ikke læse mappeindhold" + msgid "User supplied format looks invalid, reverting to default." msgstr "Brugerdefineret format ser ugyldigt ud, bruger standard." diff --git a/po/de.po b/po/de.po index 36c495016..20e638c20 100644 --- a/po/de.po +++ b/po/de.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-04-20 21:08+0000\n" "Last-Translator: Mr.Update\n" "Language-Team: German (http://www.transifex.com/mc/mc/language/de/)\n" @@ -499,6 +499,16 @@ msgstr "Umschalt" msgid "The TERM environment variable is unset!\n" msgstr "Die TERM-Variable ist nicht gesetzt!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Kann Pipe-Stream nicht erstellen" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1388,6 +1398,10 @@ msgstr "&Neu" msgid "&Close" msgstr "&Schließen" +#, fuzzy +msgid "&History..." +msgstr "Chronik" + msgid "Save &as..." msgstr "Speichern &unter..." @@ -1824,6 +1838,13 @@ msgstr "Kann lokale Kopie von %s nicht erstellen" msgid "The shell is already running a command" msgstr "Die Shell führt bereits einen Befehl aus" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"Weder xterm noch Linux-Konsole;\n" +"die Panels können nicht ausgetauscht werden." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Geben Sie 'exit' ein, um zum Midnight Commander zurückzukehren" @@ -2382,13 +2403,6 @@ msgstr "" "Beide Panels sollten für diesen Befehl\n" "im Listenmodus sein" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"Weder xterm noch Linux-Konsole;\n" -"die Panels können nicht ausgetauscht werden." - #, c-format msgid "'%s' is not a symbolic link" msgstr "'%s' ist kein symbolischer Link" @@ -2455,9 +2469,6 @@ msgstr "" "Kann nicht ins Verzeichnis \"%s\" wechseln\n" "%s" -msgid "Cannot read directory contents" -msgstr "Kann Verzeichnis nicht lesen" - msgid "Parameter" msgstr "Parameter" @@ -3414,6 +3425,9 @@ msgstr "Verze&ichnisgrößen anzeigen" msgid "Command &history" msgstr "Befehlsc&hronik" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "Ve&rzeichnis-Hotlist" @@ -3639,6 +3653,9 @@ msgstr "Deselektieren" msgid "Do you really want to execute?" msgstr "Möchten Sie wirklich ausführen?" +msgid "Cannot read directory contents" +msgstr "Kann Verzeichnis nicht lesen" + msgid "User supplied format looks invalid, reverting to default." msgstr "Benutzerdefiniertes Format sieht ungültig aus, benutze Standard." diff --git a/po/de_CH.po b/po/de_CH.po index 60973d5b6..2425c3237 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2015-02-26 09:48+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/mc/" @@ -459,6 +459,15 @@ msgstr "" msgid "The TERM environment variable is unset!\n" msgstr "" +msgid "Cannot create pipe for SIGWINCH" +msgstr "" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1282,6 +1291,9 @@ msgstr "" msgid "&Close" msgstr "" +msgid "&History..." +msgstr "" + msgid "Save &as..." msgstr "" @@ -1710,6 +1722,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2259,11 +2276,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2326,9 +2338,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "" - msgid "Parameter" msgstr "" @@ -3196,6 +3205,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3421,6 +3433,9 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "" + msgid "User supplied format looks invalid, reverting to default." msgstr "" diff --git a/po/el.po b/po/el.po index 2b2e45cb3..51270fba1 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Greek (http://www.transifex.com/mc/mc/language/el/)\n" @@ -476,6 +476,16 @@ msgstr "Shift" msgid "The TERM environment variable is unset!\n" msgstr "" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Αδυναμία δημιουργία καταλόγου %s" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1312,6 +1322,10 @@ msgstr "&Νέο" msgid "&Close" msgstr "&Κλείσιμο" +#, fuzzy +msgid "&History..." +msgstr "Ιστορικό" + msgid "Save &as..." msgstr "Αποθήκευση &ως..." @@ -1742,6 +1756,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "Το κέλυφος τρέχει ήδη μια εντολή" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2295,11 +2314,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2366,9 +2380,6 @@ msgstr "" "Αδυναμία chdir σε \"%s\"\n" "%s" -msgid "Cannot read directory contents" -msgstr "Αδυναμία ανάγνωσης περιεχομένων καταλόγου" - msgid "Parameter" msgstr "Παράμετρος" @@ -3290,6 +3301,9 @@ msgstr "Εμ&φάνιση μεγεθών καταλόγων" msgid "Command &history" msgstr "&Ιστορικό εντολών" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3515,6 +3529,9 @@ msgstr "Αποεπιλογή" msgid "Do you really want to execute?" msgstr "Σίγουρα θέλετε να γίνει εκτέλεση;" +msgid "Cannot read directory contents" +msgstr "Αδυναμία ανάγνωσης περιεχομένων καταλόγου" + msgid "User supplied format looks invalid, reverting to default." msgstr "" diff --git a/po/en_GB.po b/po/en_GB.po index db63fc036..31aa0dd77 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/mc/mc/" @@ -469,6 +469,16 @@ msgstr "" msgid "The TERM environment variable is unset!\n" msgstr "" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Cannot create %s directory" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1292,6 +1302,9 @@ msgstr "" msgid "&Close" msgstr "" +msgid "&History..." +msgstr "" + msgid "Save &as..." msgstr "" @@ -1720,6 +1733,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2269,11 +2287,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2336,9 +2349,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "" - msgid "Parameter" msgstr "" @@ -3206,6 +3216,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3431,6 +3444,9 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "" + msgid "User supplied format looks invalid, reverting to default." msgstr "" diff --git a/po/eo.po b/po/eo.po index 9d9036063..edbf1c8e3 100644 --- a/po/eo.po +++ b/po/eo.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-06-01 18:41+0000\n" "Last-Translator: Keith Bowes \n" "Language-Team: Esperanto (http://www.transifex.com/mc/mc/language/eo/)\n" @@ -483,6 +483,16 @@ msgstr "Uskleca inversigilo" msgid "The TERM environment variable is unset!\n" msgstr "La medivariablo TERM ne estas valorizita!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Ne eblas krei duktajn fluojn" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1369,6 +1379,10 @@ msgstr "&Nova" msgid "&Close" msgstr "&Fermi" +#, fuzzy +msgid "&History..." +msgstr "Historio" + msgid "Save &as..." msgstr "K&onservi kiel..." @@ -1805,6 +1819,13 @@ msgstr "Ne eblas atingi lokan kopion de %s" msgid "The shell is already running a command" msgstr "La ŝelo jam plenumas komandon" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"Ne xterm-fenestron aŭ linuksan terminalon;\n" +"la flankojn oni ne povis inversigi." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Tajpu \"exit\" por reiri al Midnight Commander" @@ -2364,13 +2385,6 @@ msgstr "" "Ambaŭ flankoj estu en la lista reĝimo\n" "por uzi ĉi tiun komandon" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"Ne xterm-fenestron aŭ linuksan terminalon;\n" -"la flankojn oni ne povis inversigi." - #, c-format msgid "'%s' is not a symbolic link" msgstr "'%s' ne estas simbola ligilo" @@ -2437,9 +2451,6 @@ msgstr "" "Ne eblas ŝanĝi dosierujon al \"%s\"\n" "%s" -msgid "Cannot read directory contents" -msgstr "Ne eblas legi dosierujan enhavon" - msgid "Parameter" msgstr "Parametro" @@ -3394,6 +3405,9 @@ msgstr "Montri dosierujajn g&randojn" msgid "Command &history" msgstr "Komanda &historio" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "Dosieru&ja rapidolisto" @@ -3619,6 +3633,9 @@ msgstr "Malelekti" msgid "Do you really want to execute?" msgstr "Ĉu vi efekti volas plenumigi?" +msgid "Cannot read directory contents" +msgstr "Ne eblas legi dosierujan enhavon" + msgid "User supplied format looks invalid, reverting to default." msgstr "Uzanto havigita formato aspektas nevalide, restarigante la aprioran." diff --git a/po/es.po b/po/es.po index 123470545..0e9aa228e 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-05 09:31+0000\n" "Last-Translator: David Martin \n" "Language-Team: Spanish (http://www.transifex.com/mc/mc/language/es/)\n" @@ -486,6 +486,16 @@ msgstr "Mayús" msgid "The TERM environment variable is unset!\n" msgstr "¡La variable de entorno TERM está sin definir!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Imposible crear flujo de tubería" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1374,6 +1384,10 @@ msgstr "&Nuevo" msgid "&Close" msgstr "&Cerrar" +#, fuzzy +msgid "&History..." +msgstr "Historia" + msgid "Save &as..." msgstr "guar&Dar como..." @@ -1810,6 +1824,13 @@ msgstr "Imposible obtener una copia local de «%s»" msgid "The shell is already running a command" msgstr "El shell ya está ejecutando un comando" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"No se está usando ni xterm ni la consola Linux.\n" +"Los paneles no pueden ser ocultados." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Teclee «exit» para regresar a Midnight Commander" @@ -2369,13 +2390,6 @@ msgstr "" "Ambos paneles deben estar en\n" "modo listado para usar esta función" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"No se está usando ni xterm ni la consola Linux.\n" -"Los paneles no pueden ser ocultados." - #, c-format msgid "'%s' is not a symbolic link" msgstr "«%s» no es un enlace simbólico" @@ -2442,9 +2456,6 @@ msgstr "" "Imposible cambiar al directorio «%s»\n" "%s" -msgid "Cannot read directory contents" -msgstr "Imposible leer directorio" - msgid "Parameter" msgstr "Parámetro" @@ -3400,6 +3411,9 @@ msgstr "mostrar &Tamaños de los directorios" msgid "Command &history" msgstr "&Historia de órdenes" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "&Favoritos..." @@ -3625,6 +3639,9 @@ msgstr "De-seleccionar grupo" msgid "Do you really want to execute?" msgstr "¿Realmente quiere ejecutar?" +msgid "Cannot read directory contents" +msgstr "Imposible leer directorio" + msgid "User supplied format looks invalid, reverting to default." msgstr "Formato no parece válido. Recuperando el predeterminado." diff --git a/po/et.po b/po/et.po index 31ec96421..a6f654ed5 100644 --- a/po/et.po +++ b/po/et.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-05 18:33+0000\n" "Last-Translator: Kristjan Räts \n" "Language-Team: Estonian (http://www.transifex.com/mc/mc/language/et/)\n" @@ -484,6 +484,16 @@ msgstr "Klahv Shift" msgid "The TERM environment variable is unset!\n" msgstr "Keskkonnamuutujat TERM on määramata!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Nurjus toru voogude loomine" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1368,6 +1378,10 @@ msgstr "&Uus" msgid "&Close" msgstr "&Sulge" +#, fuzzy +msgid "&History..." +msgstr "Ajalugu" + msgid "Save &as..." msgstr "Salvesta &kui..." @@ -1803,6 +1817,13 @@ msgstr "Kohaliku koopia hankimine %s'st nurjus" msgid "The shell is already running a command" msgstr "Kest on hõivatud käsu täitmisega" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"Sa ei kasuta xtermi või Linuxi konsooli;\n" +"paneele ei saa kuvada/peita." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Midnight Commanderisse tagasipöördumiseks sisesta 'exit'" @@ -2361,13 +2382,6 @@ msgstr "" "Selle käsu kasutamiseks peaksid mõlemad\n" "paneelid kuvama failide loendit" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"Sa ei kasuta xtermi või Linuxi konsooli;\n" -"paneele ei saa kuvada/peita." - #, c-format msgid "'%s' is not a symbolic link" msgstr "\"%s\" ei ole nimeviit" @@ -2434,9 +2448,6 @@ msgstr "" "Kataloogi \"%s\" sisenemine nurjus\n" "%s" -msgid "Cannot read directory contents" -msgstr "Kataloogi sisu lugemine nurjus" - msgid "Parameter" msgstr "Parameeter" @@ -3390,6 +3401,9 @@ msgstr "Kuva kataloogide &suurused" msgid "Command &history" msgstr "Käskude a&jalugu" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "Katal&oogide kiirvalik" @@ -3615,6 +3629,9 @@ msgstr "Tühista valik" msgid "Do you really want to execute?" msgstr "Kas sa soovid tõesti käivitada?" +msgid "Cannot read directory contents" +msgstr "Kataloogi sisu lugemine nurjus" + msgid "User supplied format looks invalid, reverting to default." msgstr "Kasutaja antud vormindus tundub vigane; kasutatakse vaikeväärtust." diff --git a/po/eu.po b/po/eu.po index 30f7bf678..15c9be463 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-05-01 13:39+0000\n" "Last-Translator: Iñigo Salvador Azurmendi \n" "Language-Team: Basque (http://www.transifex.com/mc/mc/language/eu/)\n" @@ -484,6 +484,16 @@ msgstr "Maius" msgid "The TERM environment variable is unset!\n" msgstr "TERM ingurune-aldagaia ezarri gabe dago!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Ezin dira sortu hodiko isuriak" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1371,6 +1381,10 @@ msgstr "&Berria" msgid "&Close" msgstr "It&xi" +#, fuzzy +msgid "&History..." +msgstr "Historia" + msgid "Save &as..." msgstr "Gorde &honela..." @@ -1807,6 +1821,13 @@ msgstr "Ezin eskuratu ondokoaren bertako kopia bat: %s" msgid "The shell is already running a command" msgstr "Shell-a dagoeneko komando bat exekutate ari da" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"Ez da xterm edo Linux kontsola;\n" +"panelak ezin dira ezkutatu." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Tekleatu «exit» Midnight Commanderrera itzultzeko" @@ -2368,13 +2389,6 @@ msgstr "" "Panel biak egon beharko lirateke zerrendatzeko\n" "moduan komando hau erabiltzeko" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"Ez da xterm edo Linux kontsola;\n" -"panelak ezin dira ezkutatu." - #, c-format msgid "'%s' is not a symbolic link" msgstr "'%s' ez da esteka sinbolikoa" @@ -2441,9 +2455,6 @@ msgstr "" "Ezin da \"%s\" direktoriora aldatu\n" "%s" -msgid "Cannot read directory contents" -msgstr "Direktorioaren edukia ezin irakurri" - msgid "Parameter" msgstr "Parametroa" @@ -3401,6 +3412,9 @@ msgstr "E&rakutsi direktorioen neurriak" msgid "Command &history" msgstr "Ko&mandoen historia" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "&Gogoko direktorioak" @@ -3626,6 +3640,9 @@ msgstr "Hautua kendu" msgid "Do you really want to execute?" msgstr "Beneta exekutatu nahi duzu?" +msgid "Cannot read directory contents" +msgstr "Direktorioaren edukia ezin irakurri" + msgid "User supplied format looks invalid, reverting to default." msgstr "Erabiltzaileak emandako formatua baliogabea da, lehenetsira itzultzen." diff --git a/po/fa.po b/po/fa.po index 6ab5789fe..5fd7bc2a8 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Persian (http://www.transifex.com/mc/mc/language/fa/)\n" @@ -463,6 +463,15 @@ msgstr "" msgid "The TERM environment variable is unset!\n" msgstr "" +msgid "Cannot create pipe for SIGWINCH" +msgstr "" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1286,6 +1295,10 @@ msgstr "جدید" msgid "&Close" msgstr "" +#, fuzzy +msgid "&History..." +msgstr "تاریخچه" + msgid "Save &as..." msgstr "" @@ -1714,6 +1727,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "شل در حال اجرای فرمانی دیگر است" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2263,11 +2281,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2330,9 +2343,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "" - msgid "Parameter" msgstr "پارامتر" @@ -3200,6 +3210,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3425,6 +3438,9 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "" + msgid "User supplied format looks invalid, reverting to default." msgstr "" diff --git a/po/fi.po b/po/fi.po index d57c49394..136be78f4 100644 --- a/po/fi.po +++ b/po/fi.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Finnish (http://www.transifex.com/mc/mc/language/fi/)\n" @@ -468,6 +468,16 @@ msgstr "Vaihto" msgid "The TERM environment variable is unset!\n" msgstr "" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Hakemiston %s luonti epäonnistui" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1293,6 +1303,10 @@ msgstr "&Uusi" msgid "&Close" msgstr "&Sulje" +#, fuzzy +msgid "&History..." +msgstr "Historia" + msgid "Save &as..." msgstr "Tallenna &nimellä..." @@ -1721,6 +1735,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2270,11 +2289,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2337,9 +2351,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "" - msgid "Parameter" msgstr "" @@ -3207,6 +3218,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3432,6 +3446,9 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "" + msgid "User supplied format looks invalid, reverting to default." msgstr "" diff --git a/po/fr.po b/po/fr.po index d2a98b599..ea772d9a0 100644 --- a/po/fr.po +++ b/po/fr.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: French (http://www.transifex.com/mc/mc/language/fr/)\n" @@ -494,6 +494,16 @@ msgstr "Maj" msgid "The TERM environment variable is unset!\n" msgstr "La variable d'environnement TERM n'est pas définie !\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Impossible de créer les flux des tubes" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1384,6 +1394,10 @@ msgstr "&Nouveau" msgid "&Close" msgstr "&Fermer" +#, fuzzy +msgid "&History..." +msgstr "Historique" + msgid "Save &as..." msgstr "Enregi&strer sous..." @@ -1820,6 +1834,13 @@ msgstr "Impossible de récupérer une copie locale de %s " msgid "The shell is already running a command" msgstr " Le shell est déjà en train d'exécuter une commande " +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"N'est pas un xterm ou une console Linux;\n" +"les panneaux ne peuvent pas être activé." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Tapez « exit » pour retourner à Midnight Commander" @@ -2379,13 +2400,6 @@ msgstr "" "Les deux panneaux doivent être en mode liste\n" "pour utiliser cette commande" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"N'est pas un xterm ou une console Linux;\n" -"les panneaux ne peuvent pas être activé." - #, c-format msgid "'%s' is not a symbolic link" msgstr "« %s » n'est pas un lien symbolique" @@ -2452,9 +2466,6 @@ msgstr "" "Ne peut aller dans le répertoire « %s »\n" "%s" -msgid "Cannot read directory contents" -msgstr " Ne peut lire le contenu du répertoire" - msgid "Parameter" msgstr "Paramètre" @@ -3405,6 +3416,9 @@ msgstr "Aff&icher la taille des rép." msgid "Command &history" msgstr "&Historique des commandes" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "Liste des répe&rtoires favoris" @@ -3630,6 +3644,9 @@ msgstr "Désélectionner" msgid "Do you really want to execute?" msgstr "Voulez-vous vraiment l'exécuter ?" +msgid "Cannot read directory contents" +msgstr " Ne peut lire le contenu du répertoire" + msgid "User supplied format looks invalid, reverting to default." msgstr "" "Le format fourni par l'utilisateur semble invalide, revient aux valeurs par " diff --git a/po/fr_CA.po b/po/fr_CA.po index e0dec1401..f06581cbb 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2015-02-26 09:48+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/mc/" @@ -459,6 +459,15 @@ msgstr "" msgid "The TERM environment variable is unset!\n" msgstr "" +msgid "Cannot create pipe for SIGWINCH" +msgstr "" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1282,6 +1291,9 @@ msgstr "" msgid "&Close" msgstr "" +msgid "&History..." +msgstr "" + msgid "Save &as..." msgstr "" @@ -1710,6 +1722,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2259,11 +2276,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2326,9 +2338,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "" - msgid "Parameter" msgstr "" @@ -3196,6 +3205,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3421,6 +3433,9 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "" + msgid "User supplied format looks invalid, reverting to default." msgstr "" diff --git a/po/gl.po b/po/gl.po index 54fc442db..3878f0b44 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-09 10:24+0000\n" "Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: Galician (http://www.transifex.com/mc/mc/language/gl/)\n" @@ -491,6 +491,16 @@ msgstr "Maiús" msgid "The TERM environment variable is unset!\n" msgstr "A variábel de contorno TERM está sen definir!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Non é posíbel crear a canalización de fluxos" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1378,6 +1388,10 @@ msgstr "&Novo" msgid "&Close" msgstr "&Pechar" +#, fuzzy +msgid "&History..." +msgstr "Historial" + msgid "Save &as..." msgstr "Gardar &Como..." @@ -1814,6 +1828,13 @@ msgstr "Non é posíbel obter unha copia local de %s" msgid "The shell is already running a command" msgstr "O terminal xa esta executando unha orde" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"Non se está usando nin xterm nin a consola Linux;\n" +"os paneis non se poden agochar." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Escriba «exit» para volver ao Midnight Commander" @@ -2374,13 +2395,6 @@ msgstr "" "Ambos os dous paneis deben estar en modo lista\n" "para usar esta orde" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"Non se está usando nin xterm nin a consola Linux;\n" -"os paneis non se poden agochar." - #, c-format msgid "'%s' is not a symbolic link" msgstr "«%s» non é unha ligazón simbólica" @@ -2447,9 +2461,6 @@ msgstr "" "Non é posíbel cambiar ao directorio «%s»\n" "%s" -msgid "Cannot read directory contents" -msgstr "Non é posíbel ler o contido do directorio" - msgid "Parameter" msgstr "Parámetro" @@ -3405,6 +3416,9 @@ msgstr "Mostrar &Tamaño dos directorios" msgid "Command &history" msgstr "&Historial de ordes" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "di&Rectorio de favoritos" @@ -3630,6 +3644,9 @@ msgstr "Desmarcar" msgid "Do you really want to execute?" msgstr "Confirma que quere executalo?" +msgid "Cannot read directory contents" +msgstr "Non é posíbel ler o contido do directorio" + msgid "User supplied format looks invalid, reverting to default." msgstr "O formato semella non ser correcto. Recuperando o predeterminado." diff --git a/po/hr.po b/po/hr.po index b4ebd3549..15cffdb5a 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Croatian (http://www.transifex.com/mc/mc/language/hr/)\n" @@ -459,6 +459,15 @@ msgstr "" msgid "The TERM environment variable is unset!\n" msgstr "" +msgid "Cannot create pipe for SIGWINCH" +msgstr "" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1282,6 +1291,9 @@ msgstr "" msgid "&Close" msgstr "" +msgid "&History..." +msgstr "" + msgid "Save &as..." msgstr "" @@ -1710,6 +1722,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2259,11 +2276,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2326,9 +2338,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "" - msgid "Parameter" msgstr "" @@ -3198,6 +3207,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3425,6 +3437,9 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "" + msgid "User supplied format looks invalid, reverting to default." msgstr "" diff --git a/po/hu.po b/po/hu.po index adbda023e..b7e0f0d5b 100644 --- a/po/hu.po +++ b/po/hu.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Hungarian (http://www.transifex.com/mc/mc/language/hu/)\n" @@ -478,6 +478,16 @@ msgstr "Shift" msgid "The TERM environment variable is unset!\n" msgstr "Nincs beállítva a TERM környezeti változó.\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "A(z) %s könyvtár nem létrehozható" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1359,6 +1369,10 @@ msgstr "&Új" msgid "&Close" msgstr "&Bezárás" +#, fuzzy +msgid "&History..." +msgstr "Előzmények" + msgid "Save &as..." msgstr "Mentés m&ásként" @@ -1795,6 +1809,13 @@ msgstr "Nem sikerült behozni \"%s\" helyi másolatát" msgid "The shell is already running a command" msgstr "A parancsértelmező már futtat egy parancsot." +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"Nem Xterm vagy Linux-konzol;\n" +"a paneleket nem lehet kikapcsolni." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Írjon \"exit\"-et a Midnight Commanderbe való visszatéréshez." @@ -2353,13 +2374,6 @@ msgstr "" "Mindkét panelnak fájllista-módban kell lennie\n" "ehhez a művelethez" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"Nem Xterm vagy Linux-konzol;\n" -"a paneleket nem lehet kikapcsolni." - #, c-format msgid "'%s' is not a symbolic link" msgstr "\"%s\" nem szimbolikus link" @@ -2426,9 +2440,6 @@ msgstr "" "Nem sikerült belépni a(z) \"%s\" könyvtárba.\n" "%s" -msgid "Cannot read directory contents" -msgstr "Könyvtár tartalma nem olvasható" - msgid "Parameter" msgstr "Paraméter" @@ -3378,6 +3389,9 @@ msgstr "Könyvtár&méret" msgid "Command &history" msgstr "Ko&rábbi parancsok" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "Könyvtár-gyorslista" @@ -3603,6 +3617,9 @@ msgstr "Kijelölések megszüntetése" msgid "Do you really want to execute?" msgstr "Biztosan futtatni kívánja a programot?" +msgid "Cannot read directory contents" +msgstr "Könyvtár tartalma nem olvasható" + msgid "User supplied format looks invalid, reverting to default." msgstr "A beállított formátum hibás; az alapértelmezés lép életbe." diff --git a/po/ia.po b/po/ia.po index a24cb4bd1..b1a4efd4e 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Interlingua (http://www.transifex.com/mc/mc/language/ia/)\n" @@ -468,6 +468,15 @@ msgstr "Clave \"Shift\"" msgid "The TERM environment variable is unset!\n" msgstr "Le variabile de ambiente TERM non es definite!\n" +msgid "Cannot create pipe for SIGWINCH" +msgstr "" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1302,6 +1311,10 @@ msgstr "&Nove" msgid "&Close" msgstr "" +#, fuzzy +msgid "&History..." +msgstr "Historia" + msgid "Save &as..." msgstr "S&alveguardar como..." @@ -1730,6 +1743,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2279,11 +2297,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2346,9 +2359,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "" - msgid "Parameter" msgstr "" @@ -3216,6 +3226,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3441,6 +3454,9 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "" + msgid "User supplied format looks invalid, reverting to default." msgstr "" diff --git a/po/id.po b/po/id.po index 369011e0a..984926fe9 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Indonesian (http://www.transifex.com/mc/mc/language/id/)\n" @@ -477,6 +477,16 @@ msgstr "Shift" msgid "The TERM environment variable is unset!\n" msgstr "Environment variable TERM belum diset\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Gagal membuat pipe streams" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1325,6 +1335,10 @@ msgstr "" msgid "&Close" msgstr "" +#, fuzzy +msgid "&History..." +msgstr "History" + msgid "Save &as..." msgstr "" @@ -1753,6 +1767,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2302,11 +2321,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2369,9 +2383,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "" - msgid "Parameter" msgstr "" @@ -3237,6 +3248,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3460,6 +3474,9 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "" + msgid "User supplied format looks invalid, reverting to default." msgstr "" diff --git a/po/it.po b/po/it.po index a8f33da1b..51f2e8a28 100644 --- a/po/it.po +++ b/po/it.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-05-14 08:45+0200\n" "Last-Translator: Marco Ciampa \n" "Language-Team: Italian (http://www.transifex.com/projects/p/mc/language/" @@ -485,6 +485,16 @@ msgstr "Maiusc" msgid "The TERM environment variable is unset!\n" msgstr "La variabile TERM non è definita!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Impossibile creare flussi pipe" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1370,6 +1380,10 @@ msgstr "&Nuovo" msgid "&Close" msgstr "&Chiudi" +#, fuzzy +msgid "&History..." +msgstr "Cronologia" + msgid "Save &as..." msgstr "Sal&va come..." @@ -1806,6 +1820,13 @@ msgstr "Impossibile ricevere una copia locale di %s" msgid "The shell is already running a command" msgstr "La shell sta già eseguendo un comando" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"Non è né un xterm né una console; \n" +"i pannelli non possono essere nascosti." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Battere 'exit' per tornare al Midnight Commander" @@ -2366,13 +2387,6 @@ msgstr "" "Entrambi i pannelli devono essere in\n" "modalità lista per usare questo comando" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"Non è né un xterm né una console; \n" -"i pannelli non possono essere nascosti." - #, c-format msgid "'%s' is not a symbolic link" msgstr "\"%s\" non è un coll. simbolico" @@ -2439,9 +2453,6 @@ msgstr "" "Non posso entrare in \"%s\"\n" "%s" -msgid "Cannot read directory contents" -msgstr "Impossibile leggere il contenuto della directory" - msgid "Parameter" msgstr "Parametro" @@ -3396,6 +3407,9 @@ msgstr "Mostra dimensione d&irectory" msgid "Command &history" msgstr "Cro&nologia comandi" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "&Directory di uso frequente" @@ -3621,6 +3635,9 @@ msgstr "Deseleziona" msgid "Do you really want to execute?" msgstr "Vuoi veramente eseguirlo?" +msgid "Cannot read directory contents" +msgstr "Impossibile leggere il contenuto della directory" + msgid "User supplied format looks invalid, reverting to default." msgstr "Il formato utente fornito è errato, uso il default." diff --git a/po/ja.po b/po/ja.po index acaf98cbb..5b504ca74 100644 --- a/po/ja.po +++ b/po/ja.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Japanese (http://www.transifex.com/mc/mc/language/ja/)\n" @@ -469,6 +469,16 @@ msgstr "Shift" msgid "The TERM environment variable is unset!\n" msgstr "環境変数 TERM がセットされていません\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "ディレクトリー %s が作成できません" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1294,6 +1304,9 @@ msgstr "新規(&N)" msgid "&Close" msgstr "" +msgid "&History..." +msgstr "" + msgid "Save &as..." msgstr "別名で保存(&A)..." @@ -1724,6 +1737,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2275,11 +2293,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2344,9 +2357,6 @@ msgstr "" "「%s」に移動できません\n" "%s" -msgid "Cannot read directory contents" -msgstr "" - msgid "Parameter" msgstr "パラメーター" @@ -3212,6 +3222,9 @@ msgstr "" msgid "Command &history" msgstr "コマンド履歴(&H)" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3435,6 +3448,9 @@ msgstr "選択解除" msgid "Do you really want to execute?" msgstr "本当に実行しますか?" +msgid "Cannot read directory contents" +msgstr "" + msgid "User supplied format looks invalid, reverting to default." msgstr "ユーザの指定した形式は不正なようです. デフォルトに戻します" diff --git a/po/ka.po b/po/ka.po index 33bab8124..95d2ca9e5 100644 --- a/po/ka.po +++ b/po/ka.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Georgian (http://www.transifex.com/mc/mc/language/ka/)\n" @@ -459,6 +459,15 @@ msgstr "Shift" msgid "The TERM environment variable is unset!\n" msgstr "" +msgid "Cannot create pipe for SIGWINCH" +msgstr "" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1284,6 +1293,10 @@ msgstr "&ახალი" msgid "&Close" msgstr "დაკე&ტვა" +#, fuzzy +msgid "&History..." +msgstr "ისტორია" + msgid "Save &as..." msgstr "" @@ -1712,6 +1725,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2262,11 +2280,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2329,9 +2342,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "" - msgid "Parameter" msgstr "" @@ -3199,6 +3209,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3424,6 +3437,9 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "" + msgid "User supplied format looks invalid, reverting to default." msgstr "" diff --git a/po/kk.po b/po/kk.po index f105de164..fbfbffeab 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Kazakh (http://www.transifex.com/mc/mc/language/kk/)\n" @@ -459,6 +459,15 @@ msgstr "" msgid "The TERM environment variable is unset!\n" msgstr "" +msgid "Cannot create pipe for SIGWINCH" +msgstr "" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1282,6 +1291,9 @@ msgstr "" msgid "&Close" msgstr "" +msgid "&History..." +msgstr "" + msgid "Save &as..." msgstr "" @@ -1710,6 +1722,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2259,11 +2276,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2326,9 +2338,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "" - msgid "Parameter" msgstr "" @@ -3196,6 +3205,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3421,6 +3433,9 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "" + msgid "User supplied format looks invalid, reverting to default." msgstr "" diff --git a/po/ko.po b/po/ko.po index 0b2dcf10a..ed97d8d04 100644 --- a/po/ko.po +++ b/po/ko.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-05-22 09:27+0000\n" "Last-Translator: 이정희 \n" "Language-Team: Korean (http://www.transifex.com/mc/mc/language/ko/)\n" @@ -483,6 +483,16 @@ msgstr "쉬프트" msgid "The TERM environment variable is unset!\n" msgstr "TERM 환경변수가 설정되어있지 않습니다!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "파이프 데이터 스트림을 생성할 수 없음" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1366,6 +1376,10 @@ msgstr "신규(&N)" msgid "&Close" msgstr "닫기(&C)" +#, fuzzy +msgid "&History..." +msgstr "기록" + msgid "Save &as..." msgstr "다른 이름으로 저장(&A)..." @@ -1801,6 +1815,13 @@ msgstr "%s의 로컬 복사본을 가져올 수 없음" msgid "The shell is already running a command" msgstr "셸이 이미 명령을 실행하고 있음" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"XTerm 또는 Linux 콘솔이 아님;\n" +"패널을 전환할 수 없습니다." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "미드나잇 커맨더로 돌아가려면 'exit'를 입력하십시오." @@ -2360,13 +2381,6 @@ msgstr "" "두 패널이 모두 목록 모드에 있어야 함\n" "이 명령을 사용합니다." -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"XTerm 또는 Linux 콘솔이 아님;\n" -"패널을 전환할 수 없습니다." - #, c-format msgid "'%s' is not a symbolic link" msgstr "'%s'은(는) 심볼릭링크가 아님" @@ -2433,9 +2447,6 @@ msgstr "" "\"%s\"로 디렉토리 변경할 수 없음\n" "%s" -msgid "Cannot read directory contents" -msgstr "디렉터리 내용을 읽을 수 없습니다" - msgid "Parameter" msgstr "매개변수" @@ -3388,6 +3399,9 @@ msgstr "디렉터리 크기 보기(&I)" msgid "Command &history" msgstr "명령 기록(&H)" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "디렉터리 단축목록(&R)" @@ -3611,6 +3625,9 @@ msgstr "선택 해제" msgid "Do you really want to execute?" msgstr "정말로 실행하시겠습니까?" +msgid "Cannot read directory contents" +msgstr "디렉터리 내용을 읽을 수 없습니다" + msgid "User supplied format looks invalid, reverting to default." msgstr "사용자가 제공한 형식이 잘못되어 기본값으로 되돌립니다." diff --git a/po/lt.po b/po/lt.po index a8bfecf54..fa9618050 100644 --- a/po/lt.po +++ b/po/lt.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Lithuanian (http://www.transifex.com/mc/mc/language/lt/)\n" @@ -490,6 +490,16 @@ msgstr "" msgid "The TERM environment variable is unset!\n" msgstr "Aplinkos kintamasis TERM nenustatytas!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Nepavyko sukurti %s aplanko" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1335,6 +1345,10 @@ msgstr "&Naujas" msgid "&Close" msgstr "&Uždaryti" +#, fuzzy +msgid "&History..." +msgstr "Istorija" + msgid "Save &as..." msgstr "Įrašyti kaip..." @@ -1767,6 +1781,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2320,11 +2339,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2387,9 +2401,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "Nepavyko perskaityti aplanko turinio" - msgid "Parameter" msgstr "Parametras" @@ -3293,6 +3304,9 @@ msgstr "Rodyti aplankų dydžius" msgid "Command &history" msgstr "Komandų istorija" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "Aplankų są&rašas" @@ -3522,6 +3536,9 @@ msgstr "Nebesirinkti" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "Nepavyko perskaityti aplanko turinio" + msgid "User supplied format looks invalid, reverting to default." msgstr "Vartotojo formatas atrodo netaisyklingai, grįžtu prie numatytojo." diff --git a/po/lv.po b/po/lv.po index 180beb6f1..04263a83d 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Latvian (http://www.transifex.com/mc/mc/language/lv/)\n" @@ -460,6 +460,15 @@ msgstr "" msgid "The TERM environment variable is unset!\n" msgstr "TERM mainīgais nav ieslēgts!\n" +msgid "Cannot create pipe for SIGWINCH" +msgstr "" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1285,6 +1294,9 @@ msgstr "" msgid "&Close" msgstr "" +msgid "&History..." +msgstr "" + msgid "Save &as..." msgstr "" @@ -1713,6 +1725,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2263,11 +2280,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2330,9 +2342,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "" - msgid "Parameter" msgstr "" @@ -3202,6 +3211,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3429,6 +3441,9 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "" + msgid "User supplied format looks invalid, reverting to default." msgstr "" "Lietotāja piedāvātais formāts izskatās nepareizs, atgriežamies pie noklusētā." diff --git a/po/mc.pot b/po/mc.pot index ee6f9ecb6..778cf08dc 100644 --- a/po/mc.pot +++ b/po/mc.pot @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: mc 4.8.22-170-g7eaa51c79\n" +"Project-Id-Version: mc 4.8.23-65-gef085af3a\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-22 13:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -76,7 +76,7 @@ msgstr "" msgid "&Ignore lock" msgstr "" -#: lib/mcconfig/paths.c:140 +#: lib/mcconfig/paths.c:141 #, c-format msgid "Cannot create %s directory" msgstr "" @@ -85,12 +85,12 @@ msgstr "" msgid "FATAL: not a directory:" msgstr "" -#: lib/mcconfig/paths.c:214 +#: lib/mcconfig/paths.c:213 #, c-format msgid "An error occurred while migrating user settings: %s" msgstr "" -#: lib/mcconfig/paths.c:469 +#: lib/mcconfig/paths.c:472 #, c-format msgid "" "Your old settings were migrated from %s\n" @@ -99,7 +99,7 @@ msgid "" "http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html" msgstr "" -#: lib/mcconfig/paths.c:475 +#: lib/mcconfig/paths.c:478 #, c-format msgid "" "Your old settings were migrated from %s\n" @@ -148,7 +148,7 @@ msgstr "" msgid "Regular expression error" msgstr "" -#: lib/search/search.c:53 src/diffviewer/ydiff.c:2354 +#: lib/search/search.c:53 src/diffviewer/ydiff.c:2357 msgid "No&rmal" msgstr "" @@ -587,11 +587,23 @@ msgstr "" msgid "Shift" msgstr "" -#: lib/tty/tty.c:94 +#: lib/tty/tty.c:95 msgid "The TERM environment variable is unset!\n" msgstr "" -#: lib/tty/tty-slang.c:286 +#: lib/tty/tty-internal.c:69 +msgid "Cannot create pipe for SIGWINCH" +msgstr "" + +#: lib/tty/tty-internal.c:87 +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +#: lib/tty/tty-internal.c:99 +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + +#: lib/tty/tty-slang.c:296 #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -649,13 +661,13 @@ msgid "" msgstr "" #: lib/utilunix.c:719 lib/utilunix.c:724 lib/utilunix.c:781 -#: src/editor/edit.c:358 src/editor/editcmd.c:229 src/editor/editcmd.c:252 -#: src/editor/editcmd.c:422 src/editor/editcmd.c:584 src/editor/editcmd.c:1720 -#: src/editor/editcmd.c:3436 src/editor/editcmd.c:3465 +#: src/editor/edit.c:358 src/editor/editcmd.c:230 src/editor/editcmd.c:253 +#: src/editor/editcmd.c:423 src/editor/editcmd.c:585 src/editor/editcmd.c:1721 +#: src/editor/editcmd.c:3466 src/editor/editcmd.c:3495 #: src/editor/editcmd_dialogs.c:471 src/execute.c:135 -#: src/filemanager/file.c:2387 src/filemanager/panel.c:4464 src/help.c:362 +#: src/filemanager/file.c:2387 src/filemanager/panel.c:4503 src/help.c:362 #: src/main.c:401 src/subshell/common.c:432 src/subshell/common.c:1267 -#: src/viewer/actions_cmd.c:427 +#: src/viewer/actions_cmd.c:461 msgid "Warning" msgstr "" @@ -752,7 +764,7 @@ msgstr "" msgid "Screens" msgstr "" -#: lib/widget/history.c:300 lib/widget/history.c:323 +#: lib/widget/history.c:213 lib/widget/history.c:228 msgid "History" msgstr "" @@ -765,43 +777,43 @@ msgstr "" msgid "Do you want clean this history?" msgstr "" -#: lib/widget/listbox.c:325 src/diffviewer/ydiff.c:3089 src/editor/edit.c:358 -#: src/editor/editcmd.c:231 src/editor/editcmd.c:254 src/editor/editcmd.c:2851 -#: src/editor/editcmd.c:2857 src/filemanager/cmd.c:140 +#: lib/widget/listbox.c:325 src/diffviewer/ydiff.c:3092 src/editor/edit.c:358 +#: src/editor/editcmd.c:232 src/editor/editcmd.c:255 src/editor/editcmd.c:2881 +#: src/editor/editcmd.c:2887 src/filemanager/cmd.c:140 #: src/filemanager/file.c:968 src/filemanager/file.c:1951 #: src/filemanager/filegui.c:458 src/filemanager/hotlist.c:1158 -#: src/filemanager/hotlist.c:1175 src/filemanager/midnight.c:1018 -#: src/filemanager/midnight.c:1026 src/filemanager/panel.c:2818 +#: src/filemanager/hotlist.c:1175 src/filemanager/midnight.c:1067 +#: src/filemanager/midnight.c:1075 src/filemanager/panel.c:2818 #: src/filemanager/tree.c:826 src/subshell/common.c:1269 -#: src/viewer/actions_cmd.c:629 src/viewer/actions_cmd.c:635 +#: src/viewer/actions_cmd.c:656 src/viewer/actions_cmd.c:662 #: src/viewer/search.c:398 msgid "&Yes" msgstr "" -#: lib/widget/listbox.c:325 src/diffviewer/ydiff.c:3089 src/editor/edit.c:358 -#: src/editor/editcmd.c:231 src/editor/editcmd.c:2851 src/editor/editcmd.c:2857 +#: lib/widget/listbox.c:325 src/diffviewer/ydiff.c:3092 src/editor/edit.c:358 +#: src/editor/editcmd.c:232 src/editor/editcmd.c:2881 src/editor/editcmd.c:2887 #: src/filemanager/cmd.c:140 src/filemanager/file.c:968 #: src/filemanager/file.c:1951 src/filemanager/filegui.c:460 #: src/filemanager/hotlist.c:1158 src/filemanager/hotlist.c:1175 -#: src/filemanager/midnight.c:1018 src/filemanager/midnight.c:1026 +#: src/filemanager/midnight.c:1067 src/filemanager/midnight.c:1075 #: src/filemanager/panel.c:2818 src/filemanager/tree.c:826 -#: src/subshell/common.c:1269 src/viewer/actions_cmd.c:629 -#: src/viewer/actions_cmd.c:635 src/viewer/search.c:399 +#: src/subshell/common.c:1269 src/viewer/actions_cmd.c:656 +#: src/viewer/actions_cmd.c:662 src/viewer/search.c:399 msgid "&No" msgstr "" -#: lib/widget/quick.h:215 src/editor/editcmd.c:2717 -#: src/editor/editcmd_dialogs.c:121 src/editor/editwidget.c:150 +#: lib/widget/quick.h:215 src/editor/editcmd.c:2747 +#: src/editor/editcmd_dialogs.c:121 src/editor/editwidget.c:151 #: src/filemanager/boxes.c:1227 src/filemanager/filegui.c:1362 -#: src/filemanager/find.c:599 src/filemanager/layout.c:458 +#: src/filemanager/find.c:599 src/filemanager/layout.c:461 #: src/subshell/common.c:435 msgid "&OK" msgstr "" -#: lib/widget/quick.h:216 src/editor/editcmd.c:231 src/editor/editcmd.c:254 -#: src/editor/editcmd.c:424 src/editor/editcmd.c:587 src/editor/editcmd.c:1721 -#: src/editor/editcmd.c:2069 src/editor/editcmd.c:2851 -#: src/editor/editcmd.c:3439 src/editor/editcmd.c:3468 +#: lib/widget/quick.h:216 src/editor/editcmd.c:232 src/editor/editcmd.c:255 +#: src/editor/editcmd.c:425 src/editor/editcmd.c:588 src/editor/editcmd.c:1722 +#: src/editor/editcmd.c:2070 src/editor/editcmd.c:2881 +#: src/editor/editcmd.c:3469 src/editor/editcmd.c:3498 #: src/editor/editcmd_dialogs.c:123 src/editor/editcmd_dialogs.c:282 #: src/editor/editcmd_dialogs.c:473 src/editor/spell_dialogs.c:99 #: src/filemanager/achown.c:89 src/filemanager/achown.c:848 @@ -810,7 +822,7 @@ msgstr "" #: src/filemanager/chown.c:310 src/filemanager/cmd.c:1156 #: src/filemanager/filegui.c:1366 src/filemanager/find.c:599 #: src/filemanager/hotlist.c:187 src/filemanager/hotlist.c:1014 -#: src/filemanager/hotlist.c:1076 src/filemanager/layout.c:459 +#: src/filemanager/hotlist.c:1076 src/filemanager/layout.c:462 #: src/filemanager/panelize.c:140 src/learn.c:256 src/viewer/hex.c:431 msgid "&Cancel" msgstr "" @@ -821,8 +833,8 @@ msgstr "" #: lib/widget/wtools.c:286 lib/widget/wtools.c:413 src/editor/edit.c:193 #: src/editor/edit.c:214 src/editor/edit.c:370 src/editor/edit.c:1977 -#: src/editor/edit.c:1987 src/editor/editcmd.c:316 src/editor/editcmd.c:326 -#: src/editor/editcmd.c:367 src/editor/editcmd.c:2954 src/editor/spell.c:315 +#: src/editor/edit.c:1987 src/editor/editcmd.c:317 src/editor/editcmd.c:327 +#: src/editor/editcmd.c:368 src/editor/editcmd.c:2984 src/editor/spell.c:315 #: src/editor/spell.c:551 src/editor/spell.c:559 #: tests/src/execute__common.c:145 #: tests/src/execute__execute_with_vfs_arg.c:154 @@ -1022,7 +1034,7 @@ msgid "" "as tickets at www.midnight-commander.org\n" msgstr "" -#: src/args.c:426 src/filemanager/midnight.c:1714 src/textconf.c:145 +#: src/args.c:426 src/filemanager/midnight.c:1764 src/textconf.c:145 #, c-format msgid "GNU Midnight Commander %s\n" msgstr "" @@ -1110,8 +1122,8 @@ msgstr "" #: src/diffviewer/search.c:106 src/diffviewer/search.c:229 #: src/diffviewer/search.c:242 src/diffviewer/search.c:275 -#: src/editor/editcmd.c:960 src/editor/editcmd.c:987 src/editor/editcmd.c:1016 -#: src/editor/editcmd.c:2600 src/editor/editcmd.c:2611 +#: src/editor/editcmd.c:961 src/editor/editcmd.c:988 src/editor/editcmd.c:1017 +#: src/editor/editcmd.c:2630 src/editor/editcmd.c:2641 #: src/editor/editcmd_dialogs.c:130 src/viewer/dialogs.c:111 #: src/viewer/search.c:350 src/viewer/search.c:410 src/viewer/search.c:430 #: src/viewer/search.c:432 @@ -1122,14 +1134,14 @@ msgstr "" msgid "Search is disabled" msgstr "" -#: src/diffviewer/ydiff.c:175 +#: src/diffviewer/ydiff.c:176 #, c-format msgid "" "Cannot create temporary diff file\n" "%s" msgstr "" -#: src/diffviewer/ydiff.c:2207 +#: src/diffviewer/ydiff.c:2208 #, c-format msgid "" "Cannot create backup file\n" @@ -1137,146 +1149,146 @@ msgid "" "%s" msgstr "" -#: src/diffviewer/ydiff.c:2216 +#: src/diffviewer/ydiff.c:2217 #, c-format msgid "" "Cannot create temporary merge file\n" "%s" msgstr "" -#: src/diffviewer/ydiff.c:2355 +#: src/diffviewer/ydiff.c:2358 msgid "&Fastest (Assume large files)" msgstr "" -#: src/diffviewer/ydiff.c:2356 +#: src/diffviewer/ydiff.c:2359 msgid "&Minimal (Find a smaller set of change)" msgstr "" -#: src/diffviewer/ydiff.c:2361 +#: src/diffviewer/ydiff.c:2364 msgid "Diff algorithm" msgstr "" -#: src/diffviewer/ydiff.c:2364 +#: src/diffviewer/ydiff.c:2367 msgid "Diff extra options" msgstr "" -#: src/diffviewer/ydiff.c:2365 +#: src/diffviewer/ydiff.c:2368 msgid "&Ignore case" msgstr "" -#: src/diffviewer/ydiff.c:2366 +#: src/diffviewer/ydiff.c:2369 msgid "Ignore tab &expansion" msgstr "" -#: src/diffviewer/ydiff.c:2367 +#: src/diffviewer/ydiff.c:2370 msgid "Ignore &space change" msgstr "" -#: src/diffviewer/ydiff.c:2368 +#: src/diffviewer/ydiff.c:2371 msgid "Ignore all &whitespace" msgstr "" -#: src/diffviewer/ydiff.c:2369 +#: src/diffviewer/ydiff.c:2372 msgid "Strip &trailing carriage return" msgstr "" -#: src/diffviewer/ydiff.c:2379 +#: src/diffviewer/ydiff.c:2382 msgid "Diff Options" msgstr "" -#: src/diffviewer/ydiff.c:2888 +#: src/diffviewer/ydiff.c:2891 msgid "Edit" msgstr "" -#: src/diffviewer/ydiff.c:2888 +#: src/diffviewer/ydiff.c:2891 msgid "Edit is disabled" msgstr "" -#: src/diffviewer/ydiff.c:2922 +#: src/diffviewer/ydiff.c:2925 msgid "Goto line (left)" msgstr "" -#: src/diffviewer/ydiff.c:2923 +#: src/diffviewer/ydiff.c:2926 msgid "Goto line (right)" msgstr "" -#: src/diffviewer/ydiff.c:2931 src/editor/editcmd.c:3037 +#: src/diffviewer/ydiff.c:2934 src/editor/editcmd.c:3067 msgid "Enter line:" msgstr "" -#: src/diffviewer/ydiff.c:2973 src/editor/editwidget.c:682 -#: src/filemanager/midnight.c:1601 src/filemanager/tree.c:1167 src/help.c:1128 +#: src/diffviewer/ydiff.c:2976 src/editor/editwidget.c:661 +#: src/filemanager/midnight.c:1651 src/filemanager/tree.c:1167 src/help.c:1128 #: src/viewer/display.c:85 msgid "ButtonBar|Help" msgstr "" -#: src/diffviewer/ydiff.c:2974 src/editor/editwidget.c:683 +#: src/diffviewer/ydiff.c:2977 src/editor/editwidget.c:662 #: src/viewer/display.c:97 msgid "ButtonBar|Save" msgstr "" -#: src/diffviewer/ydiff.c:2975 src/filemanager/midnight.c:1604 +#: src/diffviewer/ydiff.c:2978 src/filemanager/midnight.c:1654 #: src/viewer/display.c:92 msgid "ButtonBar|Edit" msgstr "" -#: src/diffviewer/ydiff.c:2976 +#: src/diffviewer/ydiff.c:2979 msgid "ButtonBar|Merge" msgstr "" -#: src/diffviewer/ydiff.c:2977 src/editor/editwidget.c:688 +#: src/diffviewer/ydiff.c:2980 src/editor/editwidget.c:667 #: src/viewer/display.c:107 msgid "ButtonBar|Search" msgstr "" -#: src/diffviewer/ydiff.c:2978 +#: src/diffviewer/ydiff.c:2981 msgid "ButtonBar|Options" msgstr "" -#: src/diffviewer/ydiff.c:2979 src/editor/editwidget.c:691 -#: src/filemanager/midnight.c:1610 src/help.c:1137 src/viewer/display.c:116 +#: src/diffviewer/ydiff.c:2982 src/editor/editwidget.c:670 +#: src/filemanager/midnight.c:1660 src/help.c:1137 src/viewer/display.c:116 #: src/viewer/display.c:119 msgid "ButtonBar|Quit" msgstr "" -#: src/diffviewer/ydiff.c:3086 src/editor/editcmd.c:2857 -#: src/viewer/actions_cmd.c:627 src/viewer/actions_cmd.c:633 +#: src/diffviewer/ydiff.c:3089 src/editor/editcmd.c:2887 +#: src/viewer/actions_cmd.c:654 src/viewer/actions_cmd.c:660 msgid "Quit" msgstr "" -#: src/diffviewer/ydiff.c:3087 +#: src/diffviewer/ydiff.c:3090 msgid "File(s) was modified. Save with exit?" msgstr "" -#: src/diffviewer/ydiff.c:3088 +#: src/diffviewer/ydiff.c:3091 msgid "" "Midnight Commander is being shut down.\n" "Save modified file(s)?" msgstr "" -#: src/diffviewer/ydiff.c:3438 src/diffviewer/ydiff.c:3441 +#: src/diffviewer/ydiff.c:3424 src/diffviewer/ydiff.c:3427 msgid "Diff:" msgstr "" -#: src/diffviewer/ydiff.c:3554 src/diffviewer/ydiff.c:3564 -#: src/diffviewer/ydiff.c:3584 src/diffviewer/ydiff.c:3601 +#: src/diffviewer/ydiff.c:3539 src/diffviewer/ydiff.c:3549 +#: src/diffviewer/ydiff.c:3569 src/diffviewer/ydiff.c:3586 #, c-format msgid "\"%s\" is a directory" msgstr "" -#: src/diffviewer/ydiff.c:3590 src/diffviewer/ydiff.c:3607 -#: src/filemanager/file.c:1758 src/viewer/mcviewer.c:339 +#: src/diffviewer/ydiff.c:3575 src/diffviewer/ydiff.c:3592 +#: src/filemanager/file.c:1758 src/viewer/mcviewer.c:342 #, c-format msgid "" "Cannot stat \"%s\"\n" "%s" msgstr "" -#: src/diffviewer/ydiff.c:3616 +#: src/diffviewer/ydiff.c:3601 msgid "Diff viewer: invalid mode" msgstr "" -#: src/diffviewer/ydiff.c:3645 +#: src/diffviewer/ydiff.c:3630 msgid "Two files are needed to compare" msgstr "" @@ -1342,339 +1354,339 @@ msgstr "" msgid "Cannot open pipe for reading: %s" msgstr "" -#: src/editor/editcmd.c:127 src/viewer/search.c:82 +#: src/editor/editcmd.c:128 src/viewer/search.c:82 #, c-format msgid "Searching %s: %3d%%" msgstr "" -#: src/editor/editcmd.c:130 src/filemanager/find.c:1343 src/viewer/search.c:85 +#: src/editor/editcmd.c:131 src/filemanager/find.c:1343 src/viewer/search.c:85 #, c-format msgid "Searching %s" msgstr "" -#: src/editor/editcmd.c:230 +#: src/editor/editcmd.c:231 msgid "File has hard-links. Detach before saving?" msgstr "" -#: src/editor/editcmd.c:253 +#: src/editor/editcmd.c:254 msgid "The file has been modified in the meantime. Save anyway?" msgstr "" -#: src/editor/editcmd.c:315 +#: src/editor/editcmd.c:316 #, c-format msgid "Error writing to pipe: %s" msgstr "" -#: src/editor/editcmd.c:325 +#: src/editor/editcmd.c:326 #, c-format msgid "Cannot open pipe for writing: %s" msgstr "" -#: src/editor/editcmd.c:366 +#: src/editor/editcmd.c:367 #, c-format msgid "Cannot open file for writing: %s" msgstr "" -#: src/editor/editcmd.c:423 +#: src/editor/editcmd.c:424 msgid "The file you are saving does not end with a newline." msgstr "" -#: src/editor/editcmd.c:424 src/editor/editcmd.c:587 src/editor/editcmd.c:3438 -#: src/editor/editcmd.c:3467 src/editor/editcmd_dialogs.c:473 +#: src/editor/editcmd.c:425 src/editor/editcmd.c:588 src/editor/editcmd.c:3468 +#: src/editor/editcmd.c:3497 src/editor/editcmd_dialogs.c:473 msgid "C&ontinue" msgstr "" -#: src/editor/editcmd.c:437 +#: src/editor/editcmd.c:438 msgid "&Do not change" msgstr "" -#: src/editor/editcmd.c:438 +#: src/editor/editcmd.c:439 msgid "&Unix format (LF)" msgstr "" -#: src/editor/editcmd.c:439 +#: src/editor/editcmd.c:440 msgid "&Windows/DOS format (CR LF)" msgstr "" -#: src/editor/editcmd.c:440 +#: src/editor/editcmd.c:441 msgid "&Macintosh format (CR)" msgstr "" -#: src/editor/editcmd.c:445 src/editor/editcmd.c:2090 src/editor/editcmd.c:3078 -#: src/editor/editcmd.c:3110 src/filemanager/cmd.c:754 +#: src/editor/editcmd.c:446 src/editor/editcmd.c:2091 src/editor/editcmd.c:3108 +#: src/editor/editcmd.c:3140 src/filemanager/cmd.c:751 msgid "Enter file name:" msgstr "" -#: src/editor/editcmd.c:449 +#: src/editor/editcmd.c:450 msgid "Change line breaks to:" msgstr "" -#: src/editor/editcmd.c:458 +#: src/editor/editcmd.c:459 msgid "Save As" msgstr "" -#: src/editor/editcmd.c:586 +#: src/editor/editcmd.c:587 msgid "Block is large, you may not be able to undo this action" msgstr "" -#: src/editor/editcmd.c:1245 +#: src/editor/editcmd.c:1246 msgid "Collect completions" msgstr "" -#: src/editor/editcmd.c:1619 +#: src/editor/editcmd.c:1620 msgid "&Quick save" msgstr "" -#: src/editor/editcmd.c:1620 +#: src/editor/editcmd.c:1621 msgid "&Safe save" msgstr "" -#: src/editor/editcmd.c:1621 +#: src/editor/editcmd.c:1622 msgid "&Do backups with following extension:" msgstr "" -#: src/editor/editcmd.c:1640 +#: src/editor/editcmd.c:1641 msgid "Check &POSIX new line" msgstr "" -#: src/editor/editcmd.c:1648 +#: src/editor/editcmd.c:1649 msgid "Edit Save Mode" msgstr "" -#: src/editor/editcmd.c:1705 src/editor/editcmd.c:1775 +#: src/editor/editcmd.c:1706 src/editor/editcmd.c:1776 msgid "Save as" msgstr "" -#: src/editor/editcmd.c:1707 +#: src/editor/editcmd.c:1708 msgid "Cannot save: destination is not a regular file" msgstr "" -#: src/editor/editcmd.c:1721 +#: src/editor/editcmd.c:1722 msgid "A file already exists with this name" msgstr "" -#: src/editor/editcmd.c:1721 +#: src/editor/editcmd.c:1722 msgid "&Overwrite" msgstr "" -#: src/editor/editcmd.c:1775 src/editor/editcmd.c:3088 +#: src/editor/editcmd.c:1776 src/editor/editcmd.c:3118 msgid "Cannot save file" msgstr "" -#: src/editor/editcmd.c:1800 src/editor/editcmd.c:1803 +#: src/editor/editcmd.c:1801 src/editor/editcmd.c:1804 msgid "Delete macro" msgstr "" -#: src/editor/editcmd.c:1800 +#: src/editor/editcmd.c:1801 msgid "Press macro hotkey:" msgstr "" -#: src/editor/editcmd.c:1803 +#: src/editor/editcmd.c:1804 msgid "Macro not deleted" msgstr "" -#: src/editor/editcmd.c:1858 +#: src/editor/editcmd.c:1859 msgid "Save macro" msgstr "" -#: src/editor/editcmd.c:1858 +#: src/editor/editcmd.c:1859 msgid "Press the macro's new hotkey:" msgstr "" -#: src/editor/editcmd.c:1932 +#: src/editor/editcmd.c:1933 msgid "Repeat last commands" msgstr "" -#: src/editor/editcmd.c:1932 +#: src/editor/editcmd.c:1933 msgid "Repeat times:" msgstr "" -#: src/editor/editcmd.c:2067 +#: src/editor/editcmd.c:2068 #, c-format msgid "Confirm save file: \"%s\"" msgstr "" -#: src/editor/editcmd.c:2069 src/viewer/hex.c:419 src/viewer/hex.c:431 +#: src/editor/editcmd.c:2070 src/viewer/hex.c:419 src/viewer/hex.c:431 msgid "Save file" msgstr "" -#: src/editor/editcmd.c:2069 src/editor/editmenu.c:77 src/learn.c:192 +#: src/editor/editcmd.c:2070 src/editor/editmenu.c:78 src/learn.c:192 #: src/learn.c:255 msgid "&Save" msgstr "" -#: src/editor/editcmd.c:2090 +#: src/editor/editcmd.c:2091 msgid "Load" msgstr "" -#: src/editor/editcmd.c:2123 +#: src/editor/editcmd.c:2153 msgid "Syntax file edit" msgstr "" -#: src/editor/editcmd.c:2124 +#: src/editor/editcmd.c:2154 msgid "Which syntax file you want to edit?" msgstr "" -#: src/editor/editcmd.c:2125 src/editor/editcmd.c:2171 -#: src/filemanager/cmd.c:960 src/filemanager/cmd.c:1000 -#: src/filemanager/cmd.c:1061 +#: src/editor/editcmd.c:2155 src/editor/editcmd.c:2201 +#: src/filemanager/cmd.c:959 src/filemanager/cmd.c:1000 +#: src/filemanager/cmd.c:1058 msgid "&User" msgstr "" -#: src/editor/editcmd.c:2125 src/editor/editcmd.c:2171 +#: src/editor/editcmd.c:2155 src/editor/editcmd.c:2201 msgid "&System wide" msgstr "" -#: src/editor/editcmd.c:2169 src/filemanager/cmd.c:998 +#: src/editor/editcmd.c:2199 src/filemanager/cmd.c:998 msgid "Menu edit" msgstr "" -#: src/editor/editcmd.c:2170 src/filemanager/cmd.c:999 +#: src/editor/editcmd.c:2200 src/filemanager/cmd.c:999 msgid "Which menu file do you want to edit?" msgstr "" -#: src/editor/editcmd.c:2171 src/filemanager/cmd.c:1000 +#: src/editor/editcmd.c:2201 src/filemanager/cmd.c:1000 msgid "&Local" msgstr "" -#: src/editor/editcmd.c:2676 src/editor/editcmd.c:2717 -#: src/editor/editcmd.c:2729 src/editor/editcmd_dialogs.c:224 +#: src/editor/editcmd.c:2706 src/editor/editcmd.c:2747 +#: src/editor/editcmd.c:2759 src/editor/editcmd_dialogs.c:224 msgid "Replace" msgstr "" -#: src/editor/editcmd.c:2729 +#: src/editor/editcmd.c:2759 #, c-format msgid "%ld replacements made" msgstr "" -#: src/editor/editcmd.c:2832 src/editor/editwidget.c:391 +#: src/editor/editcmd.c:2862 src/editor/editwidget.c:367 msgid "[NoName]" msgstr "" -#: src/editor/editcmd.c:2850 +#: src/editor/editcmd.c:2880 #, c-format msgid "" "File %s was modified.\n" "Save before close?" msgstr "" -#: src/editor/editcmd.c:2851 +#: src/editor/editcmd.c:2881 msgid "Close file" msgstr "" -#: src/editor/editcmd.c:2855 +#: src/editor/editcmd.c:2885 #, c-format msgid "" "Midnight Commander is being shut down.\n" "Save modified file %s?" msgstr "" -#: src/editor/editcmd.c:2954 +#: src/editor/editcmd.c:2984 msgid "This function is not implemented" msgstr "" -#: src/editor/editcmd.c:2969 +#: src/editor/editcmd.c:2999 msgid "Copy to clipboard" msgstr "" -#: src/editor/editcmd.c:2969 src/editor/editcmd.c:2993 +#: src/editor/editcmd.c:2999 src/editor/editcmd.c:3023 msgid "Unable to save to file" msgstr "" -#: src/editor/editcmd.c:2993 +#: src/editor/editcmd.c:3023 msgid "Cut to clipboard" msgstr "" -#: src/editor/editcmd.c:3037 +#: src/editor/editcmd.c:3067 msgid "Goto line" msgstr "" -#: src/editor/editcmd.c:3078 src/editor/editcmd.c:3088 +#: src/editor/editcmd.c:3108 src/editor/editcmd.c:3118 msgid "Save block" msgstr "" -#: src/editor/editcmd.c:3110 src/editor/editcmd.c:3125 +#: src/editor/editcmd.c:3140 src/editor/editcmd.c:3155 msgid "Insert file" msgstr "" -#: src/editor/editcmd.c:3125 +#: src/editor/editcmd.c:3155 msgid "Cannot insert file" msgstr "" -#: src/editor/editcmd.c:3146 +#: src/editor/editcmd.c:3176 msgid "Sort block" msgstr "" -#: src/editor/editcmd.c:3146 +#: src/editor/editcmd.c:3176 msgid "You must first highlight a block of text" msgstr "" -#: src/editor/editcmd.c:3154 +#: src/editor/editcmd.c:3184 msgid "Run sort" msgstr "" -#: src/editor/editcmd.c:3155 +#: src/editor/editcmd.c:3185 msgid "Enter sort options (see manpage) separated by whitespace:" msgstr "" -#: src/editor/editcmd.c:3175 src/editor/editcmd.c:3182 +#: src/editor/editcmd.c:3205 src/editor/editcmd.c:3212 msgid "Sort" msgstr "" -#: src/editor/editcmd.c:3175 +#: src/editor/editcmd.c:3205 msgid "Cannot execute sort command" msgstr "" -#: src/editor/editcmd.c:3181 +#: src/editor/editcmd.c:3211 #, c-format msgid "Sort returned non-zero: %s" msgstr "" -#: src/editor/editcmd.c:3216 +#: src/editor/editcmd.c:3246 msgid "Paste output of external command" msgstr "" -#: src/editor/editcmd.c:3217 +#: src/editor/editcmd.c:3247 msgid "Enter shell command(s):" msgstr "" -#: src/editor/editcmd.c:3234 +#: src/editor/editcmd.c:3264 msgid "External command" msgstr "" -#: src/editor/editcmd.c:3234 +#: src/editor/editcmd.c:3264 msgid "Cannot execute command" msgstr "" -#: src/editor/editcmd.c:3278 +#: src/editor/editcmd.c:3308 msgid "mail -s -c " msgstr "" -#: src/editor/editcmd.c:3279 +#: src/editor/editcmd.c:3309 msgid "To" msgstr "" -#: src/editor/editcmd.c:3282 +#: src/editor/editcmd.c:3312 msgid "Subject" msgstr "" -#: src/editor/editcmd.c:3285 +#: src/editor/editcmd.c:3315 msgid "Copies to" msgstr "" -#: src/editor/editcmd.c:3295 +#: src/editor/editcmd.c:3325 msgid "Mail" msgstr "" -#: src/editor/editcmd.c:3399 +#: src/editor/editcmd.c:3429 msgid "Insert literal" msgstr "" -#: src/editor/editcmd.c:3400 +#: src/editor/editcmd.c:3430 msgid "Press any key:" msgstr "" -#: src/editor/editcmd.c:3437 src/editor/editcmd.c:3466 +#: src/editor/editcmd.c:3467 src/editor/editcmd.c:3496 msgid "" "Current text was modified without a file save.\n" "Continue discards these changes" @@ -1726,7 +1738,7 @@ msgid "" "Continue discards these changes." msgstr "" -#: src/editor/editdraw.c:269 src/editor/editwidget.c:341 +#: src/editor/editdraw.c:269 src/editor/editwidget.c:317 msgid "NoName" msgstr "" @@ -1742,285 +1754,289 @@ msgstr "" msgid "&Close" msgstr "" -#: src/editor/editmenu.c:78 +#: src/editor/editmenu.c:76 +msgid "&History..." +msgstr "" + +#: src/editor/editmenu.c:79 msgid "Save &as..." msgstr "" -#: src/editor/editmenu.c:80 +#: src/editor/editmenu.c:81 msgid "&Insert file..." msgstr "" -#: src/editor/editmenu.c:81 +#: src/editor/editmenu.c:82 msgid "Cop&y to file..." msgstr "" -#: src/editor/editmenu.c:83 +#: src/editor/editmenu.c:84 msgid "&User menu..." msgstr "" -#: src/editor/editmenu.c:85 +#: src/editor/editmenu.c:86 msgid "A&bout..." msgstr "" -#: src/editor/editmenu.c:87 src/filemanager/find.c:194 +#: src/editor/editmenu.c:88 src/filemanager/find.c:194 #: src/subshell/common.c:435 msgid "&Quit" msgstr "" -#: src/editor/editmenu.c:99 +#: src/editor/editmenu.c:100 msgid "&Undo" msgstr "" -#: src/editor/editmenu.c:100 +#: src/editor/editmenu.c:101 msgid "&Redo" msgstr "" -#: src/editor/editmenu.c:103 +#: src/editor/editmenu.c:104 msgid "&Toggle ins/overw" msgstr "" -#: src/editor/editmenu.c:105 +#: src/editor/editmenu.c:106 msgid "To&ggle mark" msgstr "" -#: src/editor/editmenu.c:106 +#: src/editor/editmenu.c:107 msgid "&Mark columns" msgstr "" -#: src/editor/editmenu.c:107 +#: src/editor/editmenu.c:108 msgid "Mark &all" msgstr "" -#: src/editor/editmenu.c:108 +#: src/editor/editmenu.c:109 msgid "Unmar&k" msgstr "" -#: src/editor/editmenu.c:110 +#: src/editor/editmenu.c:111 msgid "Cop&y" msgstr "" -#: src/editor/editmenu.c:111 +#: src/editor/editmenu.c:112 msgid "Mo&ve" msgstr "" -#: src/editor/editmenu.c:112 src/filemanager/file.c:2688 -#: src/filemanager/midnight.c:254 +#: src/editor/editmenu.c:113 src/filemanager/file.c:2688 +#: src/filemanager/midnight.c:257 msgid "&Delete" msgstr "" -#: src/editor/editmenu.c:114 +#: src/editor/editmenu.c:115 msgid "Co&py to clipfile" msgstr "" -#: src/editor/editmenu.c:115 +#: src/editor/editmenu.c:116 msgid "&Cut to clipfile" msgstr "" -#: src/editor/editmenu.c:116 +#: src/editor/editmenu.c:117 msgid "Pa&ste from clipfile" msgstr "" -#: src/editor/editmenu.c:118 +#: src/editor/editmenu.c:119 msgid "&Beginning" msgstr "" -#: src/editor/editmenu.c:119 +#: src/editor/editmenu.c:120 msgid "&End" msgstr "" -#: src/editor/editmenu.c:131 +#: src/editor/editmenu.c:132 msgid "&Search..." msgstr "" -#: src/editor/editmenu.c:132 +#: src/editor/editmenu.c:133 msgid "Search &again" msgstr "" -#: src/editor/editmenu.c:133 +#: src/editor/editmenu.c:134 msgid "&Replace..." msgstr "" -#: src/editor/editmenu.c:135 +#: src/editor/editmenu.c:136 msgid "&Toggle bookmark" msgstr "" -#: src/editor/editmenu.c:136 +#: src/editor/editmenu.c:137 msgid "&Next bookmark" msgstr "" -#: src/editor/editmenu.c:137 +#: src/editor/editmenu.c:138 msgid "&Prev bookmark" msgstr "" -#: src/editor/editmenu.c:138 +#: src/editor/editmenu.c:139 msgid "&Flush bookmarks" msgstr "" -#: src/editor/editmenu.c:150 +#: src/editor/editmenu.c:151 msgid "&Go to line..." msgstr "" -#: src/editor/editmenu.c:151 +#: src/editor/editmenu.c:152 msgid "&Toggle line state" msgstr "" -#: src/editor/editmenu.c:153 +#: src/editor/editmenu.c:154 msgid "Go to matching &bracket" msgstr "" -#: src/editor/editmenu.c:156 +#: src/editor/editmenu.c:157 msgid "Toggle s&yntax highlighting" msgstr "" -#: src/editor/editmenu.c:158 +#: src/editor/editmenu.c:159 msgid "&Find declaration" msgstr "" -#: src/editor/editmenu.c:160 +#: src/editor/editmenu.c:161 msgid "Back from &declaration" msgstr "" -#: src/editor/editmenu.c:162 +#: src/editor/editmenu.c:163 msgid "For&ward to declaration" msgstr "" -#: src/editor/editmenu.c:165 +#: src/editor/editmenu.c:166 msgid "Encod&ing..." msgstr "" -#: src/editor/editmenu.c:168 +#: src/editor/editmenu.c:169 msgid "&Refresh screen" msgstr "" -#: src/editor/editmenu.c:172 +#: src/editor/editmenu.c:173 msgid "&Start/Stop record macro" msgstr "" -#: src/editor/editmenu.c:173 +#: src/editor/editmenu.c:174 msgid "Delete macr&o..." msgstr "" -#: src/editor/editmenu.c:176 +#: src/editor/editmenu.c:177 msgid "Record/Repeat &actions" msgstr "" -#: src/editor/editmenu.c:181 +#: src/editor/editmenu.c:182 msgid "S&pell check" msgstr "" -#: src/editor/editmenu.c:184 +#: src/editor/editmenu.c:185 msgid "C&heck word" msgstr "" -#: src/editor/editmenu.c:187 +#: src/editor/editmenu.c:188 msgid "Change spelling &language..." msgstr "" -#: src/editor/editmenu.c:192 +#: src/editor/editmenu.c:193 msgid "&Mail..." msgstr "" -#: src/editor/editmenu.c:206 +#: src/editor/editmenu.c:207 msgid "Insert &literal..." msgstr "" -#: src/editor/editmenu.c:207 +#: src/editor/editmenu.c:208 msgid "Insert &date/time" msgstr "" -#: src/editor/editmenu.c:210 +#: src/editor/editmenu.c:211 msgid "&Format paragraph" msgstr "" -#: src/editor/editmenu.c:211 +#: src/editor/editmenu.c:212 msgid "&Sort..." msgstr "" -#: src/editor/editmenu.c:213 +#: src/editor/editmenu.c:214 msgid "&Paste output of..." msgstr "" -#: src/editor/editmenu.c:215 +#: src/editor/editmenu.c:216 msgid "&External formatter" msgstr "" -#: src/editor/editmenu.c:230 src/filemanager/hotlist.c:199 +#: src/editor/editmenu.c:231 src/filemanager/hotlist.c:199 msgid "&Move" msgstr "" -#: src/editor/editmenu.c:231 +#: src/editor/editmenu.c:232 msgid "&Resize" msgstr "" -#: src/editor/editmenu.c:233 +#: src/editor/editmenu.c:234 msgid "&Toggle fullscreen" msgstr "" -#: src/editor/editmenu.c:235 +#: src/editor/editmenu.c:236 msgid "&Next" msgstr "" -#: src/editor/editmenu.c:236 +#: src/editor/editmenu.c:237 msgid "&Previous" msgstr "" -#: src/editor/editmenu.c:237 +#: src/editor/editmenu.c:238 msgid "&List..." msgstr "" -#: src/editor/editmenu.c:249 +#: src/editor/editmenu.c:250 msgid "&General..." msgstr "" -#: src/editor/editmenu.c:250 +#: src/editor/editmenu.c:251 msgid "Save &mode..." msgstr "" -#: src/editor/editmenu.c:251 src/filemanager/midnight.c:340 +#: src/editor/editmenu.c:252 src/filemanager/midnight.c:347 msgid "Learn &keys..." msgstr "" -#: src/editor/editmenu.c:253 +#: src/editor/editmenu.c:254 msgid "Syntax &highlighting..." msgstr "" -#: src/editor/editmenu.c:255 +#: src/editor/editmenu.c:256 msgid "S&yntax file" msgstr "" -#: src/editor/editmenu.c:256 +#: src/editor/editmenu.c:257 msgid "&Menu file" msgstr "" -#: src/editor/editmenu.c:258 src/filemanager/midnight.c:345 +#: src/editor/editmenu.c:259 src/filemanager/midnight.c:352 msgid "&Save setup" msgstr "" -#: src/editor/editmenu.c:282 src/filemanager/midnight.c:357 +#: src/editor/editmenu.c:283 src/filemanager/midnight.c:364 msgid "&File" msgstr "" -#: src/editor/editmenu.c:284 src/filemanager/midnight.c:240 +#: src/editor/editmenu.c:285 src/filemanager/midnight.c:243 msgid "&Edit" msgstr "" -#: src/editor/editmenu.c:286 +#: src/editor/editmenu.c:287 msgid "&Search" msgstr "" -#: src/editor/editmenu.c:289 src/filemanager/midnight.c:359 +#: src/editor/editmenu.c:290 src/filemanager/midnight.c:366 msgid "&Command" msgstr "" -#: src/editor/editmenu.c:292 +#: src/editor/editmenu.c:293 msgid "For&mat" msgstr "" -#: src/editor/editmenu.c:294 +#: src/editor/editmenu.c:295 msgid "&Window" msgstr "" -#: src/editor/editmenu.c:296 src/filemanager/midnight.c:361 +#: src/editor/editmenu.c:297 src/filemanager/midnight.c:368 msgid "&Options" msgstr "" @@ -2061,7 +2077,7 @@ msgid "Tab spacing:" msgstr "" #: src/editor/editoptions.c:164 src/filemanager/boxes.c:536 -#: src/filemanager/layout.c:451 +#: src/filemanager/layout.c:454 msgid "Other options" msgstr "" @@ -2113,50 +2129,50 @@ msgstr "" msgid "Editor options" msgstr "" -#: src/editor/editwidget.c:145 +#: src/editor/editwidget.c:146 msgid "" "A user friendly text editor\n" "written for the Midnight Commander." msgstr "" -#: src/editor/editwidget.c:148 +#: src/editor/editwidget.c:149 msgid "Copyright (C) 1996-2019 the Free Software Foundation" msgstr "" -#: src/editor/editwidget.c:157 +#: src/editor/editwidget.c:158 msgid "About" msgstr "" -#: src/editor/editwidget.c:332 +#: src/editor/editwidget.c:308 msgid "Open files" msgstr "" -#: src/editor/editwidget.c:395 src/editor/editwidget.c:398 +#: src/editor/editwidget.c:371 src/editor/editwidget.c:374 msgid "Edit: " msgstr "" -#: src/editor/editwidget.c:684 +#: src/editor/editwidget.c:663 msgid "ButtonBar|Mark" msgstr "" -#: src/editor/editwidget.c:685 +#: src/editor/editwidget.c:664 msgid "ButtonBar|Replac" msgstr "" -#: src/editor/editwidget.c:686 src/filemanager/midnight.c:1605 +#: src/editor/editwidget.c:665 src/filemanager/midnight.c:1655 #: src/filemanager/tree.c:1172 msgid "ButtonBar|Copy" msgstr "" -#: src/editor/editwidget.c:687 +#: src/editor/editwidget.c:666 msgid "ButtonBar|Move" msgstr "" -#: src/editor/editwidget.c:689 src/filemanager/midnight.c:1608 +#: src/editor/editwidget.c:668 src/filemanager/midnight.c:1658 msgid "ButtonBar|Delete" msgstr "" -#: src/editor/editwidget.c:690 src/filemanager/midnight.c:1609 +#: src/editor/editwidget.c:669 src/filemanager/midnight.c:1659 msgid "ButtonBar|PullDn" msgstr "" @@ -2314,7 +2330,13 @@ msgstr "" msgid "The shell is already running a command" msgstr "" -#: src/execute.c:491 +#: src/execute.c:464 +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + +#: src/execute.c:503 msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2403,7 +2425,7 @@ msgstr "" msgid "Running" msgstr "" -#: src/filemanager/boxes.c:434 src/filemanager/find.c:1593 +#: src/filemanager/boxes.c:434 src/filemanager/find.c:1594 msgid "Stopped" msgstr "" @@ -2934,7 +2956,7 @@ msgstr "" msgid "" msgstr "" -#: src/filemanager/cmd.c:118 +#: src/filemanager/cmd.c:120 msgid "Enter machine name (F1 for details):" msgstr "" @@ -2942,89 +2964,89 @@ msgstr "" msgid "Files tagged, want to cd?" msgstr "" -#: src/filemanager/cmd.c:147 src/filemanager/cmd.c:1139 -#: src/filemanager/panel.c:2796 src/filemanager/panel.c:3368 +#: src/filemanager/cmd.c:145 src/filemanager/cmd.c:1139 +#: src/filemanager/panel.c:2796 src/filemanager/panel.c:3374 msgid "Cannot change directory" msgstr "" -#: src/filemanager/cmd.c:198 +#: src/filemanager/cmd.c:196 msgid "Filter" msgstr "" -#: src/filemanager/cmd.c:199 +#: src/filemanager/cmd.c:197 msgid "Set expression for filtering filenames" msgstr "" -#: src/filemanager/cmd.c:360 +#: src/filemanager/cmd.c:355 #, c-format msgid "Link %s to:" msgstr "" -#: src/filemanager/cmd.c:362 +#: src/filemanager/cmd.c:357 msgid "Link" msgstr "" -#: src/filemanager/cmd.c:370 +#: src/filemanager/cmd.c:366 #, c-format msgid "link: %s" msgstr "" -#: src/filemanager/cmd.c:408 +#: src/filemanager/cmd.c:405 #, c-format msgid "symlink: %s" msgstr "" -#: src/filemanager/cmd.c:468 src/filemanager/panel.c:4709 +#: src/filemanager/cmd.c:465 src/filemanager/panel.c:4748 #, c-format msgid "Cannot chdir to \"%s\"" msgstr "" -#: src/filemanager/cmd.c:631 +#: src/filemanager/cmd.c:628 msgid "View file" msgstr "" -#: src/filemanager/cmd.c:631 +#: src/filemanager/cmd.c:628 msgid "Filename:" msgstr "" -#: src/filemanager/cmd.c:665 +#: src/filemanager/cmd.c:662 msgid "Filtered view" msgstr "" -#: src/filemanager/cmd.c:666 +#: src/filemanager/cmd.c:663 msgid "Filter command and arguments:" msgstr "" -#: src/filemanager/cmd.c:754 +#: src/filemanager/cmd.c:751 msgid "Edit file" msgstr "" -#: src/filemanager/cmd.c:842 +#: src/filemanager/cmd.c:843 msgid "Create a new Directory" msgstr "" -#: src/filemanager/cmd.c:843 +#: src/filemanager/cmd.c:844 msgid "Enter directory name:" msgstr "" -#: src/filemanager/cmd.c:958 +#: src/filemanager/cmd.c:957 msgid "Extension file edit" msgstr "" -#: src/filemanager/cmd.c:959 +#: src/filemanager/cmd.c:958 msgid "Which extension file you want to edit?" msgstr "" -#: src/filemanager/cmd.c:960 src/filemanager/cmd.c:1000 -#: src/filemanager/cmd.c:1061 +#: src/filemanager/cmd.c:959 src/filemanager/cmd.c:1000 +#: src/filemanager/cmd.c:1058 msgid "&System Wide" msgstr "" -#: src/filemanager/cmd.c:1059 +#: src/filemanager/cmd.c:1056 msgid "Highlighting groups file edit" msgstr "" -#: src/filemanager/cmd.c:1060 +#: src/filemanager/cmd.c:1057 msgid "Which highlighting file you want to edit?" msgstr "" @@ -3048,83 +3070,77 @@ msgstr "" msgid "&Thorough" msgstr "" -#: src/filemanager/cmd.c:1171 +#: src/filemanager/cmd.c:1170 msgid "" "Both panels should be in the listing mode\n" "to use this command" msgstr "" -#: src/filemanager/cmd.c:1219 -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - -#: src/filemanager/cmd.c:1251 +#: src/filemanager/cmd.c:1228 #, c-format msgid "'%s' is not a symbolic link" msgstr "" -#: src/filemanager/cmd.c:1264 +#: src/filemanager/cmd.c:1241 #, c-format msgid "Symlink '%s' points to:" msgstr "" -#: src/filemanager/cmd.c:1266 +#: src/filemanager/cmd.c:1243 msgid "Edit symlink" msgstr "" -#: src/filemanager/cmd.c:1279 +#: src/filemanager/cmd.c:1256 #, c-format msgid "edit symlink, unable to remove %s: %s" msgstr "" -#: src/filemanager/cmd.c:1287 +#: src/filemanager/cmd.c:1264 #, c-format msgid "edit symlink: %s" msgstr "" -#: src/filemanager/cmd.c:1332 +#: src/filemanager/cmd.c:1309 msgid "FTP to machine" msgstr "" -#: src/filemanager/cmd.c:1343 +#: src/filemanager/cmd.c:1320 msgid "SFTP to machine" msgstr "" -#: src/filemanager/cmd.c:1355 +#: src/filemanager/cmd.c:1332 msgid "Shell link to machine" msgstr "" -#: src/filemanager/cmd.c:1367 +#: src/filemanager/cmd.c:1344 msgid "SMB link to machine" msgstr "" -#: src/filemanager/cmd.c:1378 +#: src/filemanager/cmd.c:1355 msgid "Undelete files on an ext2 file system" msgstr "" -#: src/filemanager/cmd.c:1379 +#: src/filemanager/cmd.c:1356 msgid "" "Enter device (without /dev/) to undelete\n" "files on: (F1 for details)" msgstr "" -#: src/filemanager/cmd.c:1445 src/filemanager/cmd.c:1480 +#: src/filemanager/cmd.c:1424 src/filemanager/cmd.c:1459 #: src/filemanager/file.c:760 msgid "Directory scanning" msgstr "" -#: src/filemanager/cmd.c:1526 src/filemanager/cmd.c:1528 +#: src/filemanager/cmd.c:1505 src/filemanager/cmd.c:1507 msgid "Setup" msgstr "" -#: src/filemanager/cmd.c:1526 +#: src/filemanager/cmd.c:1505 #, c-format msgid "Setup saved to %s" msgstr "" -#: src/filemanager/cmd.c:1528 +#: src/filemanager/cmd.c:1507 #, c-format msgid "Unable to save setup to %s" msgstr "" @@ -3133,7 +3149,7 @@ msgstr "" msgid "Cannot execute commands on non-local filesystems" msgstr "" -#: src/filemanager/command.c:447 src/filemanager/panel.c:3659 +#: src/filemanager/command.c:447 src/filemanager/panel.c:3665 #: src/filemanager/tree.c:585 #, c-format msgid "" @@ -3141,10 +3157,6 @@ msgid "" "%s" msgstr "" -#: src/filemanager/dir.c:647 src/filemanager/dir.c:708 -msgid "Cannot read directory contents" -msgstr "" - #: src/filemanager/ext.c:245 src/usermenu.c:476 msgid "Parameter" msgstr "" @@ -3764,7 +3776,7 @@ msgstr "" msgid "Fir&st hit" msgstr "" -#: src/filemanager/find.c:599 src/filemanager/midnight.c:200 +#: src/filemanager/find.c:599 src/filemanager/midnight.c:203 msgid "&Tree" msgstr "" @@ -3780,33 +3792,33 @@ msgstr "" msgid "Ena&ble ignore directories:" msgstr "" -#: src/filemanager/find.c:1032 src/filemanager/find.c:1125 +#: src/filemanager/find.c:1032 src/filemanager/find.c:1126 #, c-format msgid "Grepping in %s" msgstr "" -#: src/filemanager/find.c:1307 +#: src/filemanager/find.c:1306 msgid "Finished" msgstr "" -#: src/filemanager/find.c:1313 +#: src/filemanager/find.c:1312 #, c-format msgid "Finished (ignored %zu directory)" msgid_plural "Finished (ignored %zu directories)" msgstr[0] "" msgstr[1] "" -#: src/filemanager/find.c:1507 +#: src/filemanager/find.c:1508 #, c-format msgid "Find File: \"%s\". Content: \"%s\"" msgstr "" -#: src/filemanager/find.c:1510 +#: src/filemanager/find.c:1511 #, c-format msgid "Find File: \"%s\"" msgstr "" -#: src/filemanager/find.c:1593 src/filemanager/find.c:1673 +#: src/filemanager/find.c:1594 src/filemanager/find.c:1674 msgid "Searching" msgstr "" @@ -4060,307 +4072,311 @@ msgstr "" msgid "&Show free space" msgstr "" -#: src/filemanager/layout.c:449 +#: src/filemanager/layout.c:452 msgid "Panel split" msgstr "" -#: src/filemanager/layout.c:450 +#: src/filemanager/layout.c:453 msgid "Console output" msgstr "" -#: src/filemanager/layout.c:454 +#: src/filemanager/layout.c:457 msgid "&Vertical" msgstr "" -#: src/filemanager/layout.c:455 +#: src/filemanager/layout.c:458 msgid "&Horizontal" msgstr "" -#: src/filemanager/layout.c:461 +#: src/filemanager/layout.c:464 msgid "Output lines:" msgstr "" -#: src/filemanager/layout.c:514 +#: src/filemanager/layout.c:517 msgid "Layout" msgstr "" -#: src/filemanager/midnight.c:197 +#: src/filemanager/midnight.c:200 msgid "File listin&g" msgstr "" -#: src/filemanager/midnight.c:198 +#: src/filemanager/midnight.c:201 msgid "&Quick view" msgstr "" -#: src/filemanager/midnight.c:199 +#: src/filemanager/midnight.c:202 msgid "&Info" msgstr "" -#: src/filemanager/midnight.c:204 +#: src/filemanager/midnight.c:207 msgid "&Listing format..." msgstr "" -#: src/filemanager/midnight.c:205 +#: src/filemanager/midnight.c:208 msgid "&Sort order..." msgstr "" -#: src/filemanager/midnight.c:206 +#: src/filemanager/midnight.c:209 msgid "&Filter..." msgstr "" -#: src/filemanager/midnight.c:208 +#: src/filemanager/midnight.c:211 msgid "&Encoding..." msgstr "" -#: src/filemanager/midnight.c:212 +#: src/filemanager/midnight.c:215 msgid "FT&P link..." msgstr "" -#: src/filemanager/midnight.c:215 +#: src/filemanager/midnight.c:218 msgid "S&hell link..." msgstr "" -#: src/filemanager/midnight.c:218 +#: src/filemanager/midnight.c:221 msgid "S&FTP link..." msgstr "" -#: src/filemanager/midnight.c:221 +#: src/filemanager/midnight.c:224 msgid "SM&B link..." msgstr "" -#: src/filemanager/midnight.c:223 +#: src/filemanager/midnight.c:226 msgid "Paneli&ze" msgstr "" -#: src/filemanager/midnight.c:225 +#: src/filemanager/midnight.c:228 msgid "&Rescan" msgstr "" -#: src/filemanager/midnight.c:237 +#: src/filemanager/midnight.c:240 msgid "&View" msgstr "" -#: src/filemanager/midnight.c:238 +#: src/filemanager/midnight.c:241 msgid "Vie&w file..." msgstr "" -#: src/filemanager/midnight.c:239 +#: src/filemanager/midnight.c:242 msgid "&Filtered view" msgstr "" -#: src/filemanager/midnight.c:241 +#: src/filemanager/midnight.c:244 msgid "&Copy" msgstr "" -#: src/filemanager/midnight.c:242 +#: src/filemanager/midnight.c:245 msgid "C&hmod" msgstr "" -#: src/filemanager/midnight.c:243 +#: src/filemanager/midnight.c:246 msgid "&Link" msgstr "" -#: src/filemanager/midnight.c:244 +#: src/filemanager/midnight.c:247 msgid "&Symlink" msgstr "" -#: src/filemanager/midnight.c:247 +#: src/filemanager/midnight.c:250 msgid "Relative symlin&k" msgstr "" -#: src/filemanager/midnight.c:248 +#: src/filemanager/midnight.c:251 msgid "Edit s&ymlink" msgstr "" -#: src/filemanager/midnight.c:249 +#: src/filemanager/midnight.c:252 msgid "Ch&own" msgstr "" -#: src/filemanager/midnight.c:251 +#: src/filemanager/midnight.c:254 msgid "&Advanced chown" msgstr "" -#: src/filemanager/midnight.c:252 +#: src/filemanager/midnight.c:255 msgid "&Rename/Move" msgstr "" -#: src/filemanager/midnight.c:253 +#: src/filemanager/midnight.c:256 msgid "&Mkdir" msgstr "" -#: src/filemanager/midnight.c:255 +#: src/filemanager/midnight.c:258 msgid "&Quick cd" msgstr "" -#: src/filemanager/midnight.c:257 +#: src/filemanager/midnight.c:260 msgid "Select &group" msgstr "" -#: src/filemanager/midnight.c:258 +#: src/filemanager/midnight.c:261 msgid "U&nselect group" msgstr "" -#: src/filemanager/midnight.c:259 +#: src/filemanager/midnight.c:262 msgid "&Invert selection" msgstr "" -#: src/filemanager/midnight.c:261 +#: src/filemanager/midnight.c:264 msgid "E&xit" msgstr "" -#: src/filemanager/midnight.c:277 +#: src/filemanager/midnight.c:280 msgid "&User menu" msgstr "" -#: src/filemanager/midnight.c:278 +#: src/filemanager/midnight.c:281 msgid "&Directory tree" msgstr "" -#: src/filemanager/midnight.c:279 +#: src/filemanager/midnight.c:282 msgid "&Find file" msgstr "" -#: src/filemanager/midnight.c:280 +#: src/filemanager/midnight.c:283 msgid "S&wap panels" msgstr "" -#: src/filemanager/midnight.c:281 +#: src/filemanager/midnight.c:284 msgid "Switch &panels on/off" msgstr "" -#: src/filemanager/midnight.c:283 +#: src/filemanager/midnight.c:286 msgid "&Compare directories" msgstr "" -#: src/filemanager/midnight.c:285 +#: src/filemanager/midnight.c:288 msgid "C&ompare files" msgstr "" -#: src/filemanager/midnight.c:288 +#: src/filemanager/midnight.c:291 msgid "E&xternal panelize" msgstr "" -#: src/filemanager/midnight.c:289 +#: src/filemanager/midnight.c:292 msgid "Show directory s&izes" msgstr "" -#: src/filemanager/midnight.c:291 +#: src/filemanager/midnight.c:294 msgid "Command &history" msgstr "" -#: src/filemanager/midnight.c:292 -msgid "Di&rectory hotlist" -msgstr "" - -#: src/filemanager/midnight.c:294 -msgid "&Active VFS list" -msgstr "" - #: src/filemanager/midnight.c:297 -msgid "&Background jobs" +msgid "Viewed/edited files hi&story" msgstr "" #: src/filemanager/midnight.c:299 -msgid "Screen lis&t" +msgid "Di&rectory hotlist" +msgstr "" + +#: src/filemanager/midnight.c:301 +msgid "&Active VFS list" msgstr "" #: src/filemanager/midnight.c:304 +msgid "&Background jobs" +msgstr "" + +#: src/filemanager/midnight.c:306 +msgid "Screen lis&t" +msgstr "" + +#: src/filemanager/midnight.c:311 msgid "&Undelete files (ext2fs only)" msgstr "" -#: src/filemanager/midnight.c:307 +#: src/filemanager/midnight.c:314 msgid "&Listing format edit" msgstr "" -#: src/filemanager/midnight.c:314 +#: src/filemanager/midnight.c:321 msgid "Edit &extension file" msgstr "" -#: src/filemanager/midnight.c:315 +#: src/filemanager/midnight.c:322 msgid "Edit &menu file" msgstr "" -#: src/filemanager/midnight.c:318 +#: src/filemanager/midnight.c:325 msgid "Edit hi&ghlighting group file" msgstr "" -#: src/filemanager/midnight.c:331 +#: src/filemanager/midnight.c:338 msgid "&Configuration..." msgstr "" -#: src/filemanager/midnight.c:332 +#: src/filemanager/midnight.c:339 msgid "&Layout..." msgstr "" -#: src/filemanager/midnight.c:333 +#: src/filemanager/midnight.c:340 msgid "&Panel options..." msgstr "" -#: src/filemanager/midnight.c:335 +#: src/filemanager/midnight.c:342 msgid "C&onfirmation..." msgstr "" -#: src/filemanager/midnight.c:337 +#: src/filemanager/midnight.c:344 msgid "&Appearance..." msgstr "" -#: src/filemanager/midnight.c:339 +#: src/filemanager/midnight.c:346 msgid "&Display bits..." msgstr "" -#: src/filemanager/midnight.c:342 +#: src/filemanager/midnight.c:349 msgid "&Virtual FS..." msgstr "" -#: src/filemanager/midnight.c:444 +#: src/filemanager/midnight.c:451 msgid "Panels:" msgstr "" -#: src/filemanager/midnight.c:1015 +#: src/filemanager/midnight.c:1064 #, 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/midnight.c:1018 src/filemanager/midnight.c:1024 +#: src/filemanager/midnight.c:1067 src/filemanager/midnight.c:1073 #: src/filemanager/panel.c:2817 msgid "The Midnight Commander" msgstr "" -#: src/filemanager/midnight.c:1025 +#: src/filemanager/midnight.c:1074 msgid "Do you really want to quit the Midnight Commander?" msgstr "" -#: src/filemanager/midnight.c:1590 +#: src/filemanager/midnight.c:1640 msgid "&Above" msgstr "" -#: src/filemanager/midnight.c:1590 +#: src/filemanager/midnight.c:1640 msgid "&Left" msgstr "" -#: src/filemanager/midnight.c:1591 +#: src/filemanager/midnight.c:1641 msgid "&Below" msgstr "" -#: src/filemanager/midnight.c:1591 +#: src/filemanager/midnight.c:1641 msgid "&Right" msgstr "" -#: src/filemanager/midnight.c:1602 +#: src/filemanager/midnight.c:1652 msgid "ButtonBar|Menu" msgstr "" -#: src/filemanager/midnight.c:1603 src/viewer/display.c:90 +#: src/filemanager/midnight.c:1653 src/viewer/display.c:90 msgid "ButtonBar|View" msgstr "" -#: src/filemanager/midnight.c:1606 src/filemanager/tree.c:1173 +#: src/filemanager/midnight.c:1656 src/filemanager/tree.c:1173 msgid "ButtonBar|RenMov" msgstr "" -#: src/filemanager/midnight.c:1607 src/filemanager/tree.c:1176 +#: src/filemanager/midnight.c:1657 src/filemanager/tree.c:1176 msgid "ButtonBar|Mkdir" msgstr "" @@ -4541,7 +4557,12 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" -#: src/filemanager/panel.c:4465 +#: src/filemanager/panel.c:3282 src/filemanager/panel.c:4402 +#: src/filemanager/panel.c:4450 src/viewer/actions_cmd.c:332 +msgid "Cannot read directory contents" +msgstr "" + +#: src/filemanager/panel.c:4504 msgid "User supplied format looks invalid, reverting to default." msgstr "" @@ -5000,18 +5021,18 @@ msgid "" "%s" msgstr "" -#: src/vfs/extfs/extfs.c:651 +#: src/vfs/extfs/extfs.c:626 #, c-format msgid "" "Cannot open %s archive\n" "%s" msgstr "" -#: src/vfs/extfs/extfs.c:656 src/vfs/extfs/extfs.c:661 +#: src/vfs/extfs/extfs.c:631 src/vfs/extfs/extfs.c:636 msgid "Inconsistent extfs archive" msgstr "" -#: src/vfs/extfs/extfs.c:1441 +#: src/vfs/extfs/extfs.c:1416 #, c-format msgid "Warning: cannot open %s directory\n" msgstr "" @@ -5021,74 +5042,74 @@ msgstr "" msgid "fish: Disconnecting from %s" msgstr "" -#: src/vfs/fish/fish.c:561 +#: src/vfs/fish/fish.c:560 msgid "fish: Waiting for initial line..." msgstr "" -#: src/vfs/fish/fish.c:571 +#: src/vfs/fish/fish.c:570 msgid "Sorry, we cannot do password authenticated connections for now." msgstr "" -#: src/vfs/fish/fish.c:579 +#: src/vfs/fish/fish.c:578 #, c-format msgid "fish: Password is required for %s" msgstr "" -#: src/vfs/fish/fish.c:587 +#: src/vfs/fish/fish.c:586 msgid "fish: Sending password..." msgstr "" -#: src/vfs/fish/fish.c:624 +#: src/vfs/fish/fish.c:623 msgid "fish: Sending initial line..." msgstr "" -#: src/vfs/fish/fish.c:635 +#: src/vfs/fish/fish.c:634 msgid "fish: Handshaking version..." msgstr "" -#: src/vfs/fish/fish.c:646 +#: src/vfs/fish/fish.c:645 msgid "fish: Getting host info..." msgstr "" -#: src/vfs/fish/fish.c:768 +#: src/vfs/fish/fish.c:767 #, c-format msgid "fish: Reading directory %s..." msgstr "" -#: src/vfs/fish/fish.c:953 src/vfs/ftpfs/ftpfs.c:1845 +#: src/vfs/fish/fish.c:952 src/vfs/ftpfs/ftpfs.c:1845 #: src/vfs/undelfs/undelfs.c:392 #, c-format msgid "%s: done." msgstr "" -#: src/vfs/fish/fish.c:960 src/vfs/ftpfs/ftpfs.c:1792 +#: src/vfs/fish/fish.c:959 src/vfs/ftpfs/ftpfs.c:1792 #: src/vfs/undelfs/undelfs.c:395 #, c-format msgid "%s: failure" msgstr "" -#: src/vfs/fish/fish.c:1018 +#: src/vfs/fish/fish.c:1017 #, c-format msgid "fish: store %s: sending command..." msgstr "" -#: src/vfs/fish/fish.c:1042 +#: src/vfs/fish/fish.c:1041 msgid "fish: Local read failed, sending zeros" msgstr "" -#: src/vfs/fish/fish.c:1061 +#: src/vfs/fish/fish.c:1060 msgid "fish: storing file" msgstr "" -#: src/vfs/fish/fish.c:1131 +#: src/vfs/fish/fish.c:1130 msgid "Aborting transfer..." msgstr "" -#: src/vfs/fish/fish.c:1147 +#: src/vfs/fish/fish.c:1146 msgid "Error reported after abort." msgstr "" -#: src/vfs/fish/fish.c:1149 +#: src/vfs/fish/fish.c:1148 msgid "Aborted transfer would be successful." msgstr "" @@ -5253,48 +5274,48 @@ msgstr "" msgid "sftp: Unable to get current user name." msgstr "" -#: src/vfs/sftpfs/connection.c:78 src/vfs/sftpfs/vfs_subclass.c:116 +#: src/vfs/sftpfs/connection.c:82 src/vfs/sftpfs/vfs_subclass.c:116 msgid "sftp: Invalid host name." msgstr "" -#: src/vfs/sftpfs/connection.c:110 src/vfs/sftpfs/connection.c:126 +#: src/vfs/sftpfs/connection.c:114 src/vfs/sftpfs/connection.c:130 #, c-format msgid "sftp: %s" msgstr "" -#: src/vfs/sftpfs/connection.c:131 +#: src/vfs/sftpfs/connection.c:135 #, c-format msgid "sftp: making connection to %s" msgstr "" -#: src/vfs/sftpfs/connection.c:141 +#: src/vfs/sftpfs/connection.c:145 msgid "sftp: connection interrupted by user" msgstr "" -#: src/vfs/sftpfs/connection.c:143 +#: src/vfs/sftpfs/connection.c:147 #, c-format msgid "sftp: connection to server failed: %s" msgstr "" -#: src/vfs/sftpfs/connection.c:277 +#: src/vfs/sftpfs/connection.c:281 #, c-format msgid "sftp: Enter passphrase for %s " msgstr "" -#: src/vfs/sftpfs/connection.c:282 +#: src/vfs/sftpfs/connection.c:286 msgid "sftp: Passphrase is empty." msgstr "" -#: src/vfs/sftpfs/connection.c:326 +#: src/vfs/sftpfs/connection.c:391 #, c-format msgid "sftp: Enter password for %s " msgstr "" -#: src/vfs/sftpfs/connection.c:331 +#: src/vfs/sftpfs/connection.c:396 msgid "sftp: Password is empty." msgstr "" -#: src/vfs/sftpfs/connection.c:394 +#: src/vfs/sftpfs/connection.c:475 msgid "sftp: Failure establishing SSH session" msgstr "" @@ -5462,19 +5483,19 @@ msgstr "" msgid "Ext2lib error" msgstr "" -#: src/viewer/actions_cmd.c:427 +#: src/viewer/actions_cmd.c:461 msgid "Invalid value" msgstr "" -#: src/viewer/actions_cmd.c:628 +#: src/viewer/actions_cmd.c:655 msgid "File was modified. Save with exit?" msgstr "" -#: src/viewer/actions_cmd.c:629 +#: src/viewer/actions_cmd.c:656 msgid "&Cancel quit" msgstr "" -#: src/viewer/actions_cmd.c:634 +#: src/viewer/actions_cmd.c:661 msgid "" "Midnight Commander is being shut down.\n" "Save modified file?" @@ -5566,18 +5587,18 @@ msgstr "" msgid "View: " msgstr "" -#: src/viewer/mcviewer.c:324 +#: src/viewer/mcviewer.c:327 #, c-format msgid "" "Cannot open \"%s\"\n" "%s" msgstr "" -#: src/viewer/mcviewer.c:354 +#: src/viewer/mcviewer.c:357 msgid "Cannot view: not a regular file" msgstr "" -#: src/viewer/mcviewer.c:389 +#: src/viewer/mcviewer.c:392 #, c-format msgid "" "Cannot open \"%s\" in parse mode\n" diff --git a/po/mn.po b/po/mn.po index f1d342126..0e62b0c2c 100644 --- a/po/mn.po +++ b/po/mn.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Mongolian (http://www.transifex.com/mc/mc/language/mn/)\n" @@ -459,6 +459,15 @@ msgstr "" msgid "The TERM environment variable is unset!\n" msgstr "TERM хувьсагч утга аваагүй байна!\n" +msgid "Cannot create pipe for SIGWINCH" +msgstr "" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1284,6 +1293,9 @@ msgstr "" msgid "&Close" msgstr "" +msgid "&History..." +msgstr "" + msgid "Save &as..." msgstr "" @@ -1712,6 +1724,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2261,11 +2278,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2328,9 +2340,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "Хавтасны доторхыг уншиж чадсангүй" - msgid "Parameter" msgstr "" @@ -3198,6 +3207,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3423,6 +3435,9 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "Хавтасны доторхыг уншиж чадсангүй" + msgid "User supplied format looks invalid, reverting to default." msgstr "Хэрэглэж байгаа формат буруу байна, тиймээс стандарт руугаа буцлаа." diff --git a/po/nb.po b/po/nb.po index 774c69a7b..a8a82a7ad 100644 --- a/po/nb.po +++ b/po/nb.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/mc/mc/language/" @@ -460,6 +460,15 @@ msgstr "" msgid "The TERM environment variable is unset!\n" msgstr "TERM miljøvariabelen er ikke satt!\n" +msgid "Cannot create pipe for SIGWINCH" +msgstr "" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1285,6 +1294,9 @@ msgstr "" msgid "&Close" msgstr "" +msgid "&History..." +msgstr "" + msgid "Save &as..." msgstr "" @@ -1713,6 +1725,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2262,11 +2279,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2329,9 +2341,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "" - msgid "Parameter" msgstr "" @@ -3199,6 +3208,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3424,6 +3436,9 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "" + msgid "User supplied format looks invalid, reverting to default." msgstr "Oppgitt format ser ut til å være ugyldig. Går tilbake til standard." diff --git a/po/nl.po b/po/nl.po index 0b6b85547..ff3e70d11 100644 --- a/po/nl.po +++ b/po/nl.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Dutch (http://www.transifex.com/mc/mc/language/nl/)\n" @@ -488,6 +488,16 @@ msgstr "Shift" msgid "The TERM environment variable is unset!\n" msgstr "De TERM omgevingsvariabele is niet gezet!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Kan pipe streams niet aanmaken" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1368,6 +1378,10 @@ msgstr "&Nieuw" msgid "&Close" msgstr "&Sluiten" +#, fuzzy +msgid "&History..." +msgstr "Geschiedenis" + msgid "Save &as..." msgstr "&Opslaan als..." @@ -1804,6 +1818,13 @@ msgstr "Er kan geen lokale kopie van %s worden opgehaald" msgid "The shell is already running a command" msgstr "De shell voert al een opdracht uit" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"Geen xterm en geen Linux console; \n" +"de vensters kunnen niet geschakeld worden." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Typ 'exit' om naar de Midnight Commander terug te keren" @@ -2364,13 +2385,6 @@ msgstr "" "Beide panelen moeten in de listingsmodus\n" "staan om dit commando te gebruiken" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"Geen xterm en geen Linux console; \n" -"de vensters kunnen niet geschakeld worden." - #, c-format msgid "'%s' is not a symbolic link" msgstr "'%s' is geen symbolische link" @@ -2437,9 +2451,6 @@ msgstr "" "Veranderen naar map \"%s\" mislukt \n" "%s " -msgid "Cannot read directory contents" -msgstr "Kan mapinhoud niet lezen" - msgid "Parameter" msgstr "Parameter" @@ -3392,6 +3403,9 @@ msgstr "Toon mappen&grootte" msgid "Command &history" msgstr "&Opdrachtengeschiedenis" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "&Mappen hotslist" @@ -3617,6 +3631,9 @@ msgstr "Selectie wissen" msgid "Do you really want to execute?" msgstr "Wilt u die opdracht echt uitvoeren? " +msgid "Cannot read directory contents" +msgstr "Kan mapinhoud niet lezen" + msgid "User supplied format looks invalid, reverting to default." msgstr "" "Door gebruiker gedefinieerde formaat lijkt onjuist, gebruik de standaard." diff --git a/po/pl.po b/po/pl.po index b9374fda4..3f747eec4 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 15:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish (http://www.transifex.com/mc/mc/language/pl/)\n" @@ -488,6 +488,16 @@ msgstr "Shift" msgid "The TERM environment variable is unset!\n" msgstr "Zmienna środowiskowa TERM nie jest ustawiona.\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Nie można utworzyć strumieni potoku" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1378,6 +1388,10 @@ msgstr "&Nowy" msgid "&Close" msgstr "&Zamknij" +#, fuzzy +msgid "&History..." +msgstr "Historia" + msgid "Save &as..." msgstr "Z&apisz jako…" @@ -1813,6 +1827,13 @@ msgstr "Nie można pobrać lokalnej kopii %s" msgid "The shell is already running a command" msgstr "Powłoka wykonuje już polecenie" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"Panele mogą być przełączane tylko\n" +"na konsoli xterm lub Linux." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Wpisanie „exit” powróci do programu Midnight Commander" @@ -2372,13 +2393,6 @@ msgstr "" "Aby wykorzystać to polecenie, należy ustawić\n" "oba okna na wyświetlanie listy plików" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"Panele mogą być przełączane tylko\n" -"na konsoli xterm lub Linux." - #, c-format msgid "'%s' is not a symbolic link" msgstr "„%s” nie jest dowiązaniem symbolicznym" @@ -2445,9 +2459,6 @@ msgstr "" "Nie można zmienić katalogu na „%s”\n" "%s" -msgid "Cannot read directory contents" -msgstr "Nie można odczytać zawartości katalogu" - msgid "Parameter" msgstr "Parametr" @@ -3408,6 +3419,9 @@ msgstr "Wyśw&ietl rozmiary katalogów" msgid "Command &history" msgstr "&Historia poleceń" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "Lista pod&ręcznych katalogów" @@ -3637,6 +3651,9 @@ msgstr "Odznacz" msgid "Do you really want to execute?" msgstr "Na pewno wykonać?" +msgid "Cannot read directory contents" +msgstr "Nie można odczytać zawartości katalogu" + msgid "User supplied format looks invalid, reverting to default." msgstr "Format użytkownika jest nieprawidłowy, przywrócono domyślny." diff --git a/po/pt.po b/po/pt.po index 4b73353c6..f4ec332d9 100644 --- a/po/pt.po +++ b/po/pt.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-05 11:24+0000\n" "Last-Translator: Gilberto Jorge \n" "Language-Team: Portuguese (http://www.transifex.com/mc/mc/language/pt/)\n" @@ -486,6 +486,16 @@ msgstr "Shift" msgid "The TERM environment variable is unset!\n" msgstr "A variável de ambiente TERM foi limpa!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Não é possível criar streams de pipes" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1374,6 +1384,10 @@ msgstr "&Novo" msgid "&Close" msgstr "&Fechar" +#, fuzzy +msgid "&History..." +msgstr "Histórico" + msgid "Save &as..." msgstr "Guard&ar como..." @@ -1810,6 +1824,13 @@ msgstr "Não é possível obter uma copia local de %s" msgid "The shell is already running a command" msgstr "A shell já está a executar um comando" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"Não é uma consola xterm ou Linux;\n" +"os painéis não podem ser comutados." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Digite 'exit' para voltar ao Midnight Commander" @@ -2369,13 +2390,6 @@ msgstr "" "Ambos os painéis deveriam estar no modo de listagem\n" "para usar este comando" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"Não é uma consola xterm ou Linux;\n" -"os painéis não podem ser comutados." - #, c-format msgid "'%s' is not a symbolic link" msgstr "'%s' não é uma ligação simbólica" @@ -2442,9 +2456,6 @@ msgstr "" "Não é possível chdir para \"%s\"\n" "%s" -msgid "Cannot read directory contents" -msgstr "Não é possível ler conteúdo do diretório" - msgid "Parameter" msgstr "Parâmetro" @@ -3400,6 +3411,9 @@ msgstr "Mostrar tamanho de diretórios" msgid "Command &history" msgstr "&Histórico de comandos" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "Hotlist de di&retórios" @@ -3625,6 +3639,9 @@ msgstr "Cancelar seleção" msgid "Do you really want to execute?" msgstr "Deseja mesmo executar?" +msgid "Cannot read directory contents" +msgstr "Não é possível ler conteúdo do diretório" + msgid "User supplied format looks invalid, reverting to default." msgstr "" "Formato indicado pelo utilizador parece inválido, a reverter para defeito." diff --git a/po/pt_BR.po b/po/pt_BR.po index d5c285d28..9cc9d769b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/mc/mc/language/" @@ -487,6 +487,16 @@ msgstr "Shift" msgid "The TERM environment variable is unset!\n" msgstr "A variável de ambiente TERM não foi definida!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Não é possível criar pipe streams" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1332,6 +1342,10 @@ msgstr "&Novo" msgid "&Close" msgstr "Fechar" +#, fuzzy +msgid "&History..." +msgstr "Histórico" + msgid "Save &as..." msgstr "Salvar &como..." @@ -1766,6 +1780,13 @@ msgstr "Não foi possível adquirir uma cópia local de %s" msgid "The shell is already running a command" msgstr "A shell já está executando um comando" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"Não é um xterm nem console linux;\n" +"Os paines não podem ser ativados." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2323,13 +2344,6 @@ msgstr "" "Ambos painéis deveriam estar no modo de\n" "listagem para usar este comando" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"Não é um xterm nem console linux;\n" -"Os paines não podem ser ativados." - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2392,9 +2406,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "" - msgid "Parameter" msgstr "Parâmetro" @@ -3324,6 +3335,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3549,6 +3563,9 @@ msgstr "Desselecionar" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "" + msgid "User supplied format looks invalid, reverting to default." msgstr "" "Formato disponibilizado pelo usuário parece inválido, voltando ao padrão." diff --git a/po/ro.po b/po/ro.po index ddee1aba6..4cff399cd 100644 --- a/po/ro.po +++ b/po/ro.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-22 13:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-06-20 16:47+0000\n" "Last-Translator: Nicolae Crefelean\n" "Language-Team: Romanian (http://www.transifex.com/mc/mc/language/ro/)\n" @@ -490,6 +490,16 @@ msgstr "Shift" msgid "The TERM environment variable is unset!\n" msgstr "Variabila de mediu TERM nu este setată!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Nu pot crea fluxul filtrului" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1377,6 +1387,10 @@ msgstr "&Nou" msgid "&Close" msgstr "În&chide" +#, fuzzy +msgid "&History..." +msgstr "Istoric" + msgid "Save &as..." msgstr "Salvează c&a..." @@ -1813,6 +1827,13 @@ msgstr "Nu se poate prelua o copie locală a %s" msgid "The shell is already running a command" msgstr "Terminalul deja rulează o comandă" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"Nu este o consolă xterm sau Linux;\n" +"panourile nu pot fi comutate." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Tastați `exit' pentru a reveni în Midnight Commander" @@ -2372,13 +2393,6 @@ msgstr "" "Pentru a utiliza această comandă ambele\n" "trebuie să fie în modul listare" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"Nu este o consolă xterm sau Linux;\n" -"panourile nu pot fi comutate." - #, c-format msgid "'%s' is not a symbolic link" msgstr "'%s' nu este o legătură simbolică" @@ -2445,9 +2459,6 @@ msgstr "" "Nu se poate chdir în \"%s\"\n" "%s" -msgid "Cannot read directory contents" -msgstr "Nu pot citi conținutul dosarului" - msgid "Parameter" msgstr "Parametru" @@ -3403,6 +3414,9 @@ msgstr "Arată mărimea dosarelor" msgid "Command &history" msgstr "&Istoric comenzi" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "Listă rapidă de dosa&re" @@ -3630,6 +3644,9 @@ msgstr "Deselectează" msgid "Do you really want to execute?" msgstr "Chiar dorești să execuți?" +msgid "Cannot read directory contents" +msgstr "Nu pot citi conținutul dosarului" + msgid "User supplied format looks invalid, reverting to default." msgstr "" "Formatul furnizat de utilizator pare invalid, se revine la cel implicit" diff --git a/po/ru.po b/po/ru.po index 23e59c6ef..ba13a5b96 100644 --- a/po/ru.po +++ b/po/ru.po @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-03 23:22+0000\n" "Last-Translator: AlexL \n" "Language-Team: Russian (http://www.transifex.com/mc/mc/language/ru/)\n" @@ -505,6 +505,16 @@ msgstr "Shift" msgid "The TERM environment variable is unset!\n" msgstr "Переменная среды TERM не определена!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Не удалось создать потоки канала" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1394,6 +1404,10 @@ msgstr "&Новый" msgid "&Close" msgstr "&Закрыть" +#, fuzzy +msgid "&History..." +msgstr "История" + msgid "Save &as..." msgstr "Сохранить &как..." @@ -1830,6 +1844,13 @@ msgstr "Невозможно получить локальную копию %s" msgid "The shell is already running a command" msgstr "Интерпретатор занят выполнением команды" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"Это не xterm и не консоль Linux;\n" +"панели не могут быть отключены." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Введите exit для возврата в Midnight Commander" @@ -2389,13 +2410,6 @@ msgstr "" "Для выполнения этой команды\n" "обе панели должны быть в режиме списка" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"Это не xterm и не консоль Linux;\n" -"панели не могут быть отключены." - #, c-format msgid "'%s' is not a symbolic link" msgstr "%s не является символической ссылкой" @@ -2462,9 +2476,6 @@ msgstr "" "Невозможно перейти в \"%s\"\n" "%s" -msgid "Cannot read directory contents" -msgstr "Невозможно прочесть содержимое каталога" - msgid "Parameter" msgstr "Параметр" @@ -3423,6 +3434,9 @@ msgstr "&Размеры каталогов" msgid "Command &history" msgstr "&История командной строки" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "Каталоги &быстрого доступа" @@ -3652,6 +3666,9 @@ msgstr "Снять отметку" msgid "Do you really want to execute?" msgstr "Вы действительно хотите выполнить это?" +msgid "Cannot read directory contents" +msgstr "Невозможно прочесть содержимое каталога" + msgid "User supplied format looks invalid, reverting to default." msgstr "Пользовательский формат выглядит неверным, возвращаю к стандартному." diff --git a/po/sk.po b/po/sk.po index 58a1fa873..40810c9ed 100644 --- a/po/sk.po +++ b/po/sk.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Slovak (http://www.transifex.com/mc/mc/language/sk/)\n" @@ -483,6 +483,16 @@ msgstr "Shift" msgid "The TERM environment variable is unset!\n" msgstr "Premenná prostredia TERM nie je nastavená!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Nemožno vytvoriť toky rúry" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1369,6 +1379,10 @@ msgstr "&Nové" msgid "&Close" msgstr "&Zatvoriť" +#, fuzzy +msgid "&History..." +msgstr "História" + msgid "Save &as..." msgstr "Uložiť &ako..." @@ -1805,6 +1819,13 @@ msgstr "Nemožno stiahnuť lokálnu kópiu %s" msgid "The shell is already running a command" msgstr "Shell už vykonáva príkaz" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"Konzola nie je xterm alebo Linux;\n" +"nemožno prepnúť panely." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Napísaním „exit“ sa vrátite do aplikácie Midnight Commander" @@ -2364,13 +2385,6 @@ msgstr "" "Oba panely by mali byť v režime výpisu,\n" "aby ste mohli použiť tento príkaz" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"Konzola nie je xterm alebo Linux;\n" -"nemožno prepnúť panely." - #, c-format msgid "'%s' is not a symbolic link" msgstr "„%s“ nie je symbolický odkaz" @@ -2437,9 +2451,6 @@ msgstr "" "Nemožno chdir do „%s“\n" "%s" -msgid "Cannot read directory contents" -msgstr "Nepodarilo sa načítať obsah adresára" - msgid "Parameter" msgstr "Parameter" @@ -3389,6 +3400,9 @@ msgstr "Zobraz&iť veľkosť adresárov" msgid "Command &history" msgstr "&História príkazov" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "Hotlist ad&resára" @@ -3618,6 +3632,9 @@ msgstr "Zrušiť výber" msgid "Do you really want to execute?" msgstr "Skutočne chcete spustiť?" +msgid "Cannot read directory contents" +msgstr "Nepodarilo sa načítať obsah adresára" + msgid "User supplied format looks invalid, reverting to default." msgstr "" "Používateľom dodaný formát vyzerá byť neplatný, vraciam sa k predvolenému." diff --git a/po/sl.po b/po/sl.po index dd4c7135b..21eff95a1 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Slovenian (http://www.transifex.com/mc/mc/language/sl/)\n" @@ -469,6 +469,15 @@ msgstr "Shift" msgid "The TERM environment variable is unset!\n" msgstr "TERM okoljska spremenljivka ni nastavljena!\n" +msgid "Cannot create pipe for SIGWINCH" +msgstr "" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1294,6 +1303,9 @@ msgstr "" msgid "&Close" msgstr "" +msgid "&History..." +msgstr "" + msgid "Save &as..." msgstr "" @@ -1722,6 +1734,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2271,11 +2288,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2338,9 +2350,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "Ne morem prebrati vsebine imenika" - msgid "Parameter" msgstr "" @@ -3212,6 +3221,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3441,6 +3453,9 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "Ne morem prebrati vsebine imenika" + msgid "User supplied format looks invalid, reverting to default." msgstr "" "Uporabniško podano oblikovanje izgleda neveljavno, uporabljam privzeto." diff --git a/po/sr.po b/po/sr.po index fda78d8f5..75f4be114 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Serbian (http://www.transifex.com/mc/mc/language/sr/)\n" @@ -477,6 +477,16 @@ msgstr "Помак" msgid "The TERM environment variable is unset!\n" msgstr "Променљива љуске „TERM“ је расподешена!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Не могу да направим токове спојке" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1360,6 +1370,10 @@ msgstr "&Нова" msgid "&Close" msgstr "&Затвори" +#, fuzzy +msgid "&History..." +msgstr "Историјат" + msgid "Save &as..." msgstr "Сачувај &као..." @@ -1796,6 +1810,13 @@ msgstr "Не могу да довучем месни умножак „%s“" msgid "The shell is already running a command" msgstr "Шкољка већ извршава наредбу" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"Није конзоа хтерминала или Линукса;\n" +"панели не могу бити промењени." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Укуцајте „exit“ да се вратите Поноћном нареднику" @@ -2355,13 +2376,6 @@ msgstr "" "Оба панела морају бити у режиму списка\n" "за коришћење ове наредбе" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"Није конзоа хтерминала или Линукса;\n" -"панели не могу бити промењени." - #, c-format msgid "'%s' is not a symbolic link" msgstr "„%s“ није симболичка веза" @@ -2428,9 +2442,6 @@ msgstr "" "Не могу да пређем у директоријум „%s“\n" "%s" -msgid "Cannot read directory contents" -msgstr "Не могу да прочитам садржај директоријума" - msgid "Parameter" msgstr "Параметар" @@ -3377,6 +3388,9 @@ msgstr "Прикажи &величине директоријума" msgid "Command &history" msgstr "Историјат &наредби" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "&Врући списак директоријума" @@ -3604,6 +3618,9 @@ msgstr "Поништите избор" msgid "Do you really want to execute?" msgstr "Да ли стварно желите да извршите?" +msgid "Cannot read directory contents" +msgstr "Не могу да прочитам садржај директоријума" + msgid "User supplied format looks invalid, reverting to default." msgstr "Корисников запис изгледа да је неисправан, враћам на основно." diff --git a/po/sv.po b/po/sv.po index 509b8231d..cd373333c 100644 --- a/po/sv.po +++ b/po/sv.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Swedish (http://www.transifex.com/mc/mc/language/sv/)\n" @@ -488,6 +488,16 @@ msgstr "Skift" msgid "The TERM environment variable is unset!\n" msgstr "Omgivningsvariablen TERM är inte satt!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Tunnelströmmar kunde inte skapas" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1374,6 +1384,10 @@ msgstr "&Ny" msgid "&Close" msgstr "S&täng" +#, fuzzy +msgid "&History..." +msgstr "Historik" + msgid "Save &as..." msgstr "Spa&ra som..." @@ -1810,6 +1824,13 @@ msgstr "En lokal kopia av %s kunde inte hämtas" msgid "The shell is already running a command" msgstr "Skalet kör redan ett kommando" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"Inte en xterm- eller linuxterminal;\n" +"panelerna kan inte slås av/på." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Skriv 'exit' för att återvända till Midnight Commander" @@ -2369,13 +2390,6 @@ msgstr "" "Båda panelerna måste vara i fillistläge\n" "för att använda detta kommando" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"Inte en xterm- eller linuxterminal;\n" -"panelerna kan inte slås av/på." - #, c-format msgid "'%s' is not a symbolic link" msgstr "'%s' är inte en symbolisk länk" @@ -2442,9 +2456,6 @@ msgstr "" "Chdir till \"%s\" misslyckades\n" "%s" -msgid "Cannot read directory contents" -msgstr "Kan inte läsa kataloginnehåll" - msgid "Parameter" msgstr "Parameter" @@ -3395,6 +3406,9 @@ msgstr "V&isa katalogstorlekar" msgid "Command &history" msgstr "Kommando-&historik" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "Katalog&favoriter" @@ -3620,6 +3634,9 @@ msgstr "Avmarkera" msgid "Do you really want to execute?" msgstr "Vill du verkligen exekvera?" +msgid "Cannot read directory contents" +msgstr "Kan inte läsa kataloginnehåll" + msgid "User supplied format looks invalid, reverting to default." msgstr "Det angivna formatet ser ogiltigt ut, faller tillbaka till standard." diff --git a/po/szl.po b/po/szl.po index 6e64ccef8..8fa389508 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Silesian (http://www.transifex.com/mc/mc/language/szl/)\n" @@ -459,6 +459,15 @@ msgstr "" msgid "The TERM environment variable is unset!\n" msgstr "" +msgid "Cannot create pipe for SIGWINCH" +msgstr "" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1282,6 +1291,9 @@ msgstr "" msgid "&Close" msgstr "" +msgid "&History..." +msgstr "" + msgid "Save &as..." msgstr "" @@ -1710,6 +1722,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2259,11 +2276,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2326,9 +2338,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "" - msgid "Parameter" msgstr "" @@ -3198,6 +3207,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3425,6 +3437,9 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "" + msgid "User supplied format looks invalid, reverting to default." msgstr "" diff --git a/po/ta.po b/po/ta.po index 767cb0510..9dd7a9c5c 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Tamil (http://www.transifex.com/mc/mc/language/ta/)\n" @@ -459,6 +459,15 @@ msgstr "" msgid "The TERM environment variable is unset!\n" msgstr "" +msgid "Cannot create pipe for SIGWINCH" +msgstr "" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1282,6 +1291,9 @@ msgstr "" msgid "&Close" msgstr "" +msgid "&History..." +msgstr "" + msgid "Save &as..." msgstr "" @@ -1710,6 +1722,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2259,11 +2276,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2326,9 +2338,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "" - msgid "Parameter" msgstr "" @@ -3196,6 +3205,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3421,6 +3433,9 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "" + msgid "User supplied format looks invalid, reverting to default." msgstr "" diff --git a/po/te.po b/po/te.po index 638b2200e..6ba2e4b91 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Telugu (http://www.transifex.com/mc/mc/language/te/)\n" @@ -458,6 +458,15 @@ msgstr "" msgid "The TERM environment variable is unset!\n" msgstr "" +msgid "Cannot create pipe for SIGWINCH" +msgstr "" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1281,6 +1290,9 @@ msgstr "" msgid "&Close" msgstr "" +msgid "&History..." +msgstr "" + msgid "Save &as..." msgstr "" @@ -1709,6 +1721,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2258,11 +2275,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2325,9 +2337,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "" - msgid "Parameter" msgstr "" @@ -3195,6 +3204,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3420,6 +3432,9 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "" + msgid "User supplied format looks invalid, reverting to default." msgstr "" diff --git a/po/tr.po b/po/tr.po index fba75cb0c..189f82799 100644 --- a/po/tr.po +++ b/po/tr.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Turkish (http://www.transifex.com/mc/mc/language/tr/)\n" @@ -480,6 +480,16 @@ msgstr "Shift" msgid "The TERM environment variable is unset!\n" msgstr "TERM çevre değişkeni atanmamış!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Boru akışı oluşturulamadı" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1367,6 +1377,10 @@ msgstr "&Yeni" msgid "&Close" msgstr "&Kapat" +#, fuzzy +msgid "&History..." +msgstr "Geçmiş" + msgid "Save &as..." msgstr "Farklı kaydet..." @@ -1805,6 +1819,13 @@ msgstr "`%s'in yerel kopyası alınamadı" msgid "The shell is already running a command" msgstr "Kabukta halen bir komut etkin" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"Bir xterm ya da Linux konsolu değil;\n" +" Paneller değiştirilemez." + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Midnight Commander'a dönmek için 'exit' yazın" @@ -2365,13 +2386,6 @@ msgstr "" "Bu komutu kullanabilmek için\n" "iki pano da listeleme kipinde olmalıdır" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"Bir xterm ya da Linux konsolu değil;\n" -" Paneller değiştirilemez." - #, c-format msgid "'%s' is not a symbolic link" msgstr "'%s' sembolik bağlantı değil" @@ -2438,9 +2452,6 @@ msgstr "" " \"%s\" dizinine geçilemedi \n" " %s " -msgid "Cannot read directory contents" -msgstr "Dizin içeriği okunamadı" - msgid "Parameter" msgstr "Parametre" @@ -3390,6 +3401,9 @@ msgstr "diz&in boyutlarını göster" msgid "Command &history" msgstr "Komut Geçmişi" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "Dizin listesi" @@ -3615,6 +3629,9 @@ msgstr "Seçme" msgid "Do you really want to execute?" msgstr "Gerçekten çalıştırmak istiyor musunuz?" +msgid "Cannot read directory contents" +msgstr "Dizin içeriği okunamadı" + msgid "User supplied format looks invalid, reverting to default." msgstr "Kullanıcı tanımlı biçim geçersiz: öntanımlısı kullanılacak." diff --git a/po/uk.po b/po/uk.po index 5b246d059..013ec3f51 100644 --- a/po/uk.po +++ b/po/uk.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-05-01 18:12+0000\n" "Last-Translator: Andriy Smilyanets \n" "Language-Team: Ukrainian (http://www.transifex.com/mc/mc/language/uk/)\n" @@ -494,6 +494,16 @@ msgstr "Shift" msgid "The TERM environment variable is unset!\n" msgstr "Змінна середовища TERM не встановлена!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "Не вдалося створити потоки каналу" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1377,6 +1387,10 @@ msgstr "&Новий" msgid "&Close" msgstr "&Закрити" +#, fuzzy +msgid "&History..." +msgstr "Історія" + msgid "Save &as..." msgstr "Зберегти &як…" @@ -1812,6 +1826,13 @@ msgstr "Не вдалося отримати локальну копію %s" msgid "The shell is already running a command" msgstr "Інтерпретатор вже виконує команду" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"Це не xterm і не консоль Linux.\n" +"Панелі не можна перемкнути. " + msgid "Type 'exit' to return to the Midnight Commander" msgstr "Введіть 'exit', щоб повернутися до Midnight Commander" @@ -2370,13 +2391,6 @@ msgstr "" "Для виконання цієї команди обидві панелі\n" "повинні бути в режимі списку" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"Це не xterm і не консоль Linux.\n" -"Панелі не можна перемкнути. " - #, c-format msgid "'%s' is not a symbolic link" msgstr "«%s» — не символьне посилання" @@ -2443,9 +2457,6 @@ msgstr "" "Не вдалося змінити каталог на «%s»\n" "%s " -msgid "Cannot read directory contents" -msgstr "Не вдалося отримати зміст каталога" - msgid "Parameter" msgstr "Параметр" @@ -3402,6 +3413,9 @@ msgstr "Показати &розміри каталогів" msgid "Command &history" msgstr "&Історія команд" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "&Гарячий список каталогів" @@ -3631,6 +3645,9 @@ msgstr "Зняти відмітку" msgid "Do you really want to execute?" msgstr "Справді виконати?" +msgid "Cannot read directory contents" +msgstr "Не вдалося отримати зміст каталога" + msgid "User supplied format looks invalid, reverting to default." msgstr "" "Формат користувача виглядає неправильним, використовується стандартний." diff --git a/po/vi.po b/po/vi.po index 7c3d79504..1a6d6d28a 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Vietnamese (http://www.transifex.com/mc/mc/language/vi/)\n" @@ -459,6 +459,15 @@ msgstr "" msgid "The TERM environment variable is unset!\n" msgstr "Biến môi trườn TERM chưa được xác định!\n" +msgid "Cannot create pipe for SIGWINCH" +msgstr "" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1284,6 +1293,9 @@ msgstr "" msgid "&Close" msgstr "" +msgid "&History..." +msgstr "" + msgid "Save &as..." msgstr "" @@ -1712,6 +1724,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2261,11 +2278,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2328,9 +2340,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "Không đọc được nội dung thư mục" - msgid "Parameter" msgstr "" @@ -3196,6 +3205,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3419,6 +3431,9 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "Không đọc được nội dung thư mục" + msgid "User supplied format looks invalid, reverting to default." msgstr "" "Định dạng người dùng đưa ra có vẻ không thích hợp, chuyển lại thành mặc định." diff --git a/po/wa.po b/po/wa.po index cc691d1b8..90ff8a7d9 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Walloon (http://www.transifex.com/mc/mc/language/wa/)\n" @@ -459,6 +459,15 @@ msgstr "" msgid "The TERM environment variable is unset!\n" msgstr "Li variåve d' evironmint TERM n' est nén metowe!\n" +msgid "Cannot create pipe for SIGWINCH" +msgstr "" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1282,6 +1291,9 @@ msgstr "" msgid "&Close" msgstr "" +msgid "&History..." +msgstr "" + msgid "Save &as..." msgstr "" @@ -1710,6 +1722,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2259,11 +2276,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2326,9 +2338,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "" - msgid "Parameter" msgstr "" @@ -3196,6 +3205,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3421,6 +3433,9 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "" + msgid "User supplied format looks invalid, reverting to default." msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index a20a775cb..3ed883ebb 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-09 03:13+0000\n" "Last-Translator: liushuyu011 \n" "Language-Team: Chinese (China) (http://www.transifex.com/mc/mc/language/" @@ -490,6 +490,16 @@ msgstr "Shift 键" msgid "The TERM environment variable is unset!\n" msgstr "没有设置 TERM 环境变量!\n" +#, fuzzy +msgid "Cannot create pipe for SIGWINCH" +msgstr "无法创建管道数据流" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1372,6 +1382,10 @@ msgstr "新建(&N)" msgid "&Close" msgstr "关闭(&C)" +#, fuzzy +msgid "&History..." +msgstr "历史" + msgid "Save &as..." msgstr "另存为(&A)..." @@ -1807,6 +1821,13 @@ msgstr "无法获取 %s 的本地副本" msgid "The shell is already running a command" msgstr "Shell 正在运行一个命令" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" +"不是一个 xterm 或 Linux 控制台；\n" +"无法切换面板。" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "输入 'exit' 返回 Midnight Commander" @@ -2365,13 +2386,6 @@ msgstr "" "若要使用该命令，\n" "两个面板必需都处于列表视图模式" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" -"不是一个 xterm 或 Linux 控制台；\n" -"无法切换面板。" - #, c-format msgid "'%s' is not a symbolic link" msgstr "“%s”不是一个符号链接" @@ -2438,9 +2452,6 @@ msgstr "" "无法进入目录“%s”\n" "%s" -msgid "Cannot read directory contents" -msgstr "无法读取目录内容" - msgid "Parameter" msgstr "参数" @@ -3390,6 +3401,9 @@ msgstr "显示目录大小(&I)" msgid "Command &history" msgstr "命令历史(&H)" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "目录活动列表(&R)" @@ -3613,6 +3627,9 @@ msgstr "取消选择" msgid "Do you really want to execute?" msgstr "您真的要执行吗?" +msgid "Cannot read directory contents" +msgstr "无法读取目录内容" + msgid "User supplied format looks invalid, reverting to default." msgstr "用户提供的格式无效，回复到默认设置。" diff --git a/po/zh_TW.po b/po/zh_TW.po index f0e18e581..22b06d45f 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2019-06-16 20:10+0200\n" +"POT-Creation-Date: 2019-09-01 20:04+0300\n" "PO-Revision-Date: 2019-03-02 12:55+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/mc/mc/language/" @@ -460,6 +460,15 @@ msgstr "" msgid "The TERM environment variable is unset!\n" msgstr "環境變數 TERM 並未設定！ \n" +msgid "Cannot create pipe for SIGWINCH" +msgstr "" + +msgid "Cannot configure write end of SIGWINCH pipe" +msgstr "" + +msgid "Cannot configure read end of SIGWINCH pipe" +msgstr "" + #, c-format msgid "" "Screen size %dx%d is not supported.\n" @@ -1285,6 +1294,9 @@ msgstr "" msgid "&Close" msgstr "" +msgid "&History..." +msgstr "" + msgid "Save &as..." msgstr "" @@ -1713,6 +1725,11 @@ msgstr "" msgid "The shell is already running a command" msgstr "" +msgid "" +"Not an xterm or Linux console;\n" +"the panels cannot be toggled." +msgstr "" + msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2262,11 +2279,6 @@ msgid "" "to use this command" msgstr "" -msgid "" -"Not an xterm or Linux console;\n" -"the panels cannot be toggled." -msgstr "" - #, c-format msgid "'%s' is not a symbolic link" msgstr "" @@ -2329,9 +2341,6 @@ msgid "" "%s" msgstr "" -msgid "Cannot read directory contents" -msgstr "" - msgid "Parameter" msgstr "" @@ -3197,6 +3206,9 @@ msgstr "" msgid "Command &history" msgstr "" +msgid "Viewed/edited files hi&story" +msgstr "" + msgid "Di&rectory hotlist" msgstr "" @@ -3420,6 +3432,9 @@ msgstr "" msgid "Do you really want to execute?" msgstr "" +msgid "Cannot read directory contents" +msgstr "" + msgid "User supplied format looks invalid, reverting to default." msgstr "使用者提供的格式似乎是錯誤的, 回復到預設值." From d2f86e698ee40831742c9c36b868ab52c8b5bdf2 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 7 Aug 2019 20:58:22 +0200 Subject: [PATCH 34/35] Fix .gitignore autogen.sh generates a bunch of files aren't .gitignore'd yet. Signed-off-by: Enrico Weigelt, metux IT consult Signed-off-by: Andrew Borodin --- .gitignore | 2 ++ misc/.gitignore | 8 ++++++++ src/.gitignore | 1 + src/vfs/extfs/helpers/.gitignore | 2 ++ 4 files changed, 13 insertions(+) diff --git a/.gitignore b/.gitignore index 310c62fef..488ed421f 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,5 @@ make.log make.clang make.gcc make.tcc +tests/src/editor/test-data.txt +tests/src/vfs/extfs/helpers-list/data/config.sh diff --git a/misc/.gitignore b/misc/.gitignore index 3af159c70..7bf6778a9 100644 --- a/misc/.gitignore +++ b/misc/.gitignore @@ -1 +1,9 @@ mc.ext +ext.d/doc.sh +ext.d/misc.sh +ext.d/text.sh +ext.d/web.sh +mc.charsets +mc.menu +mcedit.menu +syntax/Syntax diff --git a/src/.gitignore b/src/.gitignore index dc9696f53..c0526413c 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -6,3 +6,4 @@ Makefile Makefile.in mc.hlp mc.hlp.?? +man2hlp/man2hlp diff --git a/src/vfs/extfs/helpers/.gitignore b/src/vfs/extfs/helpers/.gitignore index c20df8014..56c4116a1 100644 --- a/src/vfs/extfs/helpers/.gitignore +++ b/src/vfs/extfs/helpers/.gitignore @@ -25,3 +25,5 @@ uzip uzoo uace uarc +uc1541 +ulib From 3470cdf76f8b08023cbcff4730489864323ee927 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 8 Aug 2019 21:41:26 +0200 Subject: [PATCH 35/35] tests: add .gitignore Don't wanna accidentially add autogenerated files to the git repo, so ignore them. Signed-off-by: Enrico Weigelt, metux IT consult Signed-off-by: Andrew Borodin --- tests/.gitignore | 166 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 tests/.gitignore diff --git a/tests/.gitignore b/tests/.gitignore new file mode 100644 index 000000000..ddf11e3a7 --- /dev/null +++ b/tests/.gitignore @@ -0,0 +1,166 @@ +lib/library_independ +lib/library_independ.log +lib/library_independ.trs +lib/mc_build_filename +lib/mc_build_filename.log +lib/mc_build_filename.trs +lib/mc_realpath +lib/mc_realpath.log +lib/mc_realpath.trs +lib/mcconfig/config_string +lib/mcconfig/config_string.ini +lib/mcconfig/config_string.log +lib/mcconfig/config_string.trs +lib/mcconfig/test-suite.log +lib/mcconfig/user_configs_path +lib/mcconfig/user_configs_path.log +lib/mcconfig/user_configs_path.trs +lib/name_quote +lib/name_quote.log +lib/name_quote.trs +lib/search/glob_prepare_replace_str +lib/search/glob_prepare_replace_str.log +lib/search/glob_prepare_replace_str.trs +lib/search/glob_translate_to_regex +lib/search/glob_translate_to_regex.log +lib/search/glob_translate_to_regex.trs +lib/search/hex_translate_to_regex +lib/search/hex_translate_to_regex.log +lib/search/hex_translate_to_regex.trs +lib/search/regex_process_escape_sequence +lib/search/regex_process_escape_sequence.log +lib/search/regex_process_escape_sequence.trs +lib/search/regex_replace_esc_seq +lib/search/regex_replace_esc_seq.log +lib/search/regex_replace_esc_seq.trs +lib/search/test-suite.log +lib/search/translate_replace_glob_to_regex +lib/search/translate_replace_glob_to_regex.log +lib/search/translate_replace_glob_to_regex.trs +lib/serialize +lib/serialize.log +lib/serialize.trs +lib/strutil/filevercmp +lib/strutil/filevercmp.log +lib/strutil/filevercmp.trs +lib/strutil/parse_integer +lib/strutil/parse_integer.log +lib/strutil/parse_integer.trs +lib/strutil/replace__str_replace_all +lib/strutil/replace__str_replace_all.log +lib/strutil/replace__str_replace_all.trs +lib/strutil/str_verscmp +lib/strutil/str_verscmp.log +lib/strutil/str_verscmp.trs +lib/strutil/test-suite.log +lib/test-suite.log +lib/utilinux__my_system-fork_child.log +lib/utilinux__my_system-fork_child_shell.log +lib/utilinux__my_system-fork_fail.log +lib/utilunix__my_system_fork_child +lib/utilunix__my_system_fork_child.log +lib/utilunix__my_system_fork_child.trs +lib/utilunix__my_system_fork_child_shell +lib/utilunix__my_system_fork_child_shell.log +lib/utilunix__my_system_fork_child_shell.trs +lib/utilunix__my_system_fork_fail +lib/utilunix__my_system_fork_fail.log +lib/utilunix__my_system_fork_fail.trs +lib/vfs/canonicalize_pathname +lib/vfs/canonicalize_pathname.log +lib/vfs/canonicalize_pathname.trs +lib/vfs/current_dir +lib/vfs/current_dir.log +lib/vfs/current_dir.trs +lib/vfs/path_cmp +lib/vfs/path_cmp.log +lib/vfs/path_cmp.trs +lib/vfs/path_len +lib/vfs/path_len.log +lib/vfs/path_len.trs +lib/vfs/path_manipulations +lib/vfs/path_manipulations.log +lib/vfs/path_manipulations.trs +lib/vfs/path_recode +lib/vfs/path_recode.log +lib/vfs/path_recode.trs +lib/vfs/path_serialize +lib/vfs/path_serialize.log +lib/vfs/path_serialize.trs +lib/vfs/relative_cd +lib/vfs/relative_cd.log +lib/vfs/relative_cd.trs +lib/vfs/tempdir +lib/vfs/tempdir.log +lib/vfs/tempdir.trs +lib/vfs/test-suite.log +lib/vfs/vfs_adjust_stat +lib/vfs/vfs_adjust_stat.log +lib/vfs/vfs_adjust_stat.trs +lib/vfs/vfs_get_encoding +lib/vfs/vfs_get_encoding.log +lib/vfs/vfs_get_encoding.trs +lib/vfs/vfs_parse_ls_lga +lib/vfs/vfs_parse_ls_lga.log +lib/vfs/vfs_parse_ls_lga.trs +lib/vfs/vfs_path_from_str_flags +lib/vfs/vfs_path_from_str_flags.log +lib/vfs/vfs_path_from_str_flags.trs +lib/vfs/vfs_path_string_convert +lib/vfs/vfs_path_string_convert.log +lib/vfs/vfs_path_string_convert.trs +lib/vfs/vfs_prefix_to_class +lib/vfs/vfs_prefix_to_class.log +lib/vfs/vfs_prefix_to_class.trs +lib/vfs/vfs_s_get_path +lib/vfs/vfs_s_get_path.log +lib/vfs/vfs_s_get_path.trs +lib/vfs/vfs_setup_cwd +lib/vfs/vfs_setup_cwd.log +lib/vfs/vfs_setup_cwd.trs +lib/vfs/vfs_split +lib/vfs/vfs_split.log +lib/vfs/vfs_split.trs +lib/widget/complete_engine +lib/widget/complete_engine.log +lib/widget/complete_engine.trs +lib/widget/test-suite.log +lib/x_basename +lib/x_basename.log +lib/x_basename.trs +src/editor/edit_complete_word_cmd.log +src/editor/editcmd__edit_complete_word_cmd +src/editor/editcmd__edit_complete_word_cmd.log +src/editor/editcmd__edit_complete_word_cmd.trs +src/editor/test-suite.log +src/execute__execute_external_editor_or_viewer +src/execute__execute_external_editor_or_viewer.log +src/execute__execute_external_editor_or_viewer.trs +src/execute__execute_get_external_cmd_opts_from_config +src/execute__execute_get_external_cmd_opts_from_config.log +src/execute__execute_get_external_cmd_opts_from_config.trs +src/execute__execute_with_vfs_arg +src/execute__execute_with_vfs_arg.log +src/execute__execute_with_vfs_arg.trs +src/filemanager/do_cd_command +src/filemanager/do_cd_command.log +src/filemanager/do_cd_command.trs +src/filemanager/examine_cd +src/filemanager/examine_cd.log +src/filemanager/examine_cd.trs +src/filemanager/exec_get_export_variables_ext +src/filemanager/exec_get_export_variables_ext.log +src/filemanager/exec_get_export_variables_ext.trs +src/filemanager/filegui_is_wildcarded +src/filemanager/filegui_is_wildcarded.log +src/filemanager/filegui_is_wildcarded.trs +src/filemanager/get_random_hint +src/filemanager/get_random_hint.log +src/filemanager/get_random_hint.trs +src/filemanager/test-suite.log +src/test-suite.log +src/vfs/extfs/helpers-list/mc_parse_ls_l +src/vfs/extfs/helpers-list/run +src/vfs/extfs/helpers-list/run.log +src/vfs/extfs/helpers-list/run.trs +src/vfs/extfs/helpers-list/test-suite.log