diff -ruN old/mc-4.5.21/Specfile new/mc-4.5.22/Specfile --- old/mc-4.5.21/Specfile Thu Feb 25 01:53:30 1999 +++ new/mc-4.5.22/Specfile Fri Feb 26 19:25:11 1999 @@ -1,5 +1,5 @@ # Note that this is NOT a relocatable package -%define ver 4.5.21 +%define ver 4.5.22 %define prefix /usr Summary: Midnight Commander visual shell diff -ruN old/mc-4.5.21/VERSION new/mc-4.5.22/VERSION --- old/mc-4.5.21/VERSION Thu Feb 25 01:53:30 1999 +++ new/mc-4.5.22/VERSION Fri Feb 26 19:25:11 1999 @@ -1 +1 @@ -#define VERSION "4.5.21" +#define VERSION "4.5.22" diff -ruN old/mc-4.5.21/configure new/mc-4.5.22/configure --- old/mc-4.5.21/configure Thu Feb 25 01:53:30 1999 +++ new/mc-4.5.22/configure Fri Feb 26 19:25:11 1999 @@ -586,7 +586,7 @@ PACKAGE=mc -VERSION=4.5.21 +VERSION=4.5.22 cat >> confdefs.h < + + * glayout.c (my_app_create_menus): New function, used to create + our menus and set the realy properly, to make cpanel (ie, + current_panel) always consistent with what the user users. + + So, no need to kill the tearoff menus in gmc now. + + * gmount.c (is_block_device_mountable): compare the device name + here. + + (get_mountable_devices): Do not stop scanning devices. + + * gview.c (scrollbar_moved): Call view update here, with + update_gui = FALSE. + + * gdesktop.c (desktop_icon_info_open): Add needs terminal support. + + * gnome-file-property-dialog.c (create_settings_pane): Add Needs + terminal check box + +1999-02-25 Miguel de Icaza + + * gaction.c (gmc_open_filename): Add support for needsterminal. + + * gscreen.c: Add New Folder option to the panel popup. + +1999-02-25 Owen Taylor + + * gdialogs.c (file_delete_query_recursive): GNOME + replacement for recursive delete query dialog. + + * gprefs.c gcustom-layout.[ch]: Add a new page to + the preferences dialog to allow the user to change + the columns in the custom view. + 1999-02-24 Miguel de Icaza * gmount.c (desktop_cleanup_devices): Export this routine now and diff -ruN old/mc-4.5.21/gnome/Makefile.in new/mc-4.5.22/gnome/Makefile.in --- old/mc-4.5.21/gnome/Makefile.in Thu Feb 25 01:53:33 1999 +++ new/mc-4.5.22/gnome/Makefile.in Fri Feb 26 19:25:15 1999 @@ -31,6 +31,7 @@ gaction.c \ gcache.c \ gcliplabel.c \ + gcustom-layout.c\ gcmd.c \ gcorba.c \ gdesktop-icon.c \ @@ -68,6 +69,7 @@ gcmd.h \ gconf.h \ gcorba.h \ + gcustom-layout.h\ gdesktop-icon.h \ gdesktop.h \ gdnd.h \ @@ -135,6 +137,7 @@ gcache.o \ gcliplabel.o \ gcmd.o \ + gcustom-layout.o\ gdesktop-icon.o \ gdesktop.o \ gdnd.o \ @@ -172,14 +175,9 @@ FileManager-skels.c \ FileManager-common.c -CORBA_SOURCES = \ - gcorba.c - $(CORBA_GENERATED): $(rootdir)/idl/FileManager.idl orbit-idl `gnome-config --cflags idl` $(rootdir)/idl/FileManager.idl -$(CORBA_SOURCES): $(CORBA_GENERATED) - FileManager-impl.c: FileManager.h EXTRA_DIST = gnome.TODO layout gmc.gnorba mc.keys.in.in gimp.image.desktop @@ -196,6 +194,8 @@ main-corba.o: main.c $(CC) -c -DHAVE_CORBA $(CPPFLAGS) $(DEFS) $(CFLAGS) $< -o main-corba.o + +gcorba.o: gcorba.c $(CORBA_GENERATED) all: @mx@ Makefile mc.keys diff -ruN old/mc-4.5.21/gnome/gaction.c new/mc-4.5.22/gnome/gaction.c --- old/mc-4.5.21/gnome/gaction.c Thu Feb 25 01:53:33 1999 +++ new/mc-4.5.22/gnome/gaction.c Fri Feb 26 19:25:15 1999 @@ -18,9 +18,9 @@ #include "../vfs/vfs.h" static void -gmc_execute (const char *fname, const char *buf) +gmc_execute (const char *fname, const char *buf, int needs_terminal) { - exec_extension (fname, buf, NULL, NULL, 0); + exec_extension (fname, buf, NULL, NULL, 0, needs_terminal); } int @@ -30,20 +30,36 @@ const char *cmd; char *buf; int size; + int needs_terminal = 0; + mime_type = gnome_mime_type_or_default (fname, NULL); + + /* + * We accept needs_terminal as -1, which means our caller + * did not want to do the work + */ + if (gnome_metadata_get (fname, "flags", &size, &buf) == 0){ + needs_terminal = (strstr (buf, "needsterminal") != 0); + g_free (buf); + } else if (mime_type){ + const char *flags; + + flags = gnome_mime_type_or_default (mime_type, "flags"); + needs_terminal = (strstr (flags, "needsterminal") != 0); + } + if (gnome_metadata_get (fname, "fm-open", &size, &buf) == 0){ - gmc_execute (fname, buf); + gmc_execute (fname, buf, needs_terminal); g_free (buf); return 1; } if (gnome_metadata_get (fname, "open", &size, &buf) == 0){ - gmc_execute (fname, buf); + gmc_execute (fname, buf, needs_terminal); g_free (buf); return 1; } - mime_type = gnome_mime_type_or_default (fname, NULL); if (!mime_type) return 0; @@ -51,13 +67,13 @@ cmd = gnome_mime_get_value (mime_type, "fm-open"); if (cmd){ - gmc_execute (fname, cmd); + gmc_execute (fname, cmd, needs_terminal); return 1; } cmd = gnome_mime_get_value (mime_type, "open"); if (cmd){ - gmc_execute (fname, cmd); + gmc_execute (fname, cmd, needs_terminal); return 1; } @@ -85,7 +101,7 @@ int on_terminal; if (gnome_metadata_get (fname, "edit", &size, &buf) == 0){ - gmc_execute (fname, buf); + gmc_execute (fname, buf, 0); g_free (buf); return 1; } @@ -95,7 +111,7 @@ cmd = gnome_mime_get_value (mime_type, "edit"); if (cmd){ - gmc_execute (fname, cmd); + gmc_execute (fname, cmd, 0); return 1; } } @@ -123,7 +139,7 @@ } else { char *cmd = g_strconcat (editor, " %s", NULL); - gmc_execute (fname, cmd); + gmc_execute (fname, cmd, 0); g_free (cmd); } @@ -141,7 +157,7 @@ static void gmc_run_view (const char *filename, const char *buf) { - exec_extension (filename, buf, NULL, NULL, 0); + exec_extension (filename, buf, NULL, NULL, 0, 0); } int diff -ruN old/mc-4.5.21/gnome/gcustom-layout.c new/mc-4.5.22/gnome/gcustom-layout.c --- old/mc-4.5.21/gnome/gcustom-layout.c Wed Dec 31 19:00:00 1969 +++ new/mc-4.5.22/gnome/gcustom-layout.c Fri Feb 26 19:25:15 1999 @@ -0,0 +1,327 @@ +/* GNU Midnight Commander -- GNOME edition + * + * Preferences page for custom list view + * + * Copyright (C) 1999 The Free Software Foundation + * + * Author: Owen Taylor + */ + +#include +#include "panel.h" +#include "gcustom-layout.h" +#include "gscreen.h" + +typedef struct _ColumnInfo ColumnInfo; + +struct _ColumnInfo { + gchar *name; + gchar *value; +}; + +struct _GCustomLayout { + GtkWidget *table; + GtkWidget *srcList; + GtkWidget *destList; + GtkWidget *addButton; + GHashTable *hash; + GnomePropertyBox *prop_box; + WPanel *panel; +}; + +ColumnInfo possible_columns[] = { + { N_("Access Time"), "atime" }, + { N_("Creation Time"), "ctime" }, + { N_("Group"), "group" }, + { N_("Group ID"), "ngid" }, + { N_("Inode Number"), "inode" }, + { N_("Mode"), "mode" }, + { N_("Modification Time"), "mtime" }, + { N_("Name"), "name" }, + { N_("Number of Hard Links"), "nlink" }, + { N_("Owner"), "owner" }, + { N_("Permission"), "perm" }, + { N_("Size"), "size" }, + { N_("Size (short)"), "bsize" }, + { N_("Type"), "type" }, + { N_("User ID"), "nuid" } +}; +gint n_possible_columns = sizeof(possible_columns) / sizeof(possible_columns[0]); + +static void +custom_layout_add_clicked (GtkWidget *widget, GCustomLayout *layout) +{ + gint row, new_row; + ColumnInfo *info; + gchar *tmp_name; + + if (GTK_CLIST (layout->srcList)->selection) { + row = GPOINTER_TO_UINT (GTK_CLIST (layout->srcList)->selection->data); + + info = gtk_clist_get_row_data (GTK_CLIST (layout->srcList), row); + + tmp_name = gettext (info->name); + new_row = gtk_clist_append (GTK_CLIST (layout->destList), &tmp_name); + gtk_clist_set_row_data (GTK_CLIST (layout->destList), + new_row, + info); + gtk_clist_select_row (GTK_CLIST (layout->destList), new_row, 0); + + gtk_widget_set_sensitive (layout->addButton, FALSE); + gnome_property_box_changed (layout->prop_box); + } +} + +static void +custom_layout_del_clicked (GtkWidget *widget, GCustomLayout *layout) +{ + gint row; + + if (GTK_CLIST (layout->destList)->selection) { + row = GPOINTER_TO_UINT (GTK_CLIST (layout->destList)->selection->data); + gtk_clist_remove (GTK_CLIST (layout->destList), row); + gnome_property_box_changed (layout->prop_box); + } +} + +static void +custom_layout_select_row (GtkWidget *widget, gint row, gint col, GdkEvent *event, + GCustomLayout *layout) +{ + gint i; + ColumnInfo *info, *tmp_info; + + info = gtk_clist_get_row_data (GTK_CLIST (layout->srcList), row); + + for (i=0; idestList)->rows; i++) { + tmp_info = gtk_clist_get_row_data (GTK_CLIST (layout->destList), i); + if (tmp_info == info) { + gtk_widget_set_sensitive (layout->addButton, FALSE); + return; + } + } + + gtk_widget_set_sensitive (layout->addButton, TRUE); +} + +static void +custom_layout_row_move (GtkWidget *widget, + gint source_row, gint dest_row, + GCustomLayout *layout) +{ + gnome_property_box_changed (layout->prop_box); +} + +static void +custom_layout_destroy (GtkWidget *widget, GCustomLayout *layout) +{ + g_hash_table_destroy (layout->hash); + g_free (layout); +} + +static void +custom_layout_create(GCustomLayout *layout, ColumnInfo *columns, gint ncolumns) +{ + GtkWidget *vbox2; + GtkWidget *scrollwin; + GtkWidget *delButton; + GtkWidget *label; + GtkWidget *align; + gint i; + gchar *tmp_name; + + layout->table = gtk_table_new(3, 1, FALSE); + gtk_container_set_border_width (GTK_CONTAINER (layout->table), GNOME_PAD_SMALL); + + /* make list of possible columns to add */ + vbox2 = gtk_vbox_new(FALSE, GNOME_PAD_SMALL); + label = gtk_label_new (_("Possible Columns")); + gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE, 0); + scrollwin = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_box_pack_start (GTK_BOX (vbox2), scrollwin, TRUE, TRUE, 0); + + layout->srcList = gtk_clist_new(1); + gtk_container_add(GTK_CONTAINER(scrollwin), layout->srcList); + gtk_widget_set_usize(layout->srcList, 150, 200); + gtk_clist_set_selection_mode(GTK_CLIST(layout->srcList), + GTK_SELECTION_BROWSE); + gtk_clist_set_column_auto_resize(GTK_CLIST(layout->srcList), 0, 1); + gtk_table_attach(GTK_TABLE(layout->table), vbox2, 0, 1, 0, 1, + GTK_FILL | GTK_EXPAND | GTK_SHRINK, + GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 0); + + /* make list of currently displayed column types */ + vbox2 = gtk_vbox_new(FALSE, GNOME_PAD_SMALL); + label = gtk_label_new (_("Displayed Columns")); + gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE, 0); + scrollwin = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_box_pack_start (GTK_BOX (vbox2), scrollwin, TRUE, TRUE, 0); + + layout->destList = gtk_clist_new(1); + gtk_container_add(GTK_CONTAINER(scrollwin), layout->destList); + gtk_widget_set_usize(layout->destList, 150, 200); + gtk_clist_set_selection_mode(GTK_CLIST(layout->destList), + GTK_SELECTION_BROWSE); + gtk_clist_set_column_auto_resize(GTK_CLIST(layout->destList), 0, 1); + gtk_clist_set_reorderable (GTK_CLIST (layout->destList), TRUE); + + gtk_table_attach(GTK_TABLE(layout->table), vbox2, 2, 3, 0, 1, + GTK_FILL | GTK_EXPAND | GTK_SHRINK, + GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 0); + + /* add add/remove buttons in center */ + layout->addButton = gtk_button_new_with_label(_("Add")); + delButton = gtk_button_new_with_label(_("Remove")); + + align = gtk_alignment_new(0.0, 0.5, 0, 0); + vbox2 = gtk_vbox_new(TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox2), layout->addButton, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox2), delButton, FALSE, FALSE, 0); + gtk_container_add(GTK_CONTAINER(align), vbox2); + gtk_table_attach(GTK_TABLE(layout->table), align, 1, 2, 0, 1, 0, 0, 5, 5); + + layout->hash = g_hash_table_new (g_str_hash, g_str_equal); + + for (i = 0; i < ncolumns; i++) { + tmp_name = gettext(columns[i].name); + gtk_clist_append (GTK_CLIST (layout->srcList), &tmp_name); + gtk_clist_set_row_data (GTK_CLIST (layout->srcList), + i, + &columns[i]); + + g_hash_table_insert (layout->hash, + columns[i].value, + &columns[i]); + } + + gtk_signal_connect(GTK_OBJECT(layout->addButton), "clicked", + GTK_SIGNAL_FUNC(custom_layout_add_clicked), + layout); + gtk_signal_connect(GTK_OBJECT(delButton), "clicked", + GTK_SIGNAL_FUNC(custom_layout_del_clicked), + layout); + gtk_signal_connect(GTK_OBJECT(layout->srcList), "select_row", + GTK_SIGNAL_FUNC(custom_layout_select_row), + layout); + gtk_signal_connect(GTK_OBJECT(layout->destList), "row_move", + GTK_SIGNAL_FUNC(custom_layout_row_move), + layout); + + gtk_widget_show_all (layout->table); + + gtk_signal_connect(GTK_OBJECT(layout->table), "destroy", + GTK_SIGNAL_FUNC(custom_layout_destroy), layout); +} + +static void +custom_layout_set (GCustomLayout *layout, gchar *string) +{ + gint new_row; + gint i; + gchar **strings; + ColumnInfo *info; + gchar *tmp_name; + + gtk_clist_clear (GTK_CLIST (layout->destList)); + + /* skip over initial half or full */ + while (*string && !isspace(*string)) + string++; + while (*string && isspace(*string)) + string++; + + strings = g_strsplit (string, ",", -1); + + for (i=0; strings[i]; i++) { + info = g_hash_table_lookup (layout->hash, strings[i]); + if (info) { + tmp_name = gettext (info->name); + new_row = gtk_clist_append (GTK_CLIST (layout->destList), &tmp_name); + gtk_clist_set_row_data (GTK_CLIST (layout->destList), + new_row, info); + } + } + + g_strfreev (strings); + + /* Set the status of the "Add" button correctly */ + + if (GTK_CLIST (layout->srcList)->selection) { + gint row = GPOINTER_TO_UINT (GTK_CLIST (layout->srcList)->selection->data); + custom_layout_select_row (NULL, row, 0, NULL, layout); + } + +} + +static gchar * +custom_layout_get (GCustomLayout *layout) +{ + gint i; + GString *result; + gchar *string; + ColumnInfo *info; + + result = g_string_new ("full "); + + for (i=0; idestList)->rows; i++) { + if (i != 0) + g_string_append_c (result, ','); + info = gtk_clist_get_row_data (GTK_CLIST (layout->destList), i); + g_string_append (result, info->value); + } + + string = result->str; + g_string_free (result, FALSE); + + return string; +} + +GCustomLayout * +custom_layout_create_page (GnomePropertyBox *prop_box, WPanel *panel) +{ + GCustomLayout *layout; + + layout = g_new (GCustomLayout, 1); + custom_layout_create (layout, possible_columns, n_possible_columns); + layout->prop_box = prop_box; + layout->panel = panel; + + gnome_property_box_append_page (GNOME_PROPERTY_BOX (prop_box), + layout->table, + gtk_label_new (_("Custom View"))); + + custom_layout_set (layout, panel->user_format); + + return layout; +} + +void +custom_layout_apply (GCustomLayout *layout) +{ + gchar *format; + GList *tmp_list; + PanelContainer *container; + + format = custom_layout_get (layout); + + tmp_list = containers; + while (tmp_list) { + container = tmp_list->data; + + g_free (container->panel->user_format); + container->panel->user_format = g_strdup (format); + + set_panel_formats (container->panel); + + tmp_list = tmp_list->next; + } + + g_free (format); +} + diff -ruN old/mc-4.5.21/gnome/gcustom-layout.h new/mc-4.5.22/gnome/gcustom-layout.h --- old/mc-4.5.21/gnome/gcustom-layout.h Wed Dec 31 19:00:00 1969 +++ new/mc-4.5.22/gnome/gcustom-layout.h Fri Feb 26 19:25:15 1999 @@ -0,0 +1,6 @@ +typedef struct _GCustomLayout GCustomLayout; + +GCustomLayout *custom_layout_create_page (GnomePropertyBox *prop_box, + WPanel *panel); +void custom_layout_apply (GCustomLayout *layout); + diff -ruN old/mc-4.5.21/gnome/gdesktop.c new/mc-4.5.22/gnome/gdesktop.c --- old/mc-4.5.21/gnome/gdesktop.c Thu Feb 25 01:53:33 1999 +++ new/mc-4.5.22/gnome/gdesktop.c Fri Feb 26 19:25:15 1999 @@ -1091,9 +1091,21 @@ new_panel_at (point); g_free (point); } else { - if (is_exe (fe->buf.st_mode) && if_link_is_exe (desktop_directory, fe)) - my_system (EXECUTE_AS_SHELL, shell, filename); - else + if (is_exe (fe->buf.st_mode) && if_link_is_exe (desktop_directory, fe)){ + int needs_terminal = 0; + int size; + char *buf; + + if (gnome_metadata_get (filename, "flags", &size, &buf) == 0){ + needs_terminal = strstr (buf, "needsterminal") != 0; + + g_free (buf); + } + if (needs_terminal) + gnome_open_terminal_with_cmd (filename); + else + my_system (EXECUTE_AS_SHELL, shell, filename); + } else gmc_open_filename (filename, NULL); } } diff -ruN old/mc-4.5.21/gnome/gdialogs.c new/mc-4.5.22/gnome/gdialogs.c --- old/mc-4.5.21/gnome/gdialogs.c Thu Feb 25 01:53:33 1999 +++ new/mc-4.5.22/gnome/gdialogs.c Fri Feb 26 19:25:15 1999 @@ -706,6 +706,75 @@ return dest_dir; } +int +file_delete_query_recursive (FileOpContext *ctx, enum OperationMode mode, gchar *s) +{ + GtkWidget *dialog; + GtkWidget *togglebutton; + gchar *title; + gchar *msg; + gint button; + gboolean rest_same; + + if (ctx->recursive_result < RECURSIVE_ALWAYS) { + msg = g_strdup_printf(_("%s\n\nDirectory not empty. Delete it recursively?"), name_trunc (s, 80)); + dialog = gnome_message_box_new (msg, + GNOME_MESSAGE_BOX_QUESTION, + GNOME_STOCK_BUTTON_YES, + GNOME_STOCK_BUTTON_NO, + GNOME_STOCK_BUTTON_CANCEL, + NULL); + g_free (msg); + + title = g_strconcat (_(" Delete: "), name_trunc (s, 30), " ", NULL); + gtk_window_set_title (GTK_WINDOW (dialog), title); + g_free (title); + + togglebutton = gtk_check_button_new_with_label (_("Do the same for the rest")); + gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), + togglebutton, FALSE, FALSE, 0); + gtk_widget_show_all (GNOME_DIALOG (dialog)->vbox); + + gnome_dialog_close_hides (GNOME_DIALOG (dialog), TRUE); + + button = gnome_dialog_run (GNOME_DIALOG (dialog)); + rest_same = GTK_TOGGLE_BUTTON (togglebutton)->active; + + gtk_widget_destroy (dialog); + + switch (button) { + case 0: + ctx->recursive_result = rest_same ? RECURSIVE_ALWAYS : RECURSIVE_YES; + break; + case 1: + ctx->recursive_result = rest_same ? RECURSIVE_NEVER : RECURSIVE_NO; + break; + case 2: + ctx->recursive_result = RECURSIVE_ABORT; + break; + default: + } + + if (ctx->recursive_result != RECURSIVE_ABORT) + do_refresh (); + } + + switch (ctx->recursive_result){ + case RECURSIVE_YES: + case RECURSIVE_ALWAYS: + return FILE_CONT; + + case RECURSIVE_NO: + case RECURSIVE_NEVER: + return FILE_SKIP; + + case RECURSIVE_ABORT: + + default: + return FILE_ABORT; + } +} + static void cancel_cb (GtkWidget *widget, gpointer data) { diff -ruN old/mc-4.5.21/gnome/gdnd.c new/mc-4.5.22/gnome/gdnd.c --- old/mc-4.5.21/gnome/gdnd.c Thu Feb 25 01:53:33 1999 +++ new/mc-4.5.22/gnome/gdnd.c Fri Feb 26 19:25:15 1999 @@ -371,9 +371,9 @@ drops[i] = NULL; if (gnome_metadata_get (full_name, "open", &size, &buf) == 0) - exec_extension (full_name, buf, drops, NULL, 0); + exec_extension (full_name, buf, drops, NULL, 0, 0); else - exec_extension (full_name, "%f %q", drops, NULL, 0); + exec_extension (full_name, "%f %q", drops, NULL, 0, 0); g_free (drops); gnome_uri_list_free_strings (names); diff -ruN old/mc-4.5.21/gnome/glayout.c new/mc-4.5.22/gnome/glayout.c --- old/mc-4.5.21/gnome/glayout.c Thu Feb 25 01:53:33 1999 +++ new/mc-4.5.22/gnome/glayout.c Fri Feb 26 19:25:15 1999 @@ -554,6 +554,55 @@ g_free (file2); } +/* + * This routine is a menu relay. + * + * This is called before the actual command specified in the GnomeUIInfo + * structure. This allows me to select the panel (ie, set the global cpanel + * variable to which this menu is bound). + * + * This is important, as we can have a menu tearoffed. And the current hack + * of setting cpanel on the focus-in event wont work. + * + */ +static void +panel_menu_relay (GtkObject *object, WPanel *panel) +{ + void (*real_func)(GtkObject *object, WPanel *panel); + + real_func = gtk_object_get_user_data (object); + set_current_panel (panel); + (*real_func)(object, panel); +} + +static void +my_menu_signal_connect (GnomeUIInfo *uiinfo, gchar *signal_name, + GnomeUIBuilderData *uibdata) +{ + gtk_object_set_user_data (GTK_OBJECT (uiinfo->widget), uiinfo->moreinfo); + gtk_signal_connect (GTK_OBJECT (uiinfo->widget), + signal_name, panel_menu_relay, uibdata->data ? + uibdata->data : uiinfo->user_data); +} + +static void +my_app_create_menus (GnomeApp *app, GnomeUIInfo *uiinfo, void *data) +{ + GnomeUIBuilderData uibdata; + + g_return_if_fail (app != NULL); + g_return_if_fail (GNOME_IS_APP (app)); + g_return_if_fail (uiinfo != NULL); + + uibdata.connect_func = my_menu_signal_connect; + uibdata.data = data; + uibdata.is_interp = FALSE; + uibdata.relay_func = NULL; + uibdata.destroy_func = NULL; + + gnome_app_create_menus_custom (app, uiinfo, &uibdata); +} + WPanel * create_container (Dlg_head *h, char *name, char *geometry) { @@ -561,6 +610,7 @@ WPanel *panel; GtkWidget *app, *vbox; int xpos, ypos, width, height; + GnomeUIInfo *uiinfo; gnome_parse_geometry (geometry, &xpos, &ypos, &width, &height); @@ -584,9 +634,12 @@ gnome_app_set_contents (GNOME_APP (app), vbox); if (desktop_wm_is_gnome_compliant == 1) - gnome_app_create_menus_with_data (GNOME_APP (app), gnome_panel_menu_without_desktop, panel); + uiinfo = gnome_panel_menu_without_desktop; else - gnome_app_create_menus_with_data (GNOME_APP (app), gnome_panel_menu_with_desktop, panel); + uiinfo = gnome_panel_menu_with_desktop; + + + my_app_create_menus (GNOME_APP (app), uiinfo, panel); create_new_menu (GNOME_APP (app), panel); diff -ruN old/mc-4.5.21/gnome/gmain.h new/mc-4.5.22/gnome/gmain.h --- old/mc-4.5.21/gnome/gmain.h Thu Feb 25 01:53:33 1999 +++ new/mc-4.5.22/gnome/gmain.h Fri Feb 26 19:25:15 1999 @@ -35,12 +35,17 @@ WPanel *new_panel_with_geometry_at (char *dir, char *geometry); void layout_panel_gone (WPanel *panel); void gtkrundlg_event (Dlg_head *h); -int gmc_open (file_entry *fe); -int gmc_open_filename (char *fname, GList *args); -int gmc_edit_filename (char *fname); -int gmc_view (char *filename, int start_line); + void x_show_info (WInfo *info, struct my_statfs *s, struct stat *b); void x_create_info (Dlg_head *h, widget_data parent, WInfo *info); + +/* + * stuff from gaction.c + */ +int gmc_open (file_entry *fe); +int gmc_open_filename (char *fname, GList *args); +int gmc_edit_filename (char *fname); +int gmc_view (char *filename, int start_line); void gmc_window_setup_from_panel (GnomeDialog *dialog, WPanel *panel); diff -ruN old/mc-4.5.21/gnome/gmount.c new/mc-4.5.22/gnome/gmount.c --- old/mc-4.5.21/gnome/gmount.c Thu Feb 25 01:53:33 1999 +++ new/mc-4.5.22/gnome/gmount.c Fri Feb 26 19:25:15 1999 @@ -7,6 +7,7 @@ */ #include +#include #ifdef STDC_HEADERS #include @@ -64,7 +65,6 @@ #endif #ifdef MOUNTED_VMOUNT /* AIX. */ -#include #include #include #endif @@ -94,6 +94,15 @@ #include "gmount.h" #include "util.h" +typedef struct { + char *devname; + + /* This is just a good guess */ + enum { + TYPE_UNKNOWN, + TYPE_CDROM + } type; +} devname_info_t; static gboolean option_has_user (char *str) @@ -131,6 +140,9 @@ return NULL; while ((mnt = getmntent (f))){ + if (strcmp (mnt->mnt_fsname, devname) != 0) + continue; + if (option_has_user (mnt->mnt_opts)){ retval = g_strdup (mnt->mnt_dir); break; @@ -172,8 +184,16 @@ while ((mnt = getmntent (f))){ if (option_has_user (mnt->mnt_opts)){ - list = g_list_prepend (list, g_strdup (mnt->mnt_fsname)); - break; + devname_info_t *dit; + + dit = g_new0 (devname_info_t, 1); + dit->devname = g_strdup (mnt->mnt_fsname); + dit->type = TYPE_UNKNOWN; + + if (strcmp (mnt->mnt_type, "iso9660") == 0) + dit->type = TYPE_CDROM; + + list = g_list_prepend (list, dit); } } endmntent (f); @@ -244,8 +264,10 @@ create_device_link (char *dev_name, char *short_dev_name, char *caption, char *icon) { char *full_name; + char *icon_full; char type = 'D'; + icon_full = g_concat_dir_and_file (ICONDIR, icon); full_name = g_concat_dir_and_file (desktop_directory, short_dev_name); if (mc_symlink (dev_name, full_name) != 0) { message (FALSE, @@ -256,11 +278,12 @@ return; } - gnome_metadata_set (full_name, "icon-filename", strlen (icon) + 1, icon); + gnome_metadata_set (full_name, "icon-filename", strlen (icon_full) + 1, icon_full); gnome_metadata_set (full_name, "icon-caption", strlen (caption) + 1, caption); gnome_metadata_set (full_name, "is-desktop-device", 1, &type); /* hack a boolean value */ g_free (full_name); + g_free (icon_full); } /* Creates the desktop links to the mountable devices */ @@ -270,13 +293,18 @@ GList *list, *l; int floppy_count; int hd_count; + int cdrom_count; int generic_count; list = get_mountable_devices (); - floppy_count = hd_count = generic_count = 0; + hd_count = 0; + cdrom_count = 0; + floppy_count = 0; + generic_count = 0; for (l = list; l; l = l->next) { + devname_info_t *dit = l->data; char *dev_name; char *short_dev_name; char *format; @@ -284,12 +312,15 @@ int count; char buffer[128]; - dev_name = l->data; + dev_name = dit->devname; short_dev_name = x_basename (dev_name); /* Create the format/icon/count. This could use better heuristics. */ - - if (strncmp (short_dev_name, "fd", 2) == 0) { + if (dit->type == TYPE_CDROM){ + format = _("CD-ROM %d"); + icon = "i-cdrom.png"; + count = cdrom_count++; + } else if (strncmp (short_dev_name, "fd", 2) == 0) { format = _("Floppy %d"); icon = "i-floppy.png"; count = floppy_count++; @@ -298,6 +329,10 @@ format = _("Disk %d"); icon = "i-blockdev.png"; count = hd_count++; + } else if (strncmp (short_dev_name, "cdrom", 5) == 0){ + format = _("CD-ROM %d"); + icon = "i-cdrom.png"; + count = cdrom_count++; } else { format = _("Device %d"); icon = "i-blockdev.png"; @@ -309,7 +344,9 @@ /* Create the actual link */ create_device_link (dev_name, short_dev_name, buffer, icon); - g_free (l->data); + + g_free (dit->devname); + g_free (dit); } g_list_free (list); diff -ruN old/mc-4.5.21/gnome/gnome-file-property-dialog.c new/mc-4.5.22/gnome/gnome-file-property-dialog.c --- old/mc-4.5.21/gnome/gnome-file-property-dialog.c Thu Feb 25 01:53:33 1999 +++ new/mc-4.5.22/gnome/gnome-file-property-dialog.c Fri Feb 26 19:25:15 1999 @@ -604,6 +604,14 @@ gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0); table = generate_actions_box (fp_dlg); gtk_container_add (GTK_CONTAINER (frame), table); + + frame = gtk_frame_new (_("Open action")); + fp_dlg->needs_terminal_check = gtk_check_button_new_with_label (_("Needs terminal to run")); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fp_dlg->needs_terminal_check), + fp_dlg->needs_terminal); + gtk_container_add (GTK_CONTAINER (frame), fp_dlg->needs_terminal_check); + + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0); return vbox; } @@ -945,7 +953,7 @@ init_metadata (GnomeFilePropertyDialog *fp_dlg) { gint size; - char *mime_type; + char *mime_type, *str; gchar link_name[MC_MAXPATHLEN]; gint n; gchar *file_name, *desktop_url; @@ -957,6 +965,15 @@ gnome_metadata_get (fp_dlg->file_name, "edit", &size, &fp_dlg->edit); gnome_metadata_get (fp_dlg->file_name, "drop-target", &size, &fp_dlg->drop_target); + /* + * Fetch the needs-terminal setting + */ + if (gnome_metadata_get (fp_dlg->file_name, "flags", &size, &str) == 0){ + fp_dlg->needs_terminal = strstr (str, "needsterminal") != 0; + g_free (str); + } else + fp_dlg->needs_terminal = 0; + /* Mime stuff */ file_name = fp_dlg->file_name; if (S_ISLNK (fp_dlg->st.st_mode)) { @@ -1276,7 +1293,61 @@ gnome_metadata_set (fpd->file_name, "icon-caption", strlen (new_caption)+1, new_caption); } - + + /* + * "Needs terminal" check button + * + * This piece of code is more complex than it should, as the "flags" + * metadata value is actually a list of comma separated flags. So + * we need to edit this list when removing the "needsterminal" flag. + */ + { + int toggled = 0 != GTK_TOGGLE_BUTTON (fpd->needs_terminal_check)->active; + int size; + char *buf; + + if (gnome_metadata_get (fpd->file_name, "flags", &size, &buf) == 0){ + char *p; + + p = strstr (buf, "needsterminal"); + if (toggled){ + if (!p){ + p = g_strconcat (buf, ",needsterminal", NULL); + gnome_metadata_set (fpd->file_name, "flags", strlen (p)+1, p); + g_free (p); + } + } else { + if (p){ + char *p1, *p2; + + if (p != buf){ + p1 = g_malloc (p - buf + 1); + strncpy (p1, buf, p - buf); + p1 [p - buf ] = 0; + } else + p1 = g_strdup (""); + + p += strlen ("needsterminal"); + + p2 = g_strconcat (p1, p, NULL); + if (strcmp (p2, ",") == 0) + gnome_metadata_remove (fpd->file_name, "flags"); + else + gnome_metadata_set (fpd->file_name, "flags", + strlen (p2)+1, p2); + g_free (p2); + g_free (p1); + + } + } + } else { + if (toggled){ + gnome_metadata_set (fpd->file_name, "flags", + sizeof ("needsterminal"), "needsterminal"); + } + } + } + if (!fpd->can_set_icon) return 1; /* And finally, we set the metadata on the icon filename */ diff -ruN old/mc-4.5.21/gnome/gnome-file-property-dialog.h new/mc-4.5.22/gnome/gnome-file-property-dialog.h --- old/mc-4.5.21/gnome/gnome-file-property-dialog.h Thu Feb 25 01:53:33 1999 +++ new/mc-4.5.22/gnome/gnome-file-property-dialog.h Fri Feb 26 19:25:15 1999 @@ -70,6 +70,7 @@ GtkWidget *button; GtkWidget *desktop_entry; GtkWidget *caption_entry; + GtkWidget *needs_terminal_check; gchar *fm_open; gchar *fm_view; @@ -84,6 +85,8 @@ gchar *caption; gboolean can_set_icon; + gboolean needs_terminal; + GdkImlibImage *im; /* Private Data */ diff -ruN old/mc-4.5.21/gnome/gnome.TODO new/mc-4.5.22/gnome/gnome.TODO --- old/mc-4.5.21/gnome/gnome.TODO Thu Feb 25 01:53:33 1999 +++ new/mc-4.5.22/gnome/gnome.TODO Fri Feb 26 19:25:15 1999 @@ -1,36 +1,10 @@ New task list: - - Use notebook to hold CLIst/IconList on the main windown - - - Put stuff inside a frame to make it look shrunken - - - Menu option to toggle tree on/off. - - - Make the tree faster (cache loaded directories) - - Add focus management to the tree - - tree should not move the selected menu item when - auto-expanding/collapsing. - - - Auto-expand, and the timeout need to be optional - (and possibly disabled by default) - - Options - "Show hidden files" needs to work for the tree as well as for the icon list. - - Right button on icon list (not on icon) should also - bring up menu. Should have back-forward (like - Netscape, create folder, etc... Eventually - Explorer style "create new word document" would - be nice). Rubber banding is silly. - - - Dragging within icon list should reorder or do - nothing. Copying is silly. (But can be done - on ACTION_ASK) - - - Add to the gnome-panel mime-type support - - Drop the MC event handling off for the main window. - Remote control of the file manager (corba client command). @@ -39,80 +13,21 @@ - Dynamic thumbnail generation -Federico: - - - Make the popup menus work on the desktop - - - Root window stuff. - Other features requested: - - Make the default action on drop configurable. - - - Remove extra space on the panels (the in-between - icons) - - - Remove the bottom scrollabar on the views. - - - Status line uses too much space, it might be fixed - by changing it to merge both status in a single - status line. - - [ Status | 0 bytes in nnnnnnn ] - ^ ^ - | + miniinfo. - | - print_vfs_message - - - The input line and the navigations icons should be part of an - expert mode. - - - Layout of dialog boxes suck. - - - Add help button to dialog boxes. - - - Add an advanced/simple checkbox. - - - All of the configuration pages should be in a single - GnomePropertyBox. - - - Optional "hidden menu" option. - - - Fix the progress dialog box to be nicer. - - - Adding more things to the toolbar. - - - Dialogs are popping in the wrong place, this should be fixed - by using: - - gtk_window_position (GDK_WINDOW_POSITION) - - - Entering compressed tar files crashes the program. - - - Substructure notify is taking too much time of processing - I need to a dd a filter and discard everything non-ClientMessage - that is sent to the wroot window. - - -IMPORTANTE: - -file actions dont cause panels to be refreshed automatically + - Copy/Move/Delete operations on the treeview. EXTENSIONS: - Add special destkop entries ("Network neighborhood") + - In the find-file results, it would be nice if 'chdir' popped up a new panel instead of changing the directory of the present one (optionally). + - (Cool but low priority) it would be nice if 'Arrange icons' were configurable to allow stacking the icons along a particular edge OR if gmc could automatically find areas of free screen (i.e. no windows on them) and then place icons there. - -Panels: - -- Global bindings (some shortcuts are not implemented) -- Split view. - Viewer: diff -ruN old/mc-4.5.21/gnome/gpopup.c new/mc-4.5.22/gnome/gpopup.c --- old/mc-4.5.21/gnome/gpopup.c Thu Feb 25 01:53:33 1999 +++ new/mc-4.5.22/gnome/gpopup.c Fri Feb 26 19:25:15 1999 @@ -34,7 +34,8 @@ F_PANEL = 1 << 6, /* Applies to files from a panel window */ F_MOUNTABLE = 1 << 7, /* Only if the device is mountable */ F_UNMOUNTABLE = 1 << 8, /* Only if the device is unmountable */ - F_EJECTABLE = 1 << 9 /* Only if the device is ejectable */ + F_EJECTABLE = 1 << 9, /* Only if the device is ejectable */ + F_LOCAL = 1 << 10 /* File must be on a local file system */ }; struct action { @@ -260,9 +261,9 @@ { N_("Unmount device"), F_SINGLE|F_UNMOUNTABLE|F_DICON, (GtkSignalFunc) dicon_unmount }, { N_("Eject device"), F_SINGLE|F_EJECTABLE|F_DICON, (GtkSignalFunc) dicon_eject }, { "", F_SINGLE, NULL }, - { N_("Open"), F_PANEL | F_ALL, (GtkSignalFunc) panel_action_open }, - { N_("Open"), F_DICON | F_ALL, (GtkSignalFunc) dicon_execute }, - { N_("Open with"), F_PANEL | F_ALL, (GtkSignalFunc) panel_action_open_with }, + { N_("Open"), F_LOCAL| F_PANEL | F_ALL, (GtkSignalFunc) panel_action_open }, + { N_("Open"), F_LOCAL | F_DICON | F_ALL, (GtkSignalFunc) dicon_execute }, + { N_("Open with"), F_LOCAL | F_PANEL | F_ALL, (GtkSignalFunc) panel_action_open_with }, { N_("View"), F_PANEL | F_NOTDIR, (GtkSignalFunc) panel_action_view }, { N_("View unfiltered"), F_PANEL | F_NOTDIR, (GtkSignalFunc) panel_action_view_unfiltered }, { N_("Edit"), F_PANEL | F_NOTDIR, (GtkSignalFunc) panel_action_edit }, @@ -482,19 +483,35 @@ static void mime_command_from_desktop_icon (GtkMenuItem *item, char *filename) { - char *action; - int movedir; - char *key; - const char *mime_type, *val;; - action = get_label_text (item); + char *action, *buf; + int movedir, size; + char *key, *flag_key; + const char *mime_type, *val, *flags; + int needs_terminal = 0; + action = get_label_text (item); + key = gtk_object_get_user_data (GTK_OBJECT (item)); mime_type = gnome_mime_type_or_default (filename, NULL); if (!mime_type) return; + + /* + * Find out if we need to run this in a terminal + */ + if (gnome_metadata_get (filename, "flags", &size, &buf) == 0){ + needs_terminal = strstr (flags, "needsterminal") != 0; + g_free (buf); + } else { + flag_key = g_strconcat ("flags.", key, "flags", NULL); + flags = gnome_mime_get_value (filename, flag_key); + g_free (flag_key); + if (flags) + needs_terminal = strstr (flags, "needsterminal") != 0; + } val = gnome_mime_get_value (mime_type, key); - exec_extension (filename, val, NULL, NULL, 0); + exec_extension (filename, val, NULL, NULL, 0, needs_terminal); } /* Create the menu items common to files from panel window and desktop icons, and also the items for diff -ruN old/mc-4.5.21/gnome/gpopup2.c new/mc-4.5.22/gnome/gpopup2.c --- old/mc-4.5.21/gnome/gpopup2.c Thu Feb 25 01:53:33 1999 +++ new/mc-4.5.22/gnome/gpopup2.c Fri Feb 26 19:25:15 1999 @@ -179,10 +179,12 @@ mime_action_callback (GtkWidget *widget, gpointer data) { char *filename; - char *key; - char *mime_type; - char *value; - + char *key, *buf; + const char *mime_type; + const char *value; + int needs_terminal = 0; + int size; + filename = data; key = gtk_object_get_user_data (GTK_OBJECT (widget)); @@ -192,8 +194,25 @@ mime_type = gnome_mime_type_or_default (filename, NULL); g_assert (mime_type != NULL); + /* + * Find out if we need to run this in a terminal + */ + if (gnome_metadata_get (filename, "flags", &size, &buf) == 0){ + needs_terminal = strstr (buf, "needsterminal") != 0; + g_free (buf); + } else { + char *flag_key; + const char *flags; + + flag_key = g_strconcat ("flags.", key, "flags", NULL); + flags = gnome_mime_get_value (filename, flag_key); + g_free (flag_key); + if (flags) + needs_terminal = strstr (flags, "needsterminal") != 0; + } + value = gnome_mime_get_value (mime_type, key); - exec_extension (filename, value, NULL, NULL, 0); + exec_extension (filename, value, NULL, NULL, 0, needs_terminal); } /* Creates the menu items for actions based on the MIME type of the selected diff -ruN old/mc-4.5.21/gnome/gprefs.c new/mc-4.5.22/gnome/gprefs.c --- old/mc-4.5.21/gnome/gprefs.c Thu Feb 25 01:53:33 1999 +++ new/mc-4.5.22/gnome/gprefs.c Fri Feb 26 19:25:15 1999 @@ -14,6 +14,7 @@ #include "panelize.h" #include "dialog.h" #include "layout.h" +#include "gcustom-layout.h" #include "../vfs/vfs.h" #include "gprefs.h" @@ -63,6 +64,8 @@ WPanel *panel; GtkWidget *prop_box; PrefsPage *prefs_pages; + GCustomLayout *custom_layout; + gint custom_layout_page; } PrefsDlg; @@ -256,7 +259,9 @@ static void apply_callback (GtkWidget *prop_box, gint pagenum, PrefsDlg *dlg) { - if (pagenum != -1) { + if (pagenum == dlg->custom_layout_page) { + custom_layout_apply (dlg->custom_layout); + } else if (pagenum != -1) { apply_page_changes (dlg, pagenum); } else { /* FIXME: can be optimized. Only if some of the @@ -453,6 +458,10 @@ i++; cur_page = &(dlg->prefs_pages [i]); } + + dlg->custom_layout = custom_layout_create_page (GNOME_PROPERTY_BOX (dlg->prop_box), + dlg->panel); + dlg->custom_layout_page = i; gtk_signal_connect (GTK_OBJECT (dlg->prop_box), "apply", GTK_SIGNAL_FUNC (apply_callback), dlg); diff -ruN old/mc-4.5.21/gnome/gscreen.c new/mc-4.5.22/gnome/gscreen.c --- old/mc-4.5.21/gnome/gscreen.c Thu Feb 25 01:53:33 1999 +++ new/mc-4.5.22/gnome/gscreen.c Fri Feb 26 19:25:15 1999 @@ -31,6 +31,7 @@ #include "gtkdtree.h" #include "gpageprop.h" #include "gpopup.h" +#include "gcmd.h" #include "gcliplabel.h" #include "gicon.h" #include "../vfs/vfs.h" @@ -1450,6 +1451,8 @@ static GnomeUIInfo file_list_popup_items[] = { GNOMEUIINFO_ITEM_NONE (N_("Rescan Directory"), N_("Reloads the current directory"), handle_rescan_directory), + GNOMEUIINFO_ITEM_NONE (N_("New folder"), N_("Creates a new folder here"), + gnome_mkdir_cmd), GNOMEUIINFO_END }; diff -ruN old/mc-4.5.21/gnome/gview.c new/mc-4.5.22/gnome/gview.c --- old/mc-4.5.21/gnome/gview.c Thu Feb 25 01:53:33 1999 +++ new/mc-4.5.22/gnome/gview.c Fri Feb 26 19:25:15 1999 @@ -76,11 +76,11 @@ /* To force a display */ view->dirty = max_dirt_limit + 1; - view_update (view); + view_update (view, 0); } void -view_percent (WView *view, int p, int w) +view_percent (WView *view, int p, int w, gboolean update_gui) { int percent; char buffer [40]; @@ -94,6 +94,9 @@ if (strcmp (buffer, GTK_LABEL (view->gtk_percent)->label)) gtk_label_set (GTK_LABEL (view->gtk_percent), buffer); + if (!update_gui) + return; + if (view->sadj){ GtkAdjustment *adj = GTK_ADJUSTMENT (view->sadj); @@ -111,7 +114,7 @@ } void -view_status (WView *view) +view_status (WView *view, gboolean update_gui) { char buffer [80]; @@ -127,9 +130,9 @@ gtk_label_set (GTK_LABEL (view->gtk_bytes), buffer); if (view->hex_mode) - view_percent (view, view->edit_cursor - view->first, 0); + view_percent (view, view->edit_cursor - view->first, 0, update_gui); else - view_percent (view, view->start_display - view->first, 0); + view_percent (view, view->start_display - view->first, 0, update_gui); } void diff -ruN old/mc-4.5.21/gnome/mc.keys.in.in new/mc-4.5.22/gnome/mc.keys.in.in --- old/mc-4.5.21/gnome/mc.keys.in.in Thu Feb 25 01:53:33 1999 +++ new/mc-4.5.22/gnome/mc.keys.in.in Fri Feb 26 19:25:15 1999 @@ -225,6 +225,9 @@ image/*: icon-filename=@icondir@/gnome-image-generic.png +image/x-psd: + icon-filename=@icondir@/gnome-image-psd.png + text/*: icon-filename=@icondir@/gnome-textfile.png open=gnome-edit %f diff -ruN old/mc-4.5.21/new_icons/Makefile.in new/mc-4.5.22/new_icons/Makefile.in --- old/mc-4.5.21/new_icons/Makefile.in Thu Feb 25 01:53:34 1999 +++ new/mc-4.5.22/new_icons/Makefile.in Fri Feb 26 19:25:15 1999 @@ -52,6 +52,7 @@ gnome-textfile.png \ gnome-tex.png \ gnome-audio.png \ + gnome-image-psd.png \ gnome-image-xcf.png all: Binary files old/mc-4.5.21/new_icons/gnome-image-psd.png and new/mc-4.5.22/new_icons/gnome-image-psd.png differ diff -ruN old/mc-4.5.21/po/cat-id-tbl.c new/mc-4.5.22/po/cat-id-tbl.c --- old/mc-4.5.21/po/cat-id-tbl.c Thu Feb 25 01:53:39 1999 +++ new/mc-4.5.22/po/cat-id-tbl.c Fri Feb 26 19:25:19 1999 @@ -92,312 +92,320 @@ {"Preserves the permissions and the UID/GID if possible", 75}, {"Recursively copy subdirectories.", 76}, {"If set, this will copy the directories recursively", 77}, - {"Move Progress", 78}, - {"Copy Progress", 79}, - {"Delete Progress", 80}, - {"File ", 81}, - {" is ", 82}, - {" Done.", 83}, - {"_Move here", 84}, - {"_Copy here", 85}, - {"_Link here", 86}, - {"Cancel drag", 87}, + {"\ +%s\n\ +\n\ +Directory not empty. Delete it recursively?", 78}, + {" Delete: ", 79}, + {"Do the same for the rest", 80}, + {"Move Progress", 81}, + {"Copy Progress", 82}, + {"Delete Progress", 83}, + {"File ", 84}, + {" is ", 85}, + {" Done.", 86}, + {"_Move here", 87}, + {"_Copy here", 88}, + {"_Link here", 89}, + {"Cancel drag", 90}, {"\ Could not stat %s\n\ -%s", 88}, - {"Default set of icons not found, please check your installation", 89}, - {"Enter command to run", 90}, +%s", 91}, + {"Default set of icons not found, please check your installation", 92}, + {"Enter command to run", 93}, {"\ Notice that if you choose to terminate the file manager, you will\n\ also terminate the GNOME desktop handler.\n\ \n\ -Are you sure you want to quit?", 91}, +Are you sure you want to quit?", 94}, {"\ The file manager and the desktop handler are now terminating\n\ \n\ If you want to start up again the desktop handler or the file manager\n\ you can launch it from the Panel, or you can run the UNIX command `gmc'\n\ \n\ -Press OK to terminate the application, or cancel to continue using it.", 92}, - {"_Terminal", 93}, - {"Launch a new terminal in the current directory", 94}, - {"_Directory...", 95}, - {"Creates a new directory", 96}, - {"_Copy...", 97}, - {"Copy files", 98}, - {"_Delete...", 99}, - {"Delete files", 100}, - {"_Move...", 101}, - {"Rename or move files", 102}, - {"Show directory sizes", 103}, - {"Shows the disk space used by each directory", 104}, - {"Select _All", 105}, - {"Select all files in the current Panel", 106}, - {"_Select Files...", 107}, - {"Select a group of files", 108}, - {"_Invert Selection", 109}, - {"Reverses the list of tagged files", 110}, - {"_Rescan Directory", 111}, - {"Rescan the directory contents", 112}, - {"Icon View", 113}, - {"Partial View", 114}, - {"Full View", 115}, - {"Custom View", 116}, - {"_Sort By...", 117}, - {"Confirmation settings", 118}, - {"_Filter View...", 119}, - {"Global option settings", 120}, - {"_Find File...", 121}, - {"Locate files on disk", 122}, - {"_Run Command...", 123}, - {"Runs a command", 124}, - {"_Run Command in panel...", 125}, - {"Run a command and put the results in a panel", 126}, - {"_Active VFS list...", 127}, - {"List of active virtual file systems", 128}, - {"_Background jobs...", 129}, - {"List of background operations", 130}, - {"Exit", 131}, - {"Terminates the file manager and the desktop", 132}, - {"Rescan System Devices", 133}, - {"_Layout", 134}, - {"_Commands", 135}, - {"_Desktop", 136}, - {"_Help", 137}, - {"File/New/Directory...", 138}, - {"Properties", 139}, - {"Mount device", 140}, - {"Unmount device", 141}, - {"Eject device", 142}, - {"Open", 143}, - {"Open with", 144}, - {"View", 145}, - {"View unfiltered", 146}, - {"Edit", 147}, - {"Link...", 148}, - {"Symlink...", 149}, - {"Edit symlink...", 150}, - {"Move/rename...", 151}, - {"Copy...", 152}, - {"Delete", 153}, - {"Show backup files", 154}, - {"Show hidden files", 155}, - {"Mix files and directories", 156}, - {"Use shell patterns instead of regular expressions", 157}, - {"Confirm when deleting file", 158}, - {"Confirm when overwriting files", 159}, - {"Confirm when executing files", 160}, - {"Show progress while operations are being performed", 161}, - {"VFS Timeout:", 162}, - {"Seconds", 163}, - {"Anonymous FTP password:", 164}, - {"Always use FTP proxy", 165}, - {"Fast directory reload", 166}, - {"Compute totals before copying files", 167}, - {"FTP directory cache timeout :", 168}, - {"Allow customization of icons in icon view", 169}, - {"File display", 170}, - {"Confirmation", 171}, - {"VFS", 172}, - {"Caching", 173}, - {"Preferences", 174}, - {"Filename", 175}, - {"Full name: ", 176}, - {"Command", 177}, - {"Command:", 178}, - {"Use terminal", 179}, - {"File mode (permissions)", 180}, - {"Current mode: ", 181}, - {"Read", 182}, - {"Write", 183}, - {"Exec", 184}, - {"Special", 185}, - {"User", 186}, - {"Group", 187}, - {"Other", 188}, - {"Set UID", 189}, - {"Set GID", 190}, - {"Sticky", 191}, - {"", 192}, - {"Owner", 193}, - {"General", 194}, - {"Title", 195}, - {"Icon", 196}, - {"Select icon", 197}, - {"Rescan Directory", 198}, - {"Reloads the current directory", 199}, - {"All files", 200}, - {"Archives and compressed files", 201}, - {"RPM/DEB files", 202}, - {"Text/Document files", 203}, - {"HTML and SGML files", 204}, - {"Postscript and PDF files", 205}, - {"Spreadsheet files", 206}, - {"Image files", 207}, - {"Video/animation files", 208}, - {"Audio files", 209}, - {"C program files", 210}, - {"C++ program files", 211}, - {"Objective-C program files", 212}, - {"Scheme program files", 213}, - {"Assembler program files", 214}, - {"Misc. program files", 215}, - {"Font files", 216}, - {"Search: %s", 217}, - {"%s bytes in %d file", 218}, - {"%s bytes in %d files", 219}, - {"", 220}, - {"Filter", 221}, - {"Switch view to an Icon view", 222}, - {"Brief", 223}, - {"Switch view to show just file name and type", 224}, - {"Detailed", 225}, - {"Switch view to show detailed file statistics", 226}, - {"Custom", 227}, - {"Switch view to show custom determined statistics.", 228}, - {"Back", 229}, - {"Go to the previously visited directory", 230}, - {"Up", 231}, - {"Go up a level in the directory heirarchy", 232}, - {"Forward", 233}, - {"Go to the next directory", 234}, - {"Rescan", 235}, - {"Rescan the current directory", 236}, - {"Home", 237}, - {"Go to your home directory", 238}, - {"Location:", 239}, - {"&Ok", 240}, - {"Offset 0x%08x", 241}, - {"Col %d", 242}, - {"%s bytes", 243}, - {"_Goto line", 244}, - {"Jump to a specified line number", 245}, - {"_Monitor file", 246}, - {"Monitor file growing", 247}, - {"Regexp search", 248}, - {"Regular expression search", 249}, - {"_Wrap", 250}, - {"Wrap the text", 251}, - {"_Parsed view", 252}, - {"_Formatted", 253}, - {"_Hex", 254}, - {"_Search", 255}, - {"ok", 256}, - {"cancel", 257}, - {"help", 258}, - {"yes", 259}, - {"no", 260}, - {"exit", 261}, - {"abort", 262}, - {" Error ", 263}, - {" Failed trying to open file for reading: ", 264}, - {" Cannot get size/permissions info on file: ", 265}, - {" Not an ordinary file: ", 266}, - {" File is too large: ", 267}, +Press OK to terminate the application, or cancel to continue using it.", 95}, + {"_Terminal", 96}, + {"Launch a new terminal in the current directory", 97}, + {"_Directory...", 98}, + {"Creates a new directory", 99}, + {"_Copy...", 100}, + {"Copy files", 101}, + {"_Delete...", 102}, + {"Delete files", 103}, + {"_Move...", 104}, + {"Rename or move files", 105}, + {"Show directory sizes", 106}, + {"Shows the disk space used by each directory", 107}, + {"Select _All", 108}, + {"Select all files in the current Panel", 109}, + {"_Select Files...", 110}, + {"Select a group of files", 111}, + {"_Invert Selection", 112}, + {"Reverses the list of tagged files", 113}, + {"_Rescan Directory", 114}, + {"Rescan the directory contents", 115}, + {"Icon View", 116}, + {"Partial View", 117}, + {"Full View", 118}, + {"Custom View", 119}, + {"_Sort By...", 120}, + {"Confirmation settings", 121}, + {"_Filter View...", 122}, + {"Global option settings", 123}, + {"_Find File...", 124}, + {"Locate files on disk", 125}, + {"_Run Command...", 126}, + {"Runs a command", 127}, + {"_Run Command in panel...", 128}, + {"Run a command and put the results in a panel", 129}, + {"_Active VFS list...", 130}, + {"List of active virtual file systems", 131}, + {"_Background jobs...", 132}, + {"List of background operations", 133}, + {"Exit", 134}, + {"Terminates the file manager and the desktop", 135}, + {"Rescan System Devices", 136}, + {"_Layout", 137}, + {"_Commands", 138}, + {"_Desktop", 139}, + {"_Help", 140}, + {"File/New/Directory...", 141}, + {"Properties", 142}, + {"Mount device", 143}, + {"Unmount device", 144}, + {"Eject device", 145}, + {"Open", 146}, + {"Open with", 147}, + {"View", 148}, + {"View unfiltered", 149}, + {"Edit", 150}, + {"Link...", 151}, + {"Symlink...", 152}, + {"Edit symlink...", 153}, + {"Move/rename...", 154}, + {"Copy...", 155}, + {"Delete", 156}, + {"Show backup files", 157}, + {"Show hidden files", 158}, + {"Mix files and directories", 159}, + {"Use shell patterns instead of regular expressions", 160}, + {"Confirm when deleting file", 161}, + {"Confirm when overwriting files", 162}, + {"Confirm when executing files", 163}, + {"Show progress while operations are being performed", 164}, + {"VFS Timeout:", 165}, + {"Seconds", 166}, + {"Anonymous FTP password:", 167}, + {"Always use FTP proxy", 168}, + {"Fast directory reload", 169}, + {"Compute totals before copying files", 170}, + {"FTP directory cache timeout :", 171}, + {"Allow customization of icons in icon view", 172}, + {"File display", 173}, + {"Confirmation", 174}, + {"VFS", 175}, + {"Caching", 176}, + {"Preferences", 177}, + {"Filename", 178}, + {"Full name: ", 179}, + {"Command", 180}, + {"Command:", 181}, + {"Use terminal", 182}, + {"File mode (permissions)", 183}, + {"Current mode: ", 184}, + {"Read", 185}, + {"Write", 186}, + {"Exec", 187}, + {"Special", 188}, + {"User", 189}, + {"Group", 190}, + {"Other", 191}, + {"Set UID", 192}, + {"Set GID", 193}, + {"Sticky", 194}, + {"", 195}, + {"Owner", 196}, + {"General", 197}, + {"Title", 198}, + {"Icon", 199}, + {"Select icon", 200}, + {"Rescan Directory", 201}, + {"Reloads the current directory", 202}, + {"New folder", 203}, + {"Creates a new folder here", 204}, + {"All files", 205}, + {"Archives and compressed files", 206}, + {"RPM/DEB files", 207}, + {"Text/Document files", 208}, + {"HTML and SGML files", 209}, + {"Postscript and PDF files", 210}, + {"Spreadsheet files", 211}, + {"Image files", 212}, + {"Video/animation files", 213}, + {"Audio files", 214}, + {"C program files", 215}, + {"C++ program files", 216}, + {"Objective-C program files", 217}, + {"Scheme program files", 218}, + {"Assembler program files", 219}, + {"Misc. program files", 220}, + {"Font files", 221}, + {"Search: %s", 222}, + {"%s bytes in %d file", 223}, + {"%s bytes in %d files", 224}, + {"", 225}, + {"Filter", 226}, + {"Switch view to an Icon view", 227}, + {"Brief", 228}, + {"Switch view to show just file name and type", 229}, + {"Detailed", 230}, + {"Switch view to show detailed file statistics", 231}, + {"Custom", 232}, + {"Switch view to show custom determined statistics.", 233}, + {"Back", 234}, + {"Go to the previously visited directory", 235}, + {"Up", 236}, + {"Go up a level in the directory heirarchy", 237}, + {"Forward", 238}, + {"Go to the next directory", 239}, + {"Rescan", 240}, + {"Rescan the current directory", 241}, + {"Home", 242}, + {"Go to your home directory", 243}, + {"Location:", 244}, + {"&Ok", 245}, + {"Offset 0x%08x", 246}, + {"Col %d", 247}, + {"%s bytes", 248}, + {"_Goto line", 249}, + {"Jump to a specified line number", 250}, + {"_Monitor file", 251}, + {"Monitor file growing", 252}, + {"Regexp search", 253}, + {"Regular expression search", 254}, + {"_Wrap", 255}, + {"Wrap the text", 256}, + {"_Parsed view", 257}, + {"_Formatted", 258}, + {"_Hex", 259}, + {"_Search", 260}, + {"ok", 261}, + {"cancel", 262}, + {"help", 263}, + {"yes", 264}, + {"no", 265}, + {"exit", 266}, + {"abort", 267}, + {" Error ", 268}, + {" Failed trying to open file for reading: ", 269}, + {" Cannot get size/permissions info on file: ", 270}, + {" Not an ordinary file: ", 271}, + {" File is too large: ", 272}, {"\ \n\ - Increase edit.h:MAXBUF and recompile the editor. ", 268}, - {" Error allocating memory ", 269}, - {" Save As ", 270}, - {" Warning ", 271}, - {" A file already exists with this name. ", 272}, - {"Overwrite", 273}, - {"Cancel", 274}, - {" Save as ", 275}, - {" Error trying to save file. ", 276}, - {" Delete macro ", 277}, - {" Error trying to open temp file ", 278}, - {" Error trying to open macro file ", 279}, - {"key '%d 0': ", 280}, - {" Error trying to overwrite macro file ", 281}, - {" Macro ", 282}, - {" Press the macro's new hotkey: ", 283}, - {" Save macro ", 284}, - {" Delete Macro ", 285}, - {" Load macro ", 286}, - {" Confirm save file? : ", 287}, - {" Save file ", 288}, - {"Save", 289}, + Increase edit.h:MAXBUF and recompile the editor. ", 273}, + {" Error allocating memory ", 274}, + {" Save As ", 275}, + {" Warning ", 276}, + {" A file already exists with this name. ", 277}, + {"Overwrite", 278}, + {"Cancel", 279}, + {" Save as ", 280}, + {" Error trying to save file. ", 281}, + {" Delete macro ", 282}, + {" Error trying to open temp file ", 283}, + {" Error trying to open macro file ", 284}, + {"key '%d 0': ", 285}, + {" Error trying to overwrite macro file ", 286}, + {" Macro ", 287}, + {" Press the macro's new hotkey: ", 288}, + {" Save macro ", 289}, + {" Delete Macro ", 290}, + {" Load macro ", 291}, + {" Confirm save file? : ", 292}, + {" Save file ", 293}, + {"Save", 294}, {"\ Current text was modified without a file save. \n\ - Continue discards these changes. ", 290}, - {"Continue", 291}, - {" Load ", 292}, - {" Error trying to open file for reading ", 293}, - {" Block is large, you may not be able to undo this action. ", 294}, - {" Continue ", 295}, - {" Cancel ", 296}, - {" Replace with: ", 297}, - {" Replace ", 298}, - {" Search ", 299}, - {" Enter search text : ", 300}, - {" Enter replace text : ", 301}, - {" Enter argument order : ", 302}, - {"Enter the order of replacement of your scanf format specifiers", 303}, - {" Whole words only ", 304}, - {" Case sensitive ", 305}, - {" Regular expression ", 306}, - {"See the regex man page for how to compose a regular expression", 307}, - {" Backwards ", 308}, - {"Warning: Searching backward can be slow", 309}, - {" Prompt on replace ", 310}, - {"Ask before making each replacement", 311}, - {" Replace all ", 312}, - {" Scanf expression ", 313}, - {"Allows entering of a C format string, see the scanf man page", 314}, - {"Begin search, Enter", 315}, - {"Abort this dialog, Esc", 316}, - {"Replace", 317}, - {"Skip", 318}, - {"Replace all", 319}, - {"\ - Invalid regular expression, or scanf expression with to many conversions ", 320}, - {" Error in replacement format string. ", 321}, - {" %ld replacements made. ", 322}, - {" Search string not found. ", 323}, - {" Quit ", 324}, + Continue discards these changes. ", 295}, + {"Continue", 296}, + {" Load ", 297}, + {" Error trying to open file for reading ", 298}, + {" Block is large, you may not be able to undo this action. ", 299}, + {" Continue ", 300}, + {" Cancel ", 301}, + {" Replace with: ", 302}, + {" Replace ", 303}, + {" Search ", 304}, + {" Enter search text : ", 305}, + {" Enter replace text : ", 306}, + {" Enter argument order : ", 307}, + {"Enter the order of replacement of your scanf format specifiers", 308}, + {" Whole words only ", 309}, + {" Case sensitive ", 310}, + {" Regular expression ", 311}, + {"See the regex man page for how to compose a regular expression", 312}, + {" Backwards ", 313}, + {"Warning: Searching backward can be slow", 314}, + {" Prompt on replace ", 315}, + {"Ask before making each replacement", 316}, + {" Replace all ", 317}, + {" Scanf expression ", 318}, + {"Allows entering of a C format string, see the scanf man page", 319}, + {"Begin search, Enter", 320}, + {"Abort this dialog, Esc", 321}, + {"Replace", 322}, + {"Skip", 323}, + {"Replace all", 324}, + {"\ + Invalid regular expression, or scanf expression with to many conversions ", 325}, + {" Error in replacement format string. ", 326}, + {" %ld replacements made. ", 327}, + {" Search string not found. ", 328}, + {" Quit ", 329}, {"\ Current text was modified without a file save. \n\ - Save with exit? ", 325}, - {" File was modified, Save with exit? ", 326}, - {"Cancel quit", 327}, - {" &Cancel quit ", 328}, - {" &Yes ", 329}, - {" &No ", 330}, - {" Copy to clipboard ", 331}, - {" Unable to save to file. ", 332}, - {" Cut to clipboard ", 333}, - {" Goto line ", 334}, - {" Enter line: ", 335}, - {" Save Block ", 336}, - {" Insert File ", 337}, - {" Insert file ", 338}, - {" Error trying to insert file. ", 339}, - {" Sort block ", 340}, - {" You must first highlight a block of text. ", 341}, - {" Run Sort ", 342}, - {" Enter sort options (see manpage) separated by whitespace: ", 343}, - {" Sort ", 344}, - {" Error trying to execute sort command ", 345}, - {" Sort returned non-zero: ", 346}, - {" Process block ", 347}, - {" Error trying to stat file ", 348}, - {" Mail ", 349}, - {"None", 350}, - {"Dynamic paragraphing", 351}, - {"Type writer wrap", 352}, - {"Wrap mode", 353}, - {"Key emulation", 354}, - {"Error initialising editor.\n", 355}, - {"Help", 356}, - {"Mark", 357}, - {"Replac", 358}, - {"Search", 359}, - {"PullDn", 360}, - {"Quit", 361}, - {" Word wrap ", 362}, - {" Enter line length, 0 for off: ", 363}, - {" About ", 364}, + Save with exit? ", 330}, + {" File was modified, Save with exit? ", 331}, + {"Cancel quit", 332}, + {" &Cancel quit ", 333}, + {" &Yes ", 334}, + {" &No ", 335}, + {" Copy to clipboard ", 336}, + {" Unable to save to file. ", 337}, + {" Cut to clipboard ", 338}, + {" Goto line ", 339}, + {" Enter line: ", 340}, + {" Save Block ", 341}, + {" Insert File ", 342}, + {" Insert file ", 343}, + {" Error trying to insert file. ", 344}, + {" Sort block ", 345}, + {" You must first highlight a block of text. ", 346}, + {" Run Sort ", 347}, + {" Enter sort options (see manpage) separated by whitespace: ", 348}, + {" Sort ", 349}, + {" Error trying to execute sort command ", 350}, + {" Sort returned non-zero: ", 351}, + {" Process block ", 352}, + {" Error trying to stat file ", 353}, + {" Mail ", 354}, + {"None", 355}, + {"Dynamic paragraphing", 356}, + {"Type writer wrap", 357}, + {"Wrap mode", 358}, + {"Key emulation", 359}, + {"Error initialising editor.\n", 360}, + {"Help", 361}, + {"Mark", 362}, + {"Replac", 363}, + {"Search", 364}, + {"PullDn", 365}, + {"Quit", 366}, + {" Word wrap ", 367}, + {" Enter line length, 0 for off: ", 368}, + {" About ", 369}, {"\ \n\ Cooledit v2.1\n\ @@ -405,619 +413,618 @@ Copyright (C) 1996 the Free Software Foundation\n\ \n\ A user friendly text editor written\n\ - for the Midnight Commander.\n", 365}, - {"&Open/load... C-o", 366}, - {"&New C-n", 367}, - {"&Save F2", 368}, - {"save &As... F12", 369}, - {"&Insert file... F15", 370}, - {"copy to &File... C-f", 371}, - {"a&Bout... ", 372}, - {"&Quit F10", 373}, - {"&New C-x k", 374}, - {"copy to &File... ", 375}, - {"&Toggle Mark F3", 376}, - {"&Mark Columns S-F3", 377}, - {"toggle &Ins/overw Ins", 378}, - {"&Copy F5", 379}, - {"&Move F6", 380}, - {"&Delete F8", 381}, - {"&Undo C-u", 382}, - {"&Beginning C-PgUp", 383}, - {"&End C-PgDn", 384}, - {"&Search... F7", 385}, - {"search &Again F17", 386}, - {"&Replace... F4", 387}, - {"&Goto line... M-l", 388}, - {"insert &Literal... C-q", 389}, - {"&Refresh screen C-l", 390}, - {"&Start record macro C-r", 391}, - {"&Finish record macro... C-r", 392}, - {"&Execute macro... C-a, KEY", 393}, - {"delete macr&O... ", 394}, - {"insert &Date/time ", 395}, - {"format p&Aragraph M-p", 396}, - {"'ispell' s&Pell check C-p", 397}, - {"sor&T... M-t", 398}, - {"'indent' &C Formatter F19", 399}, - {"&Mail... ", 400}, - {"&Execute macro... C-x e, KEY", 401}, - {"'ispell' s&Pell check M-$", 402}, - {"&General... ", 403}, - {"&Save mode...", 404}, - {"&Layout...", 405}, - {" File ", 406}, - {" Edit ", 407}, - {" Sear/Repl ", 408}, - {" Command ", 409}, - {" Options ", 410}, - {"Open...\tC-o", 411}, - {"New\tC-n", 412}, - {"Save\tF2", 413}, - {"Save as...\tF12", 414}, - {"Insert file...\tF15", 415}, - {"Copy to file...\tC-f", 416}, - {"Disk operations", 417}, - {"Toggle mark\tF3", 418}, - {"Toggle mark columns\tC-b", 419}, - {"Toggle insert/overwrite\tIns", 420}, - {"Copy block to cursor\tF5", 421}, - {"Move block to cursor\tF6", 422}, - {"Delete block\tF8/C-Del", 423}, - {"Copy block to clipbrd\tC-Ins", 424}, - {"Cut block to clipbrd\tS-Del", 425}, - {"Paste block from clipbrd\tS-Ins", 426}, - {"Selection history\tM-Ins", 427}, - {"Undo\tC-BackSpace", 428}, - {"Manipulating blocks of text", 429}, - {" Srch/Replce ", 430}, - {"Search...\tF7", 431}, - {"Search again\tF17", 432}, - {"Replace...\tF4", 433}, - {"Replace again\tF14", 434}, - {"Search for and replace text", 435}, - {"Goto line...\tM-l", 436}, - {"Start record macro\tC-r", 437}, - {"Finish record macro...\tC-r", 438}, - {"Execute macro...\tC-a, KEY", 439}, - {"Delete macro...\t", 440}, - {"Insert date/time\tC-d", 441}, - {"Format paragraph\tM-p", 442}, - {"Refresh display\tC-l", 443}, - {"Macros and internal commands", 444}, - {"&Dismiss", 445}, - {" Enter file name: ", 446}, - {"The Quick Brown Fox Jumps Over The Lazy Dog", 447}, - {"\ -gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n", 448}, - {"Clear the edit buffer", 449}, - {"Insert File", 450}, - {"Insert text from a file", 451}, - {"Copy to file", 452}, - {"copy a block to a file", 453}, - {"Search/Replace", 454}, - {" Load syntax file ", 455}, - {" File access error ", 456}, - {" Syntax error in file %s on line %d ", 457}, - {"&Cancel", 458}, - {"&Set", 459}, - {"S&kip", 460}, - {"Set &all", 461}, - {"owner", 462}, - {"group", 463}, - {"other", 464}, - {"On", 465}, - {"Flag", 466}, - {"Mode", 467}, - {"%6d of %d", 468}, - {" Chown advanced command ", 469}, + for the Midnight Commander.\n", 370}, + {"&Open/load... C-o", 371}, + {"&New C-n", 372}, + {"&Save F2", 373}, + {"save &As... F12", 374}, + {"&Insert file... F15", 375}, + {"copy to &File... C-f", 376}, + {"a&Bout... ", 377}, + {"&Quit F10", 378}, + {"&New C-x k", 379}, + {"copy to &File... ", 380}, + {"&Toggle Mark F3", 381}, + {"&Mark Columns S-F3", 382}, + {"toggle &Ins/overw Ins", 383}, + {"&Copy F5", 384}, + {"&Move F6", 385}, + {"&Delete F8", 386}, + {"&Undo C-u", 387}, + {"&Beginning C-PgUp", 388}, + {"&End C-PgDn", 389}, + {"&Search... F7", 390}, + {"search &Again F17", 391}, + {"&Replace... F4", 392}, + {"&Goto line... M-l", 393}, + {"insert &Literal... C-q", 394}, + {"&Refresh screen C-l", 395}, + {"&Start record macro C-r", 396}, + {"&Finish record macro... C-r", 397}, + {"&Execute macro... C-a, KEY", 398}, + {"delete macr&O... ", 399}, + {"insert &Date/time ", 400}, + {"format p&Aragraph M-p", 401}, + {"'ispell' s&Pell check C-p", 402}, + {"sor&T... M-t", 403}, + {"'indent' &C Formatter F19", 404}, + {"&Mail... ", 405}, + {"&Execute macro... C-x e, KEY", 406}, + {"'ispell' s&Pell check M-$", 407}, + {"&General... ", 408}, + {"&Save mode...", 409}, + {"&Layout...", 410}, + {" File ", 411}, + {" Edit ", 412}, + {" Sear/Repl ", 413}, + {" Command ", 414}, + {" Options ", 415}, + {"Open...\tC-o", 416}, + {"New\tC-n", 417}, + {"Save\tF2", 418}, + {"Save as...\tF12", 419}, + {"Insert file...\tF15", 420}, + {"Copy to file...\tC-f", 421}, + {"Disk operations", 422}, + {"Toggle mark\tF3", 423}, + {"Toggle mark columns\tC-b", 424}, + {"Toggle insert/overwrite\tIns", 425}, + {"Copy block to cursor\tF5", 426}, + {"Move block to cursor\tF6", 427}, + {"Delete block\tF8/C-Del", 428}, + {"Copy block to clipbrd\tC-Ins", 429}, + {"Cut block to clipbrd\tS-Del", 430}, + {"Paste block from clipbrd\tS-Ins", 431}, + {"Selection history\tM-Ins", 432}, + {"Undo\tC-BackSpace", 433}, + {"Manipulating blocks of text", 434}, + {" Srch/Replce ", 435}, + {"Search...\tF7", 436}, + {"Search again\tF17", 437}, + {"Replace...\tF4", 438}, + {"Replace again\tF14", 439}, + {"Search for and replace text", 440}, + {"Goto line...\tM-l", 441}, + {"Start record macro\tC-r", 442}, + {"Finish record macro...\tC-r", 443}, + {"Execute macro...\tC-a, KEY", 444}, + {"Delete macro...\t", 445}, + {"Insert date/time\tC-d", 446}, + {"Format paragraph\tM-p", 447}, + {"Refresh display\tC-l", 448}, + {"Macros and internal commands", 449}, + {"&Dismiss", 450}, + {" Enter file name: ", 451}, + {"The Quick Brown Fox Jumps Over The Lazy Dog", 452}, + {"\ +gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n", 453}, + {"Clear the edit buffer", 454}, + {"Insert File", 455}, + {"Insert text from a file", 456}, + {"Copy to file", 457}, + {"copy a block to a file", 458}, + {"Search/Replace", 459}, + {" Load syntax file ", 460}, + {" File access error ", 461}, + {" Syntax error in file %s on line %d ", 462}, + {"&Cancel", 463}, + {"&Set", 464}, + {"S&kip", 465}, + {"Set &all", 466}, + {"owner", 467}, + {"group", 468}, + {"other", 469}, + {"On", 470}, + {"Flag", 471}, + {"Mode", 472}, + {"%6d of %d", 473}, + {" Chown advanced command ", 474}, {"\ Couldn't chmod \"%s\" \n\ - %s ", 470}, + %s ", 475}, {"\ Couldn't chown \"%s\" \n\ - %s ", 471}, - {" Oops... ", 472}, - {" I can't run the Advanced Chown command on an extfs ", 473}, - {" I can't run the Advanced Chown command on a tarfs ", 474}, - {"Background process:", 475}, - {" Background process error ", 476}, - {" Child died unexpectedly ", 477}, - {" Unknown error in child ", 478}, - {" Background protocol error ", 479}, + %s ", 476}, + {" Oops... ", 477}, + {" I can't run the Advanced Chown command on an extfs ", 478}, + {" I can't run the Advanced Chown command on a tarfs ", 479}, + {"Background process:", 480}, + {" Background process error ", 481}, + {" Child died unexpectedly ", 482}, + {" Unknown error in child ", 483}, + {" Background protocol error ", 484}, {"\ Background process sent us a request for more arguments \n\ - than we can handle. \n", 480}, - {" Listing mode ", 481}, - {"&Full file list", 482}, - {"&Brief file list", 483}, - {"&Long file list", 484}, - {"&User defined:", 485}, - {"&Icon view", 486}, - {"user &Mini status", 487}, - {"Listing mode", 488}, - {"&Reverse", 489}, - {"case sensi&tive", 490}, - {"Sort order", 491}, - {" confirm &Exit ", 492}, - {" confirm e&Xecute ", 493}, - {" confirm o&Verwrite ", 494}, - {" confirm &Delete ", 495}, - {" Confirmation ", 496}, - {"Full 8 bits output", 497}, - {"ISO 8859-1", 498}, - {"7 bits", 499}, - {"F&ull 8 bits input", 500}, - {" Display bits ", 501}, - {"&Always use ftp proxy", 502}, - {"sec", 503}, - {"ftpfs directory cache timeout:", 504}, - {"ftp anonymous password:", 505}, - {"Timeout for freeing VFSs:", 506}, - {" Virtual File System Setting ", 507}, - {"Quick cd", 508}, - {"cd", 509}, - {"Symbolic link", 510}, - {"Symbolic link filename:", 511}, - {"Existing filename (filename symlink will point to):", 512}, - {"Running ", 513}, - {"Stopped", 514}, - {"&Stop", 515}, - {"&Resume", 516}, - {"&Kill", 517}, - {"Background Jobs", 518}, - {"execute/search by others", 519}, - {"write by others", 520}, - {"read by others", 521}, - {"execute/search by group", 522}, - {"write by group", 523}, - {"read by group", 524}, - {"execute/search by owner", 525}, - {"write by owner", 526}, - {"read by owner", 527}, - {"sticky bit", 528}, - {"set group ID on execution", 529}, - {"set user ID on execution", 530}, - {"C&lear marked", 531}, - {"S&et marked", 532}, - {"&Marked all", 533}, - {"Permissions (Octal)", 534}, - {"Owner name", 535}, - {"Group name", 536}, - {" Chmod command ", 537}, - {" Permission ", 538}, - {"Use SPACE to change", 539}, - {"an option, ARROW KEYS", 540}, - {"to move between options", 541}, - {"and T or INS to mark", 542}, - {"Chmod command", 543}, - {" I can't run the Chmod command on an extfs ", 544}, - {"Set &users", 545}, - {"Set &groups", 546}, - {" Name ", 547}, - {" Owner name ", 548}, - {" Group name ", 549}, - {" Size ", 550}, - {" Chown command ", 551}, - {" User name ", 552}, - {"", 553}, - {"", 554}, - {" I can't run the Chown command on an extfs ", 555}, - {" I can't run the Chown command on a tarfs ", 556}, - {" Can not fetch a local copy of %s ", 557}, - {" CD ", 558}, - {"Files tagged, want to cd?", 559}, - {"Could not change directory", 560}, - {" View file ", 561}, - {" Filename:", 562}, - {" Filtered view ", 563}, - {" Filter command and arguments:", 564}, - {"Create a new Directory", 565}, - {" Enter directory name:", 566}, - {" Filter ", 567}, - {" Set expression for filtering filenames", 568}, - {" Select ", 569}, - {" Malformed regular expression ", 570}, - {" Unselect ", 571}, - {"Extension file edit", 572}, - {" Which extension file you want to edit? ", 573}, - {"&User", 574}, - {"&System Wide", 575}, - {"Menu file edit", 576}, - {" Which menu file will you edit? ", 577}, - {"&Local", 578}, - {"&Home", 579}, - {" Compare directories ", 580}, - {" Select compare method: ", 581}, - {"&Quick", 582}, - {"&Size only", 583}, - {"&Thorough", 584}, - {" Both panels should be on the listing view mode to use this command ", 585}, - {" The command history is empty ", 586}, - {" Command history ", 587}, + than we can handle. \n", 485}, + {" Listing mode ", 486}, + {"&Full file list", 487}, + {"&Brief file list", 488}, + {"&Long file list", 489}, + {"&User defined:", 490}, + {"&Icon view", 491}, + {"user &Mini status", 492}, + {"Listing mode", 493}, + {"&Reverse", 494}, + {"case sensi&tive", 495}, + {"Sort order", 496}, + {" confirm &Exit ", 497}, + {" confirm e&Xecute ", 498}, + {" confirm o&Verwrite ", 499}, + {" confirm &Delete ", 500}, + {" Confirmation ", 501}, + {"Full 8 bits output", 502}, + {"ISO 8859-1", 503}, + {"7 bits", 504}, + {"F&ull 8 bits input", 505}, + {" Display bits ", 506}, + {"&Always use ftp proxy", 507}, + {"sec", 508}, + {"ftpfs directory cache timeout:", 509}, + {"ftp anonymous password:", 510}, + {"Timeout for freeing VFSs:", 511}, + {" Virtual File System Setting ", 512}, + {"Quick cd", 513}, + {"cd", 514}, + {"Symbolic link", 515}, + {"Symbolic link filename:", 516}, + {"Existing filename (filename symlink will point to):", 517}, + {"Running ", 518}, + {"Stopped", 519}, + {"&Stop", 520}, + {"&Resume", 521}, + {"&Kill", 522}, + {"Background Jobs", 523}, + {"execute/search by others", 524}, + {"write by others", 525}, + {"read by others", 526}, + {"execute/search by group", 527}, + {"write by group", 528}, + {"read by group", 529}, + {"execute/search by owner", 530}, + {"write by owner", 531}, + {"read by owner", 532}, + {"sticky bit", 533}, + {"set group ID on execution", 534}, + {"set user ID on execution", 535}, + {"C&lear marked", 536}, + {"S&et marked", 537}, + {"&Marked all", 538}, + {"Permissions (Octal)", 539}, + {"Owner name", 540}, + {"Group name", 541}, + {" Chmod command ", 542}, + {" Permission ", 543}, + {"Use SPACE to change", 544}, + {"an option, ARROW KEYS", 545}, + {"to move between options", 546}, + {"and T or INS to mark", 547}, + {"Chmod command", 548}, + {" I can't run the Chmod command on an extfs ", 549}, + {"Set &users", 550}, + {"Set &groups", 551}, + {" Name ", 552}, + {" Owner name ", 553}, + {" Group name ", 554}, + {" Size ", 555}, + {" Chown command ", 556}, + {" User name ", 557}, + {"", 558}, + {"", 559}, + {" I can't run the Chown command on an extfs ", 560}, + {" I can't run the Chown command on a tarfs ", 561}, + {" Can not fetch a local copy of %s ", 562}, + {" CD ", 563}, + {"Files tagged, want to cd?", 564}, + {"Could not change directory", 565}, + {" View file ", 566}, + {" Filename:", 567}, + {" Filtered view ", 568}, + {" Filter command and arguments:", 569}, + {"Create a new Directory", 570}, + {" Enter directory name:", 571}, + {" Filter ", 572}, + {" Set expression for filtering filenames", 573}, + {" Select ", 574}, + {" Malformed regular expression ", 575}, + {" Unselect ", 576}, + {"Extension file edit", 577}, + {" Which extension file you want to edit? ", 578}, + {"&User", 579}, + {"&System Wide", 580}, + {"Menu file edit", 581}, + {" Which menu file will you edit? ", 582}, + {"&Local", 583}, + {"&Home", 584}, + {" Compare directories ", 585}, + {" Select compare method: ", 586}, + {"&Quick", 587}, + {"&Size only", 588}, + {"&Thorough", 589}, + {" Both panels should be on the listing view mode to use this command ", 590}, + {" The command history is empty ", 591}, + {" Command history ", 592}, {"\ Not an xterm or Linux console; \n\ - the panels cannot be toggled. ", 588}, - {"Type `exit' to return to the Midnight Commander", 589}, + the panels cannot be toggled. ", 593}, + {"Type `exit' to return to the Midnight Commander", 594}, {"\ Couldn't stat %s \n\ - %s ", 590}, - {" Link ", 591}, - {" to:", 592}, - {" link: %s ", 593}, - {" symlink: %s ", 594}, - {" Symlink ", 595}, - {" points to:", 596}, - {" Edit symlink ", 597}, - {" edit symlink: %s ", 598}, - {" Link symbolically ", 599}, - {" Relative symlink ", 600}, - {" relative symlink: %s ", 601}, - {" Enter machine name (F1 for details): ", 602}, - {" Could not chdir to %s ", 603}, - {" Link to a remote machine ", 604}, - {" FTP to machine ", 605}, - {" Socket source routing setup ", 606}, - {" Enter host name to use as a source routing hop: ", 607}, - {" Host name ", 608}, - {" Error while looking up IP address ", 609}, - {" Undelete files on an ext2 file system ", 610}, + %s ", 595}, + {" Link ", 596}, + {" to:", 597}, + {" link: %s ", 598}, + {" symlink: %s ", 599}, + {" Symlink ", 600}, + {" points to:", 601}, + {" Edit symlink ", 602}, + {" edit symlink: %s ", 603}, + {" Link symbolically ", 604}, + {" Relative symlink ", 605}, + {" relative symlink: %s ", 606}, + {" Enter machine name (F1 for details): ", 607}, + {" Could not chdir to %s ", 608}, + {" Link to a remote machine ", 609}, + {" FTP to machine ", 610}, + {" Socket source routing setup ", 611}, + {" Enter host name to use as a source routing hop: ", 612}, + {" Host name ", 613}, + {" Error while looking up IP address ", 614}, + {" Undelete files on an ext2 file system ", 615}, {"\ Enter device (without /dev/) to undelete\n\ - files on: (F1 for details)", 611}, - {" Setup saved to ~/", 612}, - {" Setup ", 613}, + files on: (F1 for details)", 616}, + {" Setup saved to ~/", 617}, + {" Setup ", 618}, {"\ Can't chdir to '%s' \n\ - %s ", 614}, - {" You can not execute commands on non-local filesystems", 615}, + %s ", 619}, + {" You can not execute commands on non-local filesystems", 620}, {"\ \n\ \n\ \n\ refresh stack underflow!\n\ \n\ -\n", 616}, - {"&Unsorted", 617}, - {"&Name", 618}, - {"&Extension", 619}, - {"&Modify time", 620}, - {"&Access time", 621}, - {"&Change time", 622}, - {"&Size", 623}, - {"&Inode", 624}, - {"&Type", 625}, - {"&Links", 626}, - {"N&GID", 627}, - {"N&UID", 628}, - {"&Owner", 629}, - {"&Group", 630}, - {"File exists but can not be stat-ed: %s %s", 631}, - {"Unknown", 632}, +\n", 621}, + {"&Unsorted", 622}, + {"&Name", 623}, + {"&Extension", 624}, + {"&Modify time", 625}, + {"&Access time", 626}, + {"&Change time", 627}, + {"&Size", 628}, + {"&Inode", 629}, + {"&Type", 630}, + {"&Links", 631}, + {"N&GID", 632}, + {"N&UID", 633}, + {"&Owner", 634}, + {"&Group", 635}, + {"File exists but can not be stat-ed: %s %s", 636}, + {"Unknown", 637}, {"\ Can't create temporary command file \n\ - %s ", 633}, - {" Parameter ", 634}, - {" Can't execute commands on a Virtual File System directory ", 635}, - {" file error", 636}, - {"Format of the ", 637}, - {" file error ", 638}, - {"Format of the ~/", 639}, + %s ", 638}, + {" Parameter ", 639}, + {" Can't execute commands on a Virtual File System directory ", 640}, + {" file error", 641}, + {"Format of the ", 642}, + {" file error ", 643}, + {"Format of the ~/", 644}, {"\ file has changed\n\ with version 3.0. You may want either to\n\ -copy it from ", 640}, +copy it from ", 645}, {"\ mc.ext or use that\n\ -file as an example of how to write it.\n", 641}, - {"mc.ext will be used for this moment.", 642}, - {" Copy ", 643}, - {" Move ", 644}, - {" Delete ", 645}, - {" Invalid target mask ", 646}, - {" Could not make the hardlink ", 647}, +file as an example of how to write it.\n", 646}, + {"mc.ext will be used for this moment.", 647}, + {" Copy ", 648}, + {" Move ", 649}, + {" Delete ", 650}, + {" Invalid target mask ", 651}, + {" Could not make the hardlink ", 652}, {"\ Cannot read source link \"%s\" \n\ - %s ", 648}, + %s ", 653}, {"\ Cannot make stable symlinks across non-local filesystems: \n\ \n\ - Option Stable Symlinks will be disabled ", 649}, + Option Stable Symlinks will be disabled ", 654}, {"\ Cannot create target symlink \"%s\" \n\ - %s ", 650}, + %s ", 655}, {"\ Cannot overwrite directory \"%s\" \n\ - %s ", 651}, + %s ", 656}, {"\ Cannot stat source file \"%s\" \n\ - %s ", 652}, - {" `%s' and `%s' are the same file. ", 653}, + %s ", 657}, + {" `%s' and `%s' are the same file. ", 658}, {"\ Cannot create special file \"%s\" \n\ - %s ", 654}, + %s ", 659}, {"\ Cannot chown target file \"%s\" \n\ - %s ", 655}, + %s ", 660}, {"\ Cannot chmod target file \"%s\" \n\ - %s ", 656}, + %s ", 661}, {"\ Cannot open source file \"%s\" \n\ - %s ", 657}, - {" Reget failed, about to overwrite file ", 658}, + %s ", 662}, + {" Reget failed, about to overwrite file ", 663}, {"\ Cannot fstat source file \"%s\" \n\ - %s ", 659}, + %s ", 664}, {"\ Cannot create target file \"%s\" \n\ - %s ", 660}, + %s ", 665}, {"\ Cannot fstat target file \"%s\" \n\ - %s ", 661}, + %s ", 666}, {"\ Cannot read source file \"%s\" \n\ - %s ", 662}, + %s ", 667}, {"\ Cannot write target file \"%s\" \n\ - %s ", 663}, - {"(stalled)", 664}, + %s ", 668}, + {"(stalled)", 669}, {"\ Cannot close source file \"%s\" \n\ - %s ", 665}, + %s ", 670}, {"\ Cannot close target file \"%s\" \n\ - %s ", 666}, - {"Incomplete file was retrieved. Keep it?", 667}, - {"&Delete", 668}, - {"&Keep", 669}, + %s ", 671}, + {"Incomplete file was retrieved. Keep it?", 672}, + {"&Delete", 673}, + {"&Keep", 674}, {"\ Cannot stat source directory \"%s\" \n\ - %s ", 670}, + %s ", 675}, {"\ Source directory \"%s\" is not a directory \n\ - %s ", 671}, + %s ", 676}, {"\ Cannot copy cyclic symbolic link \n\ - `%s' ", 672}, + `%s' ", 677}, {"\ Cannot create target directory \"%s\" \n\ - %s ", 673}, + %s ", 678}, {"\ Cannot chown target directory \"%s\" \n\ - %s ", 674}, + %s ", 679}, {"\ Cannot stat file \"%s\" \n\ - %s ", 675}, - {" `%s' and `%s' are the same file ", 676}, - {" Cannot overwrite directory `%s' ", 677}, + %s ", 680}, + {" `%s' and `%s' are the same file ", 681}, + {" Cannot overwrite directory `%s' ", 682}, {"\ Cannot move file \"%s\" to \"%s\" \n\ - %s ", 678}, + %s ", 683}, {"\ Cannot remove file \"%s\" \n\ - %s ", 679}, - {" Cannot overwrite directory \"%s\" %s ", 680}, - {" Cannot overwrite file \"%s\" %s ", 681}, + %s ", 684}, + {" Cannot overwrite directory \"%s\" %s ", 685}, + {" Cannot overwrite file \"%s\" %s ", 686}, {"\ Cannot move directory \"%s\" to \"%s\" \n\ - %s ", 682}, + %s ", 687}, {"\ Cannot delete file \"%s\" \n\ - %s ", 683}, + %s ", 688}, {"\ Cannot remove directory \"%s\" \n\ - %s ", 684}, - {" Internal error: get_file \n", 685}, - {"1Copy", 686}, - {"1Move", 687}, - {"1Delete", 688}, - {"%o %f \"%s\"%m", 689}, - {"%o %d %f%m", 690}, - {"%o %f \"%s\"%e", 691}, - {"%o %d %f%e", 692}, - {"file", 693}, - {"files", 694}, - {"directory", 695}, - {"directories", 696}, - {"files/directories", 697}, - {" with source mask:", 698}, - {" Can't operate on \"..\"! ", 699}, - {"Yes", 700}, - {"No", 701}, - {" Sorry, I could not put the job in background ", 702}, - {" Internal failure ", 703}, - {" Unknown file operation ", 704}, + %s ", 689}, + {" Internal error: get_file \n", 690}, + {"1Copy", 691}, + {"1Move", 692}, + {"1Delete", 693}, + {"%o %f \"%s\"%m", 694}, + {"%o %d %f%m", 695}, + {"%o %f \"%s\"%e", 696}, + {"%o %d %f%e", 697}, + {"file", 698}, + {"files", 699}, + {"directory", 700}, + {"directories", 701}, + {"files/directories", 702}, + {" with source mask:", 703}, + {" Can't operate on \"..\"! ", 704}, + {"Yes", 705}, + {"No", 706}, + {" Sorry, I could not put the job in background ", 707}, + {" Internal failure ", 708}, + {" Unknown file operation ", 709}, {"\ Destination \"%s\" must be a directory \n\ - %s ", 705}, - {"&Skip", 706}, - {"&Retry", 707}, - {"&Abort", 708}, + %s ", 710}, + {"&Skip", 711}, + {"&Retry", 712}, + {"&Abort", 713}, {"\ \n\ Directory not empty. \n\ - Delete it recursively? ", 709}, + Delete it recursively? ", 714}, {"\ \n\ Background process: Directory not empty \n\ - Delete it recursively? ", 710}, - {" Delete: ", 711}, - {"a&ll", 712}, - {"non&E", 713}, - {" Type 'yes' if you REALLY want to delete ", 714}, - {"all the directories ", 715}, - {" Recursive Delete ", 716}, - {" Background process: Recursive Delete ", 717}, - {"File", 718}, - {"Count", 719}, - {"Bytes", 720}, - {"Source", 721}, - {"Target", 722}, - {"Deleting", 723}, - {"Target file \"%s\" already exists!", 724}, - {"if &Size differs", 725}, - {"&Update", 726}, - {"al&L", 727}, - {"Overwrite all targets?", 728}, - {"&Reget", 729}, - {"ap&Pend", 730}, - {"Overwrite this target?", 731}, - {"Target date: %s, size %d", 732}, - {"Source date: %s, size %d", 733}, - {" File exists ", 734}, - {" Background process: File exists ", 735}, - {"preserve &Attributes", 736}, - {"follow &Links", 737}, - {"to:", 738}, - {"&Using shell patterns", 739}, - {"&Background", 740}, - {"&Stable Symlinks", 741}, - {"&Dive into subdir if exists", 742}, + Delete it recursively? ", 715}, + {"a&ll", 716}, + {"non&E", 717}, + {" Type 'yes' if you REALLY want to delete ", 718}, + {"all the directories ", 719}, + {" Recursive Delete ", 720}, + {" Background process: Recursive Delete ", 721}, + {"File", 722}, + {"Count", 723}, + {"Bytes", 724}, + {"Source", 725}, + {"Target", 726}, + {"Deleting", 727}, + {"Target file \"%s\" already exists!", 728}, + {"if &Size differs", 729}, + {"&Update", 730}, + {"al&L", 731}, + {"Overwrite all targets?", 732}, + {"&Reget", 733}, + {"ap&Pend", 734}, + {"Overwrite this target?", 735}, + {"Target date: %s, size %d", 736}, + {"Source date: %s, size %d", 737}, + {" File exists ", 738}, + {" Background process: File exists ", 739}, + {"preserve &Attributes", 740}, + {"follow &Links", 741}, + {"to:", 742}, + {"&Using shell patterns", 743}, + {"&Background", 744}, + {"&Stable Symlinks", 745}, + {"&Dive into subdir if exists", 746}, {"\ Invalid source pattern `%s' \n\ - %s ", 743}, - {"&Suspend", 744}, - {"Con&tinue", 745}, - {"&Chdir", 746}, - {"&Again", 747}, - {"&Quit", 748}, - {"Pane&lize", 749}, - {"&View - F3", 750}, - {"&Edit - F4", 751}, - {"Start at:", 752}, - {"Filename:", 753}, - {"Content: ", 754}, - {"&Tree", 755}, - {"Find File", 756}, - {"Grepping in %s", 757}, - {" Find/read ", 758}, - {" Problem reading from child ", 759}, - {"Finished", 760}, - {"Searching %s", 761}, - {"Suspend", 762}, - {"Restart", 763}, - {"Searching", 764}, - {"Find file", 765}, - {"Change to this directory", 766}, - {"Search again", 767}, - {"View this file", 768}, - {"Edit this file", 769}, - {"Send the results to a Panel", 770}, - {"Usage: fixhlp \n", 771}, - {"fixhlp: Cannot open toc for writing", 772}, + %s ", 747}, + {"&Suspend", 748}, + {"Con&tinue", 749}, + {"&Chdir", 750}, + {"&Again", 751}, + {"&Quit", 752}, + {"Pane&lize", 753}, + {"&View - F3", 754}, + {"&Edit - F4", 755}, + {"Start at:", 756}, + {"Filename:", 757}, + {"Content: ", 758}, + {"&Tree", 759}, + {"Find File", 760}, + {"Grepping in %s", 761}, + {" Find/read ", 762}, + {" Problem reading from child ", 763}, + {"Finished", 764}, + {"Searching %s", 765}, + {"Suspend", 766}, + {"Restart", 767}, + {"Searching", 768}, + {"Find file", 769}, + {"Change to this directory", 770}, + {"Search again", 771}, + {"View this file", 772}, + {"Edit this file", 773}, + {"Send the results to a Panel", 774}, + {"Usage: fixhlp \n", 775}, + {"fixhlp: Cannot open toc for writing", 776}, {"\ [Contents]\n\ Topics:\n\ -\n", 773}, +\n", 777}, {"\ Help file format error\n\ -", 774}, - {" Internal bug: Double start of link area ", 775}, - {" Can't find node [Contents] in help file ", 776}, - {" Help ", 777}, +", 778}, + {" Internal bug: Double start of link area ", 779}, + {" Can't find node [Contents] in help file ", 780}, + {" Help ", 781}, {"\ Can't open file %s \n\ - %s ", 778}, - {" Can't find node %s in help file ", 779}, - {"Index", 780}, - {"Prev", 781}, - {"&Move", 782}, - {"&Remove", 783}, - {"&Append", 784}, - {"&Insert", 785}, - {"New &Entry", 786}, - {"New &Group", 787}, - {"&Up", 788}, - {"&Add current", 789}, - {"Change &To", 790}, - {"Subgroup - press ENTER to see list", 791}, - {"Active VFS directories", 792}, - {"Directory hotlist", 793}, - {" Directory path ", 794}, - {" Directory label ", 795}, - {"Moving ", 796}, - {"New hotlist entry", 797}, - {"Directory label", 798}, - {"Directory path", 799}, - {" New hotlist group ", 800}, - {"Name of new group", 801}, - {"Label for \"%s\":", 802}, - {" Add to hotlist ", 803}, - {" Remove: ", 804}, + %s ", 782}, + {" Can't find node %s in help file ", 783}, + {"Index", 784}, + {"Prev", 785}, + {"&Move", 786}, + {"&Remove", 787}, + {"&Append", 788}, + {"&Insert", 789}, + {"New &Entry", 790}, + {"New &Group", 791}, + {"&Up", 792}, + {"&Add current", 793}, + {"Change &To", 794}, + {"Subgroup - press ENTER to see list", 795}, + {"Active VFS directories", 796}, + {"Directory hotlist", 797}, + {" Directory path ", 798}, + {" Directory label ", 799}, + {"Moving ", 800}, + {"New hotlist entry", 801}, + {"Directory label", 802}, + {"Directory path", 803}, + {" New hotlist group ", 804}, + {"Name of new group", 805}, + {"Label for \"%s\":", 806}, + {" Add to hotlist ", 807}, + {" Remove: ", 808}, {"\ \n\ Group not empty.\n\ - Remove it?", 805}, - {" Top level group ", 806}, - {"Hotlist is now kept in file ~/", 807}, - {"MC will load hotlist from ~/", 808}, - {"and then delete [Hotlist] section there", 809}, - {" Hotlist Load ", 810}, - {"MC was unable to write ~/", 811}, - {" file, your old hotlist entries were not deleted", 812}, - {"You have ~/", 813}, - {" file and [Hotlist] section in ~/", 814}, - {"Your ~/", 815}, - {" most probably was created\n", 816}, + Remove it?", 809}, + {" Top level group ", 810}, + {"Hotlist is now kept in file ~/", 811}, + {"MC will load hotlist from ~/", 812}, + {"and then delete [Hotlist] section there", 813}, + {" Hotlist Load ", 814}, + {"MC was unable to write ~/", 815}, + {" file, your old hotlist entries were not deleted", 816}, + {"You have ~/", 817}, + {" file and [Hotlist] section in ~/", 818}, + {"Your ~/", 819}, + {" most probably was created\n", 820}, {"\ by an earlier development version of MC\n\ -and is more actual than ~/", 817}, +and is more actual than ~/", 821}, {"\ entries\n\ -\n", 818}, +\n", 822}, {"\ You can choose between\n\ \n\ - Remove - remove old hotlist entries from ~/", 819}, + Remove - remove old hotlist entries from ~/", 823}, {"\ Keep - keep your old entries; you will be asked\n\ the same question next time\n\ - Merge - add old entries to hotlist as group \"Entries from ~/", 820}, - {"&Merge", 821}, - {" Entries from ~/", 822}, - {" file your old hotlist entries were not deleted", 823}, - {"Midnight Commander %s", 824}, - {"Free nodes %d (%d%%) of %d", 825}, - {"No node information", 826}, - {"Free space ", 827}, - {" (%d%%) of ", 828}, - {"No space information", 829}, - {"Type: %s ", 830}, - {"non-local vfs", 831}, - {"Device: %s", 832}, - {"Filesystem: %s", 833}, - {"Accessed: %s", 834}, - {"Modified: %s", 835}, - {"Created: %s", 836}, - {"Size: ", 837}, - {" (%d blocks)", 838}, - {"Owner: %s/%s", 839}, - {"Links: %d", 840}, - {"Mode: %s (%04o)", 841}, - {"Location: %Xh:%Xh", 842}, - {"File: %s", 843}, - {"File: None", 844}, - {"&Vertical", 845}, - {"&Horizontal", 846}, - {"&Xterm hintbar", 847}, - {"h&Intbar visible", 848}, - {"&Keybar visible", 849}, - {"command &Prompt", 850}, - {"show &Mini status", 851}, - {"menu&Bar visible", 852}, - {"&Equal split", 853}, - {"pe&Rmissions", 854}, - {"&File types", 855}, - {"&Save", 856}, - {" Layout ", 857}, - {" Panel split ", 858}, - {" Highlight... ", 859}, - {" Other options ", 860}, - {"output lines", 861}, - {"Layout", 862}, - {" Learn keys ", 863}, - {" Teach me a key ", 864}, + Merge - add old entries to hotlist as group \"Entries from ~/", 824}, + {"&Merge", 825}, + {" Entries from ~/", 826}, + {" file your old hotlist entries were not deleted", 827}, + {"Midnight Commander %s", 828}, + {"Free nodes %d (%d%%) of %d", 829}, + {"No node information", 830}, + {"Free space ", 831}, + {" (%d%%) of ", 832}, + {"No space information", 833}, + {"Type: %s ", 834}, + {"non-local vfs", 835}, + {"Device: %s", 836}, + {"Filesystem: %s", 837}, + {"Accessed: %s", 838}, + {"Modified: %s", 839}, + {"Created: %s", 840}, + {"Size: ", 841}, + {" (%d blocks)", 842}, + {"Owner: %s/%s", 843}, + {"Links: %d", 844}, + {"Mode: %s (%04o)", 845}, + {"Location: %Xh:%Xh", 846}, + {"File: %s", 847}, + {"File: None", 848}, + {"&Vertical", 849}, + {"&Horizontal", 850}, + {"&Xterm hintbar", 851}, + {"h&Intbar visible", 852}, + {"&Keybar visible", 853}, + {"command &Prompt", 854}, + {"show &Mini status", 855}, + {"menu&Bar visible", 856}, + {"&Equal split", 857}, + {"pe&Rmissions", 858}, + {"&File types", 859}, + {"&Save", 860}, + {" Layout ", 861}, + {" Panel split ", 862}, + {" Highlight... ", 863}, + {" Other options ", 864}, + {"output lines", 865}, + {"Layout", 866}, + {" Learn keys ", 867}, + {" Teach me a key ", 868}, {"\ Please press the %s\n\ and then wait until this message disappears.\n\ @@ -1026,329 +1033,329 @@ next to its button.\n\ \n\ If you want to escape, press a single Escape key\n\ -and wait as well.", 865}, - {" Cannot accept this key ", 866}, - {" You have entered \"%s\"", 867}, - {"OK", 868}, +and wait as well.", 869}, + {" Cannot accept this key ", 870}, + {" You have entered \"%s\"", 871}, + {"OK", 872}, {"\ It seems that all your keys already\n\ -work fine. That's great.", 869}, - {"&Discard", 870}, +work fine. That's great.", 873}, + {"&Discard", 874}, {"\ Great! You have a complete terminal database!\n\ -All your keys work well.", 871}, - {"Learn keys", 872}, - {"Press all the keys mentioned here. After you have done it, check", 873}, - {"which keys are not marked with OK. Press space on the missing", 874}, - {"key, or click with the mouse to define it. Move around with Tab.", 875}, +All your keys work well.", 875}, + {"Learn keys", 876}, + {"Press all the keys mentioned here. After you have done it, check", 877}, + {"which keys are not marked with OK. Press space on the missing", 878}, + {"key, or click with the mouse to define it. Move around with Tab.", 879}, {"\ The Commander can't change to the directory that \n\ the subshell claims you are in. Perhaps you have \n\ deleted your working directory, or given yourself \n\ - extra access permissions with the \"su\" command? ", 876}, - {"Press any key to continue...", 877}, - {" The shell is already running a command ", 878}, - {"&Listing mode...", 879}, - {"&Quick view C-x q", 880}, - {"&Info C-x i", 881}, - {"&Sort order...", 882}, - {"&Filter...", 883}, - {"&Network link...", 884}, - {"FT&P link...", 885}, - {"&Drive... M-d", 886}, - {"&Rescan C-r", 887}, - {"&User menu F2", 888}, - {"&View F3", 889}, - {"Vie&w file... ", 890}, - {"&Filtered view M-!", 891}, - {"&Edit F4", 892}, - {"&Copy F5", 893}, - {"c&Hmod C-x c", 894}, - {"&Link C-x l", 895}, - {"&SymLink C-x s", 896}, - {"edit s&Ymlink C-x C-s", 897}, - {"ch&Own C-x o", 898}, - {"&Advanced chown ", 899}, - {"&Rename/Move F6", 900}, - {"&Mkdir F7", 901}, - {"&Delete F8", 902}, - {"&Quick cd M-c", 903}, - {"select &Group M-+", 904}, - {"u&Nselect group M-\\", 905}, - {"reverse selec&Tion M-*", 906}, - {"e&Xit F10", 907}, - {"&Directory tree", 908}, - {"&Find file M-?", 909}, - {"s&Wap panels C-u", 910}, - {"switch &Panels on/off C-o", 911}, - {"&Compare directories C-x d", 912}, - {"e&Xternal panelize C-x !", 913}, - {"show directory s&Izes", 914}, - {"command &History", 915}, - {"di&Rectory hotlist C-\\", 916}, - {"&Active VFS list C-x a", 917}, - {"&Background jobs C-x j", 918}, - {"&Undelete files (ext2fs only)", 919}, - {"&Listing format edit", 920}, - {"&Extension file edit", 921}, - {"&Menu file edit", 922}, - {"&Configuration...", 923}, - {"c&Onfirmation...", 924}, - {"&Display bits...", 925}, - {"learn &Keys...", 926}, - {"&Virtual FS...", 927}, - {"&Save setup", 928}, - {" &Left ", 929}, - {" &Above ", 930}, - {" &File ", 931}, - {" &Command ", 932}, - {" &Options ", 933}, - {" &Right ", 934}, - {" &Below ", 935}, - {" Information ", 936}, + extra access permissions with the \"su\" command? ", 880}, + {"Press any key to continue...", 881}, + {" The shell is already running a command ", 882}, + {"&Listing mode...", 883}, + {"&Quick view C-x q", 884}, + {"&Info C-x i", 885}, + {"&Sort order...", 886}, + {"&Filter...", 887}, + {"&Network link...", 888}, + {"FT&P link...", 889}, + {"&Drive... M-d", 890}, + {"&Rescan C-r", 891}, + {"&User menu F2", 892}, + {"&View F3", 893}, + {"Vie&w file... ", 894}, + {"&Filtered view M-!", 895}, + {"&Edit F4", 896}, + {"&Copy F5", 897}, + {"c&Hmod C-x c", 898}, + {"&Link C-x l", 899}, + {"&SymLink C-x s", 900}, + {"edit s&Ymlink C-x C-s", 901}, + {"ch&Own C-x o", 902}, + {"&Advanced chown ", 903}, + {"&Rename/Move F6", 904}, + {"&Mkdir F7", 905}, + {"&Delete F8", 906}, + {"&Quick cd M-c", 907}, + {"select &Group M-+", 908}, + {"u&Nselect group M-\\", 909}, + {"reverse selec&Tion M-*", 910}, + {"e&Xit F10", 911}, + {"&Directory tree", 912}, + {"&Find file M-?", 913}, + {"s&Wap panels C-u", 914}, + {"switch &Panels on/off C-o", 915}, + {"&Compare directories C-x d", 916}, + {"e&Xternal panelize C-x !", 917}, + {"show directory s&Izes", 918}, + {"command &History", 919}, + {"di&Rectory hotlist C-\\", 920}, + {"&Active VFS list C-x a", 921}, + {"&Background jobs C-x j", 922}, + {"&Undelete files (ext2fs only)", 923}, + {"&Listing format edit", 924}, + {"&Extension file edit", 925}, + {"&Menu file edit", 926}, + {"&Configuration...", 927}, + {"c&Onfirmation...", 928}, + {"&Display bits...", 929}, + {"learn &Keys...", 930}, + {"&Virtual FS...", 931}, + {"&Save setup", 932}, + {" &Left ", 933}, + {" &Above ", 934}, + {" &File ", 935}, + {" &Command ", 936}, + {" &Options ", 937}, + {" &Right ", 938}, + {" &Below ", 939}, + {" Information ", 940}, {"\ Using the fast reload option may not reflect the exact \n\ directory contents. In this cases you'll need to do a \n\ manual reload of the directory. See the man page for \n\ - the details. ", 937}, - {"Menu", 938}, - {"Thank you for using GNU Midnight Commander", 939}, - {"with mouse support on xterm%s.\n", 940}, - {" and the Linux console", 941}, - {"The TERM environment variable is unset!\n", 942}, - {"Library directory for the Midnight Commander: %s\n", 943}, - {"\ -Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 944}, - {"Geometry for the window", 945}, - {"GEOMETRY", 946}, - {"No windows opened at startup", 947}, - {"Force activation even if a server is already running", 948}, + the details. ", 941}, + {"Menu", 942}, + {"Thank you for using GNU Midnight Commander", 943}, + {"with mouse support on xterm%s.\n", 944}, + {" and the Linux console", 945}, + {"The TERM environment variable is unset!\n", 946}, + {"Library directory for the Midnight Commander: %s\n", 947}, + {"\ +Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 948}, + {"Geometry for the window", 949}, + {"GEOMETRY", 950}, + {"No windows opened at startup", 951}, + {"Force activation even if a server is already running", 952}, {"\ Couldn't open tty line. You have to run mc without the -P flag.\n\ -On some systems you may want to run # `which mc`\n", 949}, - {" Notice ", 950}, +On some systems you may want to run # `which mc`\n", 953}, + {" Notice ", 954}, {"\ The Midnight Commander configuration files \n\ are now stored in the ~/.mc directory, the \n\ - files have been moved now\n", 951}, - {"safe de&Lete", 952}, - {"cd follows lin&Ks", 953}, - {"advanced cho&Wn", 954}, - {"l&Ynx-like motion", 955}, - {"Animation", 956}, - {"rotatin&G dash", 957}, - {"co&Mplete: show all", 958}, - {"&Use internal view", 959}, - {"use internal ed&It", 960}, - {"auto m&Enus", 961}, - {"&Auto save setup", 962}, - {"shell &Patterns", 963}, - {"Compute &Totals", 964}, - {"&Verbose operation", 965}, - {"&Fast dir reload", 966}, - {"mi&X all files", 967}, - {"&Drop down menus", 968}, - {"ma&Rk moves down", 969}, - {"show &Hidden files", 970}, - {"show &Backup files", 971}, - {"&Never", 972}, - {"on dumb &Terminals", 973}, - {"alwa&Ys", 974}, - {" Configure options ", 975}, - {" Panel options ", 976}, - {" Pause after run... ", 977}, - {"Configure options", 978}, - {"&Add new", 979}, - {" External panelize ", 980}, - {"External panelize", 981}, - {"Other command", 982}, - {" Add to external panelize ", 983}, - {" Enter command label: ", 984}, - {" I can't run external panelize while logged on a non local directory ", 985}, - {"Find *.orig after patching", 986}, - {"Find SUID and SGID programs", 987}, - {"Cannot invoke command.", 988}, - {"Pipe close failed", 989}, - {"Show this help message", 990}, - {"Display brief usage message", 991}, - {"MTime", 992}, - {"ATime", 993}, - {"CTime", 994}, - {"Permission", 995}, - {"Perm", 996}, - {"Nl", 997}, - {"Inode", 998}, - {"UID", 999}, - {"GID", 1000}, - {" %s bytes in %d file%s", 1001}, - {"Unknow tag on display format: ", 1002}, - {" Do you really want to execute? ", 1003}, - {" No action taken ", 1004}, - {"RenMov", 1005}, - {"Mkdir", 1006}, + files have been moved now\n", 955}, + {"safe de&Lete", 956}, + {"cd follows lin&Ks", 957}, + {"advanced cho&Wn", 958}, + {"l&Ynx-like motion", 959}, + {"Animation", 960}, + {"rotatin&G dash", 961}, + {"co&Mplete: show all", 962}, + {"&Use internal view", 963}, + {"use internal ed&It", 964}, + {"auto m&Enus", 965}, + {"&Auto save setup", 966}, + {"shell &Patterns", 967}, + {"Compute &Totals", 968}, + {"&Verbose operation", 969}, + {"&Fast dir reload", 970}, + {"mi&X all files", 971}, + {"&Drop down menus", 972}, + {"ma&Rk moves down", 973}, + {"show &Hidden files", 974}, + {"show &Backup files", 975}, + {"&Never", 976}, + {"on dumb &Terminals", 977}, + {"alwa&Ys", 978}, + {" Configure options ", 979}, + {" Panel options ", 980}, + {" Pause after run... ", 981}, + {"Configure options", 982}, + {"&Add new", 983}, + {" External panelize ", 984}, + {"External panelize", 985}, + {"Other command", 986}, + {" Add to external panelize ", 987}, + {" Enter command label: ", 988}, + {" I can't run external panelize while logged on a non local directory ", 989}, + {"Find *.orig after patching", 990}, + {"Find SUID and SGID programs", 991}, + {"Cannot invoke command.", 992}, + {"Pipe close failed", 993}, + {"Show this help message", 994}, + {"Display brief usage message", 995}, + {"MTime", 996}, + {"ATime", 997}, + {"CTime", 998}, + {"Permission", 999}, + {"Perm", 1000}, + {"Nl", 1001}, + {"Inode", 1002}, + {"UID", 1003}, + {"GID", 1004}, + {" %s bytes in %d file%s", 1005}, + {"Unknow tag on display format: ", 1006}, + {" Do you really want to execute? ", 1007}, + {" No action taken ", 1008}, + {"RenMov", 1009}, + {"Mkdir", 1010}, {"\ Can't chdir to %s \n\ - %s ", 1007}, - {"Couldn't open named pipe %s\n", 1008}, - {" The shell is still active. Quit anyway? ", 1009}, - {" There are stopped jobs.", 1010}, - {" Quit anyway? ", 1011}, - {"Warning: Couldn't change to %s.\n", 1012}, + %s ", 1011}, + {"Couldn't open named pipe %s\n", 1012}, + {" The shell is still active. Quit anyway? ", 1013}, + {" There are stopped jobs.", 1014}, + {" Quit anyway? ", 1015}, + {"Warning: Couldn't change to %s.\n", 1016}, {"\ Can't open the %s file for writing:\n\ -%s\n", 1013}, - {"Copy \"%s\" directory to:", 1014}, - {"Move \"%s\" directory to:", 1015}, +%s\n", 1017}, + {"Copy \"%s\" directory to:", 1018}, + {"Move \"%s\" directory to:", 1019}, {"\ Can't stat the destination \n\ - %s ", 1016}, - {" The destination isn't a directory ", 1017}, - {" Delete %s? ", 1018}, - {"Static", 1019}, - {"Dynamc", 1020}, + %s ", 1020}, + {" The destination isn't a directory ", 1021}, + {" Delete %s? ", 1022}, + {"Static", 1023}, + {"Dynamc", 1024}, {"\ Can't chdir to \"%s\" \n\ - %s ", 1021}, - {"Forget", 1022}, - {"Rmdir", 1023}, + %s ", 1025}, + {"Forget", 1026}, + {"Rmdir", 1027}, {"\ Can't write to the %s file:\n\ -%s\n", 1024}, - {" Invalid shell pattern defination \"%c\". ", 1025}, - {" Debug ", 1026}, - {" ERROR: ", 1027}, - {" True: ", 1028}, - {" False: ", 1029}, - {" Warning -- ignoring file ", 1030}, +%s\n", 1028}, + {" Invalid shell pattern defination \"%c\". ", 1029}, + {" Debug ", 1030}, + {" ERROR: ", 1031}, + {" True: ", 1032}, + {" False: ", 1033}, + {" Warning -- ignoring file ", 1034}, {"\ File %s is not owned by root or you or is world writable.\n\ -Using it may compromise your security", 1031}, - {" I can't run programs while logged on a non local directory ", 1032}, - {" User menu ", 1033}, - {"name_trunc: too big", 1034}, - {" Pipe failed ", 1035}, - {" Dup failed ", 1036}, +Using it may compromise your security", 1035}, + {" I can't run programs while logged on a non local directory ", 1036}, + {" User menu ", 1037}, + {"name_trunc: too big", 1038}, + {" Pipe failed ", 1039}, + {" Dup failed ", 1040}, {"\ File: \n\ \n\ - ", 1037}, + ", 1041}, {"\ \n\ \n\ -has been modified, do you want to save the changes?\n", 1038}, - {" Save changes ", 1039}, - {" Can't spawn child program ", 1040}, - {" Empty output from child filter ", 1041}, - {" Could not open file ", 1042}, - {" Can't open file \"", 1043}, +has been modified, do you want to save the changes?\n", 1042}, + {" Save changes ", 1043}, + {" Can't spawn child program ", 1044}, + {" Empty output from child filter ", 1045}, + {" Could not open file ", 1046}, + {" Can't open file \"", 1047}, {"\ Can't stat file \n\ - ", 1044}, - {" Can't view: not a regular file ", 1045}, - {"File: %s", 1046}, - {" [grow]", 1047}, - {"Searching for `%s'", 1048}, - {" Search string not found ", 1049}, - {" Invalid regular expression ", 1050}, + ", 1048}, + {" Can't view: not a regular file ", 1049}, + {"File: %s", 1050}, + {" [grow]", 1051}, + {"Searching for `%s'", 1052}, + {" Search string not found ", 1053}, + {" Invalid regular expression ", 1054}, {"\ The current line number is %d.\n\ - Enter the new line number:", 1051}, - {" Enter regexp:", 1052}, - {" Enter search string:", 1053}, - {"Ascii", 1054}, - {"Hex", 1055}, - {"Line", 1056}, - {"RxSrch", 1057}, - {"EdText", 1058}, - {"EdHex", 1059}, - {"UnWrap", 1060}, - {"Wrap", 1061}, - {"HxSrch", 1062}, - {"Raw", 1063}, - {"Parse", 1064}, - {"Unform", 1065}, - {"Format", 1066}, - {"Function key 1", 1067}, - {"Function key 2", 1068}, - {"Function key 3", 1069}, - {"Function key 4", 1070}, - {"Function key 5", 1071}, - {"Function key 6", 1072}, - {"Function key 7", 1073}, - {"Function key 8", 1074}, - {"Function key 9", 1075}, - {"Function key 10", 1076}, - {"Function key 11", 1077}, - {"Function key 12", 1078}, - {"Function key 13", 1079}, - {"Function key 14", 1080}, - {"Function key 15", 1081}, - {"Function key 16", 1082}, - {"Function key 17", 1083}, - {"Function key 18", 1084}, - {"Function key 19", 1085}, - {"Function key 20", 1086}, - {"Backspace key", 1087}, - {"End key", 1088}, - {"Up arrow key", 1089}, - {"Down arrow key", 1090}, - {"Left arrow key", 1091}, - {"Right arrow key", 1092}, - {"Home key", 1093}, - {"Page Down key", 1094}, - {"Page Up key", 1095}, - {"Insert key", 1096}, - {"Delete key", 1097}, - {"Completion/M-tab", 1098}, - {"+ on keypad", 1099}, - {"- on keypad", 1100}, - {"* on keypad", 1101}, - {"Left arrow keypad", 1102}, - {"Right arrow keypad", 1103}, - {"Up arrow keypad", 1104}, - {"Down arrow keypad", 1105}, - {"Home on keypad", 1106}, - {"End on keypad", 1107}, - {"Page Down keypad", 1108}, - {"Page Up keypad", 1109}, - {"Insert on keypad", 1110}, - {"Delete on keypad", 1111}, - {"Enter on keypad", 1112}, - {"Slash on keypad", 1113}, - {"NumLock on keypad", 1114}, - {"Password:", 1115}, - {"Password", 1116}, - {"Ok", 1117}, + Enter the new line number:", 1055}, + {" Enter regexp:", 1056}, + {" Enter search string:", 1057}, + {"Ascii", 1058}, + {"Hex", 1059}, + {"Line", 1060}, + {"RxSrch", 1061}, + {"EdText", 1062}, + {"EdHex", 1063}, + {"UnWrap", 1064}, + {"Wrap", 1065}, + {"HxSrch", 1066}, + {"Raw", 1067}, + {"Parse", 1068}, + {"Unform", 1069}, + {"Format", 1070}, + {"Function key 1", 1071}, + {"Function key 2", 1072}, + {"Function key 3", 1073}, + {"Function key 4", 1074}, + {"Function key 5", 1075}, + {"Function key 6", 1076}, + {"Function key 7", 1077}, + {"Function key 8", 1078}, + {"Function key 9", 1079}, + {"Function key 10", 1080}, + {"Function key 11", 1081}, + {"Function key 12", 1082}, + {"Function key 13", 1083}, + {"Function key 14", 1084}, + {"Function key 15", 1085}, + {"Function key 16", 1086}, + {"Function key 17", 1087}, + {"Function key 18", 1088}, + {"Function key 19", 1089}, + {"Function key 20", 1090}, + {"Backspace key", 1091}, + {"End key", 1092}, + {"Up arrow key", 1093}, + {"Down arrow key", 1094}, + {"Left arrow key", 1095}, + {"Right arrow key", 1096}, + {"Home key", 1097}, + {"Page Down key", 1098}, + {"Page Up key", 1099}, + {"Insert key", 1100}, + {"Delete key", 1101}, + {"Completion/M-tab", 1102}, + {"+ on keypad", 1103}, + {"- on keypad", 1104}, + {"* on keypad", 1105}, + {"Left arrow keypad", 1106}, + {"Right arrow keypad", 1107}, + {"Up arrow keypad", 1108}, + {"Down arrow keypad", 1109}, + {"Home on keypad", 1110}, + {"End on keypad", 1111}, + {"Page Down keypad", 1112}, + {"Page Up keypad", 1113}, + {"Insert on keypad", 1114}, + {"Delete on keypad", 1115}, + {"Enter on keypad", 1116}, + {"Slash on keypad", 1117}, + {"NumLock on keypad", 1118}, + {"Password:", 1119}, + {"Password", 1120}, + {"Ok", 1121}, {"\ Couldn't open %s archive\n\ -%s", 1118}, - {"Inconsistent extfs archive", 1119}, - {"Sorry, we can not do password authenticated connections for now.", 1120}, - {" Could not set source routing (%s)", 1121}, +%s", 1122}, + {"Inconsistent extfs archive", 1123}, + {"Sorry, we can not do password authenticated connections for now.", 1124}, + {" Could not set source routing (%s)", 1125}, {"\ ~/.netrc file has not correct mode.\n\ -Remove password or correct mode.", 1122}, - {" MCFS ", 1123}, - {" The server does not support this version ", 1124}, +Remove password or correct mode.", 1126}, + {" MCFS ", 1127}, + {" The server does not support this version ", 1128}, {"\ The remote server is not running on a system port \n\ you need a password to log in, but the information may \n\ - not be safe on the remote side. Continue? \n", 1125}, - {" Yes ", 1126}, - {" No ", 1127}, - {" The remote server is running on strange port. Giving up.\n", 1128}, - {" MCFS Password required ", 1129}, - {" Invalid password ", 1130}, - {" Too many open connections ", 1131}, + not be safe on the remote side. Continue? \n", 1129}, + {" Yes ", 1130}, + {" No ", 1131}, + {" The remote server is running on strange port. Giving up.\n", 1132}, + {" MCFS Password required ", 1133}, + {" Invalid password ", 1134}, + {" Too many open connections ", 1135}, {"\ Couldn't open tar archive\n\ -%s", 1132}, - {"Unexpected EOF on archive file", 1133}, - {"Inconsistent tar archive", 1134}, +%s", 1136}, + {"Unexpected EOF on archive file", 1137}, + {"Inconsistent tar archive", 1138}, {"\ Hmm,...\n\ %s\n\ -doesn't look like a tar archive.", 1135}, +doesn't look like a tar archive.", 1139}, }; -int _msg_tbl_length = 1135; +int _msg_tbl_length = 1139; Binary files old/mc-4.5.21/po/ko.gmo and new/mc-4.5.22/po/ko.gmo differ diff -ruN old/mc-4.5.21/po/ko.po new/mc-4.5.22/po/ko.po --- old/mc-4.5.21/po/ko.po Thu Feb 25 01:53:36 1999 +++ new/mc-4.5.22/po/ko.po Fri Feb 26 19:25:19 1999 @@ -3,9 +3,9 @@ # Sung-Hyun Nam , 1998 msgid "" msgstr "" -"Project-Id-Version: mc 4.5.6\n" -"POT-Creation-Date: 1999-02-08 08:12-0500\n" -"PO-Revision-Date: 1999-02-04 14:20:02+0900\n" +"Project-Id-Version: mc 4.5.20\n" +"POT-Creation-Date: 1999-02-25 16:35+0900\n" +"PO-Revision-Date: 1999-02-26 01:38:03+0900\n" "Last-Translator: Sung-Hyun Nam \n" "Language-Team: Korean \n" "MIME-Version: 1.0\n" @@ -37,129 +37,129 @@ msgid " There is no other panel to compare contents to " msgstr " There is no other panel to compare contents to " -#: gnome/gcmd.c:91 +#: gnome/gcmd.c:106 msgid "GNU Midnight Commander" msgstr "GNU Midnight Commander" -#: gnome/gcmd.c:94 +#: gnome/gcmd.c:109 msgid "The GNOME edition of the Midnight Commander file manager." msgstr "The GNOME edition of the Midnight Commander file manager." -#: gnome/gcmd.c:106 src/main.c:818 src/screen.c:2048 +#: gnome/gcmd.c:121 src/main.c:827 src/screen.c:2047 msgid " The Midnight Commander " msgstr " The Midnight Commander " -#: gnome/gcmd.c:107 src/main.c:819 +#: gnome/gcmd.c:122 src/main.c:828 msgid " Do you really want to quit the Midnight Commander? " msgstr " 정말로 Midnight Commander를 종료하시겠읍니까? " -#: gnome/gcmd.c:108 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1791 -#: src/file.c:2171 src/filegui.c:573 src/hotlist.c:1035 src/main.c:820 -#: src/screen.c:2050 src/subshell.c:701 src/subshell.c:727 src/tree.c:755 +#: gnome/gcmd.c:123 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1817 +#: src/file.c:2197 src/filegui.c:573 src/hotlist.c:1035 src/main.c:829 +#: src/screen.c:2049 src/subshell.c:701 src/subshell.c:727 src/tree.c:755 #: src/view.c:404 msgid "&Yes" msgstr "예(&Y)" -#: gnome/gcmd.c:108 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1791 -#: src/file.c:2171 src/filegui.c:572 src/hotlist.c:1035 src/main.c:820 -#: src/screen.c:2050 src/subshell.c:701 src/subshell.c:727 src/tree.c:755 +#: gnome/gcmd.c:123 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1817 +#: src/file.c:2197 src/filegui.c:572 src/hotlist.c:1035 src/main.c:829 +#: src/screen.c:2049 src/subshell.c:701 src/subshell.c:727 src/tree.c:755 #: src/view.c:404 msgid "&No" msgstr "아니오(&N)" -#: gnome/gcmd.c:206 +#: gnome/gcmd.c:220 msgid "Sort By" msgstr "정렬" #. we define this up here so we can pass it in to our callback -#: gnome/gcmd.c:211 +#: gnome/gcmd.c:225 msgid "Ignore case sensitivity." msgstr "대소문자 무시" -#: gnome/gcmd.c:219 src/chmod.c:150 src/screen.c:425 +#: gnome/gcmd.c:233 src/chmod.c:150 src/screen.c:425 msgid "Name" msgstr "이름" -#: gnome/gcmd.c:226 +#: gnome/gcmd.c:240 msgid "File Type" msgstr "파일 종류" -#: gnome/gcmd.c:232 src/screen.c:426 src/screen.c:427 +#: gnome/gcmd.c:246 src/screen.c:426 src/screen.c:427 msgid "Size" msgstr "크기" -#: gnome/gcmd.c:238 +#: gnome/gcmd.c:252 msgid "Time Last Accessed" msgstr "마지막 액세스 시간" -#: gnome/gcmd.c:244 +#: gnome/gcmd.c:258 msgid "Time Last Modified" msgstr "마지막 수정 시간" -#: gnome/gcmd.c:250 +#: gnome/gcmd.c:264 msgid "Time Last Changed" msgstr "마지막 고쳐진 시간" -#: gnome/gcmd.c:264 +#: gnome/gcmd.c:278 msgid "Reverse the order." msgstr "순서 뒤집기." -#: gnome/gcmd.c:326 +#: gnome/gcmd.c:340 msgid "Enter name." msgstr "이름 입력." -#: gnome/gcmd.c:332 +#: gnome/gcmd.c:346 msgid "Enter label for command:" msgstr "명령어 꼬리표 입력:" -#: gnome/gcmd.c:427 +#: gnome/gcmd.c:441 msgid "Find all core files" msgstr "모든 core 파일 찾기" -#: gnome/gcmd.c:430 src/panelize.c:350 +#: gnome/gcmd.c:444 src/panelize.c:350 msgid "Find rejects after patching" msgstr "기운 후 거부파일이 생겼습니다" -#: gnome/gcmd.c:472 +#: gnome/gcmd.c:486 msgid "Run Command" msgstr "명령 실행" #. Frame 1 -#: gnome/gcmd.c:477 +#: gnome/gcmd.c:491 msgid "Preset Commands" msgstr "명령 미리 조절" -#: gnome/gcmd.c:494 +#: gnome/gcmd.c:508 msgid "Add" msgstr "추가" -#: gnome/gcmd.c:498 +#: gnome/gcmd.c:512 msgid "Remove" msgstr "삭제" #. Frame 2 -#: gnome/gcmd.c:506 +#: gnome/gcmd.c:520 msgid "Run this Command" msgstr "이 명령 실행" -#: gnome/gcmd.c:513 +#: gnome/gcmd.c:527 msgid "Command: " msgstr "명령: " -#: gnome/gcmd.c:574 +#: gnome/gcmd.c:588 msgid "Set Filter" msgstr "필터 설정" -#: gnome/gcmd.c:579 gnome/gcmd.c:620 gnome/gcmd.c:625 gnome/gcmd.c:629 -#: gnome/gscreen.c:2484 +#: gnome/gcmd.c:593 gnome/gcmd.c:634 gnome/gcmd.c:639 gnome/gcmd.c:643 +#: gnome/gscreen.c:2579 msgid "Show all files" msgstr "모든 파일 보여주기" -#: gnome/gcmd.c:586 +#: gnome/gcmd.c:600 msgid "." msgstr "." -#: gnome/gcmd.c:602 +#: gnome/gcmd.c:616 msgid "" "Enter a filter here for files in the panel view.\n" "\n" @@ -171,42 +171,66 @@ "예를 들면:\n" "*.gif는 gif 그림만을 보여줄 것입니다" -#: gnome/gcmd.c:604 +#: gnome/gcmd.c:618 msgid "Enter a Regular Expression to filter files in the panel view." msgstr "패널 보기에서 파일 필터링을 위한 정규 표현식 입력." -#: gnome/gcmd.c:661 gnome/gpopup.c:49 +#: gnome/gcmd.c:675 gnome/gpopup.c:52 msgid " Open with..." msgstr " Open with..." -#: gnome/gcmd.c:662 gnome/gpopup.c:50 +#: gnome/gcmd.c:676 gnome/gpopup.c:53 msgid "Enter extra arguments:" msgstr "extra 인자 입력:" -#: gnome/gdesktop.c:350 gnome/gdesktop.c:1553 +#: gnome/gdesktop.c:392 gnome/gdesktop.c:1816 msgid "Warning" msgstr "경고" -#: gnome/gdesktop.c:351 +#: gnome/gdesktop.c:393 #, c-format msgid "Could not open %s; will not have desktop icons" msgstr "%s 열 수 없음; 초기 데스크탑 아이콘을 가질 수 없을 것임" -#: gnome/gdesktop.c:1519 -msgid "Trashcan" -msgstr "휴지통" +#: gnome/gdesktop.c:983 +msgid "While running the mount/umount command" +msgstr "" + +#: gnome/gdesktop.c:1032 +msgid "While running the eject command" +msgstr "" + +#: gnome/gdesktop.c:1072 gnome/gicon.c:154 gnome/gtools.c:52 +msgid "Error" +msgstr "에러" #. Create the link to the user's home directory so that he will have an icon -#: gnome/gdesktop.c:1549 +#: gnome/gdesktop.c:1812 msgid "Home directory" msgstr "홈 자료방" -#: gnome/gdesktop.c:1554 +#: gnome/gdesktop.c:1817 #, c-format msgid "Could not symlink %s to %s; will not have initial desktop icons." msgstr "" "%s를 %s로 심볼릭링크 만들 수 없음; 초기 데스크탑 아이콘을 가질 수 없을 것임" +#: gnome/gdesktop.c:2148 gnome/glayout.c:410 +msgid "Arrange Icons" +msgstr "아이콘 정렬" + +#: gnome/gdesktop.c:2150 +msgid "Create New Window" +msgstr "새 창 생성" + +#: gnome/gdesktop.c:2152 +msgid "Rescan Mountable Devices" +msgstr "" + +#: gnome/gdesktop.c:2153 gnome/glayout.c:413 +msgid "Rescan Desktop" +msgstr "데스크탑 다시 읽기" + #: gnome/gdialogs.c:58 msgid "To: " msgstr "" @@ -267,12 +291,12 @@ msgid "Replace it?" msgstr "바꿀까요?" -#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 src/file.c:784 +#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1067 src/file.c:797 #: src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 msgid "Copy" msgstr "복사" -#: gnome/gdialogs.c:535 gtkedit/editwidget.c:1065 +#: gnome/gdialogs.c:535 gtkedit/editwidget.c:1068 msgid "Move" msgstr "이동" @@ -374,364 +398,364 @@ "%s 파일정보를 얻을 수 없어요\n" "%s" -#: gnome/gicon.c:83 gnome/gtools.c:50 -msgid "Error" -msgstr "에러" - -#: gnome/gicon.c:83 -msgid "Default set of icons not found, check your installation" +#: gnome/gicon.c:154 +msgid "Default set of icons not found, please check your installation" msgstr "기본 아이콘 세트를 찾을 수 없음. 인스틀이 제대로 되었는 지 확인하시오" -#: gnome/glayout.c:274 +#: gnome/glayout.c:264 msgid "Enter command to run" msgstr "실행할 명령 입력" -#: gnome/glayout.c:284 +#: gnome/glayout.c:277 +msgid "" +"Notice that if you choose to terminate the file manager, you will\n" +"also terminate the GNOME desktop handler.\n" +"\n" +"Are you sure you want to quit?" +msgstr "" + +#: gnome/glayout.c:289 +msgid "" +"The file manager and the desktop handler are now terminating\n" +"\n" +"If you want to start up again the desktop handler or the file manager\n" +"you can launch it from the Panel, or you can run the UNIX command `gmc'\n" +"\n" +"Press OK to terminate the application, or cancel to continue using it." +msgstr "" + +#: gnome/glayout.c:317 msgid "_Terminal" msgstr "터미널(_T)" -#: gnome/glayout.c:284 +#: gnome/glayout.c:317 msgid "Launch a new terminal in the current directory" msgstr "현재 자료방에서 새 터미널 열기" #. If this ever changes, make sure you update create_new_menu accordingly. -#: gnome/glayout.c:286 +#: gnome/glayout.c:319 msgid "_Directory..." msgstr "자료방(_D)..." -#: gnome/glayout.c:286 +#: gnome/glayout.c:319 msgid "Creates a new directory" msgstr "새로운 자료방을 생성" -#: gnome/glayout.c:292 -msgid "New _Window" -msgstr "새 창(_W)" - -#: gnome/glayout.c:292 -msgid "Opens a new window" -msgstr "새 창을 열음" - -#. We want to make a new menu entry here... -#. For example: -#. New-> -#. Command Prompt -#. Gimp Image -#. Gnumeric Spreadsheet -#. Text Document -#. etc... -#: gnome/glayout.c:302 -msgid "_New" -msgstr "새 것(_N)" - -#: gnome/glayout.c:304 -msgid "_Open" -msgstr "열기(_O)" - -#: gnome/glayout.c:304 -msgid "Opens the selected files" -msgstr "선택된 파일 열기" - -#. { GNOME_APP_UI_ITEM, N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd }, -#: gnome/glayout.c:306 +#. GNOMEUIINFO_ITEM_NONE( N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd }, +#: gnome/glayout.c:340 msgid "_Copy..." msgstr "복사(_C)..." -#: gnome/glayout.c:306 +#: gnome/glayout.c:340 msgid "Copy files" msgstr "파일 복사" -#: gnome/glayout.c:307 +#: gnome/glayout.c:341 msgid "_Delete..." msgstr "지우기(_D)..." -#: gnome/glayout.c:307 -msgid "Delete files from disk" -msgstr "저장판에서 파일을 지우기" +#: gnome/glayout.c:341 +msgid "Delete files" +msgstr "파일 지움" -#: gnome/glayout.c:308 +#: gnome/glayout.c:342 msgid "_Move..." msgstr "이동(_M)..." -#: gnome/glayout.c:308 +#: gnome/glayout.c:342 msgid "Rename or move files" msgstr "파일 이름을 바꾸거나 이동" -#: gnome/glayout.c:310 -msgid "C_lose" -msgstr "닫기(_l)" - -#: gnome/glayout.c:310 -msgid "Close this panel" -msgstr "현재 패널 닫기" +#: gnome/glayout.c:344 +msgid "Show directory sizes" +msgstr "자료방 크기 보기" + +#: gnome/glayout.c:344 +msgid "Shows the disk space used by each directory" +msgstr "각 자료방이 사용하고 있는 디스크 용량을 보여줌" -#: gnome/glayout.c:317 +#: gnome/glayout.c:351 msgid "Select _All" msgstr "모두 선택(_A)" -#: gnome/glayout.c:317 +#: gnome/glayout.c:351 msgid "Select all files in the current Panel" msgstr "현재 패널의 모든 파일 선택" -#: gnome/glayout.c:318 +#: gnome/glayout.c:353 msgid "_Select Files..." msgstr "파일 선택(_S)..." -#: gnome/glayout.c:318 +#: gnome/glayout.c:353 msgid "Select a group of files" msgstr "파일을 묶어서 선택" -#: gnome/glayout.c:319 +#: gnome/glayout.c:354 msgid "_Invert Selection" msgstr "선택 반전(_I)" -#: gnome/glayout.c:319 +#: gnome/glayout.c:354 msgid "Reverses the list of tagged files" msgstr "선택된 파일과 선택되지 않은 파일을 반전시킴" -#: gnome/glayout.c:321 +#: gnome/glayout.c:356 msgid "_Rescan Directory" msgstr "자료방 다시 읽기(_R)" -#: gnome/glayout.c:321 +#: gnome/glayout.c:356 msgid "Rescan the directory contents" msgstr "자료방 다시 읽기" -#: gnome/glayout.c:328 +#: gnome/glayout.c:363 msgid "Icon View" msgstr "아이콘 보기" -#: gnome/glayout.c:329 +#: gnome/glayout.c:364 msgid "Partial View" msgstr "부분 보기" -#: gnome/glayout.c:330 +#: gnome/glayout.c:365 msgid "Full View" msgstr "전체 보기" -#: gnome/glayout.c:331 +#: gnome/glayout.c:366 msgid "Custom View" msgstr "사용자 보기" -#: gnome/glayout.c:337 +#: gnome/glayout.c:371 msgid "_Sort By..." msgstr "정렬(_S)..." -#: gnome/glayout.c:337 +#: gnome/glayout.c:371 msgid "Confirmation settings" msgstr "확인 내용 설정" -#: gnome/glayout.c:338 +#: gnome/glayout.c:372 msgid "_Filter View..." msgstr "필터 보기(_F)..." -#: gnome/glayout.c:338 +#: gnome/glayout.c:372 msgid "Global option settings" msgstr "전체 선택항목 설정" -#: gnome/glayout.c:345 +#: gnome/glayout.c:379 msgid "_Find File..." msgstr "파일 찾기(_F)" -#: gnome/glayout.c:345 +#: gnome/glayout.c:379 msgid "Locate files on disk" msgstr "디스크에서의 파일 위치" #. { GNOME_APP_UI_ITEM, N_("_Compare panels..."), N_("Compare two panel contents"), gnome_compare_panels }, -#: gnome/glayout.c:349 +#: gnome/glayout.c:382 msgid "_Run Command..." msgstr "명령 실행(_R)" -#: gnome/glayout.c:349 +#: gnome/glayout.c:382 msgid "Runs a command" msgstr "명령 실행" -#: gnome/glayout.c:351 +#: gnome/glayout.c:384 msgid "_Run Command in panel..." msgstr "패널에서 명령 실행(_R)..." -#: gnome/glayout.c:351 +#: gnome/glayout.c:384 msgid "Run a command and put the results in a panel" msgstr "명령을 실행하여 그 결과를 패널에 표시" -#: gnome/glayout.c:354 +#: gnome/glayout.c:387 msgid "_Active VFS list..." msgstr "활성된 VFS 목록(_A)..." -#: gnome/glayout.c:354 +#: gnome/glayout.c:387 msgid "List of active virtual file systems" msgstr "활성된 가상 파일 체계 목록" -#: gnome/glayout.c:361 +#: gnome/glayout.c:394 msgid "_Background jobs..." msgstr "Background jobs(_B)..." -#: gnome/glayout.c:361 +#: gnome/glayout.c:394 msgid "List of background operations" msgstr "background operations 목록" -#. GNOMEUIINFO_HELP ("midnight-commander"), -#: gnome/glayout.c:369 -msgid "_About" -msgstr "이 풀그림은(_A)" - -#: gnome/glayout.c:369 -msgid "Information on this program" -msgstr "이 풀그림 정보" - -#: gnome/glayout.c:375 gnome/gview.c:323 -msgid "_File" -msgstr "파일(_F)" - -#: gnome/glayout.c:376 -msgid "_Edit" -msgstr "편집(_E)" +#: gnome/glayout.c:397 +msgid "Exit" +msgstr "종료" + +#: gnome/glayout.c:397 +msgid "Terminates the file manager and the desktop" +msgstr "" + +#: gnome/glayout.c:412 +msgid "Rescan System Devices" +msgstr "" -#: gnome/glayout.c:377 +#: gnome/glayout.c:420 gnome/glayout.c:430 msgid "_Layout" msgstr "배치(_L)" -#: gnome/glayout.c:378 +#: gnome/glayout.c:421 gnome/glayout.c:431 msgid "_Commands" msgstr "명령(_C)" -#: gnome/glayout.c:379 +#: gnome/glayout.c:422 +msgid "_Desktop" +msgstr "" + +#: gnome/glayout.c:423 gnome/glayout.c:432 msgid "_Help" msgstr "도움말(_H)" -#: gnome/glayout.c:474 +#: gnome/glayout.c:484 msgid "File/New/Directory..." msgstr "파일/새 것/자료방..." -#: gnome/gpopup.c:222 gnome/gpopup.c:223 +#: gnome/gpopup.c:257 gnome/gpopup.c:258 msgid "Properties" msgstr "속성" -#: gnome/gpopup.c:225 gnome/gpopup.c:226 +#: gnome/gpopup.c:259 +msgid "Mount device" +msgstr "" + +#: gnome/gpopup.c:260 +msgid "Unmount device" +msgstr "" + +#: gnome/gpopup.c:261 +msgid "Eject device" +msgstr "" + +#: gnome/gpopup.c:263 gnome/gpopup.c:264 msgid "Open" msgstr "열기" -#: gnome/gpopup.c:227 +#: gnome/gpopup.c:265 msgid "Open with" msgstr "Open with" -#: gnome/gpopup.c:228 src/screen.c:2286 src/screen.c:2316 +#: gnome/gpopup.c:266 src/screen.c:2286 src/screen.c:2316 msgid "View" msgstr "보기" -#: gnome/gpopup.c:229 +#: gnome/gpopup.c:267 msgid "View unfiltered" msgstr "필터없이 보기" -#: gnome/gpopup.c:230 src/screen.c:2287 src/screen.c:2317 src/view.c:1968 +#: gnome/gpopup.c:268 src/screen.c:2287 src/screen.c:2317 src/view.c:1996 msgid "Edit" msgstr "편집" -#: gnome/gpopup.c:232 +#: gnome/gpopup.c:270 msgid "Link..." msgstr "링크..." -#: gnome/gpopup.c:233 +#: gnome/gpopup.c:271 msgid "Symlink..." msgstr "심볼릭링크..." -#: gnome/gpopup.c:234 +#: gnome/gpopup.c:272 msgid "Edit symlink..." msgstr "심볼릭링크 수정..." -#: gnome/gpopup.c:241 gnome/gpopup.c:252 +#: gnome/gpopup.c:279 gnome/gpopup.c:290 msgid "Move/rename..." msgstr "이동/이름바꾸기..." -#: gnome/gpopup.c:242 gnome/gpopup.c:253 +#: gnome/gpopup.c:280 gnome/gpopup.c:291 msgid "Copy..." msgstr "복사..." -#: gnome/gpopup.c:243 gnome/gpopup.c:255 gtkedit/editwidget.c:1067 +#: gnome/gpopup.c:281 gnome/gpopup.c:293 gtkedit/editwidget.c:1070 #: src/screen.c:2291 src/screen.c:2321 msgid "Delete" msgstr "지우기" -#: gnome/gprefs.c:96 +#: gnome/gprefs.c:78 msgid "Show backup files" msgstr "백업 파일 보기" -#: gnome/gprefs.c:100 +#: gnome/gprefs.c:82 msgid "Show hidden files" msgstr "숨은 파일 보기" -#: gnome/gprefs.c:104 +#: gnome/gprefs.c:86 msgid "Mix files and directories" msgstr "파일과 자료방 섞음" -#: gnome/gprefs.c:108 +#: gnome/gprefs.c:90 msgid "Use shell patterns instead of regular expressions" msgstr "정규표현식 대신 쉘 패턴 사용" -#: gnome/gprefs.c:117 +#: gnome/gprefs.c:99 msgid "Confirm when deleting file" msgstr "파일 삭제전에 확인" -#: gnome/gprefs.c:121 +#: gnome/gprefs.c:103 msgid "Confirm when overwriting files" msgstr "파일 겹쳐쓰기전에 확인" -#: gnome/gprefs.c:125 +#: gnome/gprefs.c:107 msgid "Confirm when executing files" msgstr "파일 실행전에 확인" -#: gnome/gprefs.c:129 +#: gnome/gprefs.c:111 msgid "Show progress while operations are being performed" msgstr "작업을 수행하는 동안 진행상황 표시" -#: gnome/gprefs.c:138 -msgid "VFS Timeout :" -msgstr "VFS 타임아웃 :" +#: gnome/gprefs.c:120 +msgid "VFS Timeout:" +msgstr "VFS 타임아웃:" -#: gnome/gprefs.c:139 gnome/gprefs.c:164 +#: gnome/gprefs.c:121 gnome/gprefs.c:146 msgid "Seconds" msgstr "초" -#: gnome/gprefs.c:142 -msgid "Anonymous FTP password :" +#: gnome/gprefs.c:124 +msgid "Anonymous FTP password:" msgstr "Anonymous FTP 비밀번호:" -#: gnome/gprefs.c:146 +#: gnome/gprefs.c:128 msgid "Always use FTP proxy" msgstr "항상 FTP proxy 사용" -#: gnome/gprefs.c:155 +#: gnome/gprefs.c:137 msgid "Fast directory reload" msgstr "자료방 빨리 다시읽기" -#: gnome/gprefs.c:159 +#: gnome/gprefs.c:141 msgid "Compute totals before copying files" msgstr "파일 복사전에 전체크기 계산" -#: gnome/gprefs.c:163 +#: gnome/gprefs.c:145 msgid "FTP directory cache timeout :" msgstr "FTP 자료방 캐쉬 타임아웃:" -#: gnome/gprefs.c:167 -#, fuzzy +#: gnome/gprefs.c:149 msgid "Allow customization of icons in icon view" -msgstr "패널의 아이콘 바꾸기 허용" +msgstr "아이콘뷰에서 아이콘 바꾸기 허용" -#: gnome/gprefs.c:176 +#: gnome/gprefs.c:158 msgid "File display" msgstr "파일 표시" -#: gnome/gprefs.c:180 +#: gnome/gprefs.c:162 msgid "Confirmation" msgstr "확인" -#: gnome/gprefs.c:184 +#: gnome/gprefs.c:166 msgid "VFS" msgstr "VFS" -#: gnome/gprefs.c:188 +#: gnome/gprefs.c:170 msgid "Caching" msgstr "캐쉬" +#: gnome/gprefs.c:447 +msgid "Preferences" +msgstr "" + #: gnome/gprop.c:58 gnome/gprop.c:75 msgid "Filename" msgstr "파일명" @@ -821,7 +845,7 @@ msgid "Title" msgstr "제목" -#: gnome/gprop.c:521 gnome/gscreen.c:2271 +#: gnome/gprop.c:521 gnome/gscreen.c:2366 msgid "Icon" msgstr "아이콘" @@ -829,164 +853,180 @@ msgid "Select icon" msgstr "아이콘 선택" -#: gnome/gscreen.c:1569 +#: gnome/gscreen.c:1451 +msgid "Rescan Directory" +msgstr "자료방 다시 읽기" + +#: gnome/gscreen.c:1451 +msgid "Reloads the current directory" +msgstr "현재 자료방 다시 읽기" + +#: gnome/gscreen.c:1629 msgid "All files" msgstr "모든 파일" -#: gnome/gscreen.c:1571 +#: gnome/gscreen.c:1631 msgid "Archives and compressed files" msgstr "Archives와 압축 파일" -#: gnome/gscreen.c:1573 +#: gnome/gscreen.c:1633 msgid "RPM/DEB files" msgstr "RPM/DEB 파일" -#: gnome/gscreen.c:1575 +#: gnome/gscreen.c:1635 msgid "Text/Document files" msgstr "Text/Document 파일" -#: gnome/gscreen.c:1577 +#: gnome/gscreen.c:1637 msgid "HTML and SGML files" msgstr "HTML과 SGML 파일" -#: gnome/gscreen.c:1579 +#: gnome/gscreen.c:1639 msgid "Postscript and PDF files" msgstr "Postscript와 PDF 파일" -#: gnome/gscreen.c:1581 +#: gnome/gscreen.c:1641 msgid "Spreadsheet files" msgstr "셈판 파일" -#: gnome/gscreen.c:1583 +#: gnome/gscreen.c:1643 msgid "Image files" msgstr "영상 파일" -#: gnome/gscreen.c:1586 +#: gnome/gscreen.c:1646 msgid "Video/animation files" msgstr "동영상/움직꼴 파일" -#: gnome/gscreen.c:1588 +#: gnome/gscreen.c:1648 msgid "Audio files" msgstr "들림 파일" -#: gnome/gscreen.c:1590 +#: gnome/gscreen.c:1650 msgid "C program files" msgstr "C 풀그림 파일" -#: gnome/gscreen.c:1592 +#: gnome/gscreen.c:1652 msgid "C++ program files" msgstr "C++ 풀그림 파일" -#: gnome/gscreen.c:1594 +#: gnome/gscreen.c:1654 msgid "Objective-C program files" msgstr "Objective-C 풀그림 파일" -#: gnome/gscreen.c:1596 +#: gnome/gscreen.c:1656 msgid "Scheme program files" msgstr "스킴(scheme) 풀그림 파일" -#: gnome/gscreen.c:1598 +#: gnome/gscreen.c:1658 msgid "Assembler program files" msgstr "짜맞추개 풀그림 파일" -#: gnome/gscreen.c:1600 +#: gnome/gscreen.c:1660 msgid "Misc. program files" msgstr "기타 풀그림 파일" -#: gnome/gscreen.c:1602 +#: gnome/gscreen.c:1662 msgid "Font files" msgstr "글자체 파일" -#: gnome/gscreen.c:1729 +#: gnome/gscreen.c:1789 #, c-format msgid "Search: %s" msgstr "찾기: %s" -#: gnome/gscreen.c:1739 +#: gnome/gscreen.c:1799 #, c-format msgid "%s bytes in %d file" msgstr "%s bytes in %d file" -#: gnome/gscreen.c:1739 +#: gnome/gscreen.c:1799 #, c-format msgid "%s bytes in %d files" msgstr "%s bytes in %d files" -#: gnome/gscreen.c:1765 src/screen.c:677 +#: gnome/gscreen.c:1825 src/screen.c:677 msgid "" msgstr "" -#: gnome/gscreen.c:1819 +#: gnome/gscreen.c:1879 msgid "Filter" msgstr "필터" -#: gnome/gscreen.c:2271 +#: gnome/gscreen.c:2366 msgid "Switch view to an Icon view" msgstr "아이콘 보기로 전환" -#: gnome/gscreen.c:2273 +#: gnome/gscreen.c:2368 msgid "Brief" msgstr "간단히" -#: gnome/gscreen.c:2273 +#: gnome/gscreen.c:2368 msgid "Switch view to show just file name and type" msgstr "파일 이름과 형식 보기로 전환" -#: gnome/gscreen.c:2275 +#: gnome/gscreen.c:2370 msgid "Detailed" msgstr "자세히" -#: gnome/gscreen.c:2275 +#: gnome/gscreen.c:2370 msgid "Switch view to show detailed file statistics" msgstr "파일 상태를 자세히 보기로 전환" -#: gnome/gscreen.c:2277 +#: gnome/gscreen.c:2372 msgid "Custom" msgstr "사용자 보기" -#: gnome/gscreen.c:2277 +#: gnome/gscreen.c:2372 msgid "Switch view to show custom determined statistics." msgstr "사용자가 설정한 상태로 보기 전환" -#: gnome/gscreen.c:2282 +#: gnome/gscreen.c:2380 msgid "Back" msgstr "뒤로" -#: gnome/gscreen.c:2282 +#: gnome/gscreen.c:2380 msgid "Go to the previously visited directory" msgstr "바로 전 자료방으로 가기" -#: gnome/gscreen.c:2284 +#: gnome/gscreen.c:2382 msgid "Up" msgstr "위로" -#: gnome/gscreen.c:2284 +#: gnome/gscreen.c:2382 msgid "Go up a level in the directory heirarchy" msgstr "윗 자료방으로 가기" -#: gnome/gscreen.c:2286 +#: gnome/gscreen.c:2384 msgid "Forward" msgstr "앞으로" -#: gnome/gscreen.c:2286 +#: gnome/gscreen.c:2384 msgid "Go to the next directory" msgstr "다음 자료방으로 가기" -#: gnome/gscreen.c:2289 +#: gnome/gscreen.c:2387 src/tree.c:1020 +msgid "Rescan" +msgstr "Rescan" + +#: gnome/gscreen.c:2387 +msgid "Rescan the current directory" +msgstr "현재 자료방 다시 읽기" + +#: gnome/gscreen.c:2390 msgid "Home" msgstr "홈" -#: gnome/gscreen.c:2289 +#: gnome/gscreen.c:2390 msgid "Go to your home directory" msgstr "홈 자료방으로 가기" -#: gnome/gscreen.c:2429 +#: gnome/gscreen.c:2524 msgid "Location:" msgstr "위치:" -#: gnome/gtools.c:104 src/boxes.c:138 src/boxes.c:278 src/boxes.c:378 +#: gnome/gtools.c:110 src/boxes.c:138 src/boxes.c:278 src/boxes.c:378 #: src/boxes.c:466 src/boxes.c:646 src/boxes.c:728 src/boxes.c:783 -#: src/boxes.c:894 src/filegui.c:807 src/find.c:151 src/layout.c:369 +#: src/boxes.c:897 src/filegui.c:807 src/find.c:171 src/layout.c:369 #: src/option.c:144 src/wtools.c:289 src/wtools.c:561 msgid "&Ok" msgstr "확인(&O)" @@ -1034,15 +1074,20 @@ msgid "_Wrap" msgstr "_Wrap" -#: gnome/gview.c:309 +#: gnome/gview.c:310 msgid "Wrap the text" msgstr "Wrap the text" -#: gnome/gview.c:315 +#. Can not use this one yet, as it destroys the viewer, need to fix that +#: gnome/gview.c:313 +msgid "_Parsed view" +msgstr "" + +#: gnome/gview.c:316 msgid "_Formatted" msgstr "_Formatted" -#: gnome/gview.c:317 +#: gnome/gview.c:318 msgid "_Hex" msgstr "십육진(_H)" @@ -1050,10 +1095,6 @@ msgid "_Search" msgstr "찾기(_S)" -#: gnome/gview.c:325 -msgid "_Mode" -msgstr "모드(_M)" - #: gnome/gwidget.c:90 msgid "ok" msgstr "확인" @@ -1066,11 +1107,11 @@ msgid "help" msgstr "도움말" -#: gnome/gwidget.c:96 src/file.c:2190 +#: gnome/gwidget.c:96 src/file.c:2216 msgid "yes" msgstr "예" -#: gnome/gwidget.c:98 src/file.c:2188 +#: gnome/gwidget.c:98 src/file.c:2214 msgid "no" msgstr "아니오" @@ -1085,7 +1126,7 @@ #. The file-name is printed after the ':' #: gtkedit/edit.c:129 gtkedit/edit.c:224 gtkedit/edit.c:231 gtkedit/edit.c:238 #: gtkedit/edit.c:245 gtkedit/edit.c:251 gtkedit/edit.c:308 gtkedit/edit.c:344 -#: gtkedit/editcmd.c:1932 gtkedit/editwidget.c:947 src/dir.c:375 +#: gtkedit/editcmd.c:1932 gtkedit/editwidget.c:950 src/dir.c:386 #: src/screen.c:2306 src/tree.c:692 src/tree.c:698 src/wtools.c:222 #: vfs/fish.c:224 msgid " Error " @@ -1125,10 +1166,10 @@ #. Warning message with a query to continue or cancel the operation #: gtkedit/editcmd.c:482 gtkedit/editcmd.c:801 gtkedit/editcmd.c:831 -#: gtkedit/editcmd.c:978 gtkedit/editcmd.c:1075 src/ext.c:294 src/file.c:606 -#: src/help.c:318 src/main.c:665 src/screen.c:2064 src/subshell.c:700 -#: src/subshell.c:726 src/utilunix.c:382 src/utilunix.c:386 src/utilunix.c:452 -#: vfs/mcfs.c:169 +#: gtkedit/editcmd.c:978 gtkedit/editcmd.c:1075 src/ext.c:294 src/file.c:614 +#: src/help.c:318 src/main.c:674 src/screen.c:2063 src/subshell.c:700 +#: src/subshell.c:726 src/utilunix.c:388 src/utilunix.c:392 src/utilunix.c:458 +#: vfs/mcfs.c:170 msgid " Warning " msgstr " 경고 " @@ -1150,7 +1191,7 @@ msgid " Save as " msgstr " 새이름으로 저장 " -#: gtkedit/editcmd.c:501 gtkedit/editcmd.c:2594 +#: gtkedit/editcmd.c:501 gtkedit/editcmd.c:2602 msgid " Error trying to save file. " msgstr " 파일 저장 에러. " @@ -1212,7 +1253,7 @@ msgid " Save file " msgstr " 파일 저장 " -#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 src/view.c:1964 +#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1064 src/view.c:1992 msgid "Save" msgstr "저장" @@ -1263,8 +1304,8 @@ #. Heads the 'Search' dialog box #: gtkedit/editcmd.c:1285 gtkedit/editcmd.c:1461 gtkedit/editcmd.c:2196 -#: src/view.c:1446 src/view.c:1536 src/view.c:1658 src/view.c:1857 -#: src/view.c:1889 +#: src/view.c:1465 src/view.c:1564 src/view.c:1686 src/view.c:1885 +#: src/view.c:1917 msgid " Search " msgstr " 찾기 " @@ -1409,89 +1450,89 @@ msgid " &No " msgstr " 아니오(&N) " -#: gtkedit/editcmd.c:2434 gtkedit/editcmd.c:2509 +#: gtkedit/editcmd.c:2442 gtkedit/editcmd.c:2517 msgid " Copy to clipboard " msgstr " 클립보드로 복사하기 " -#: gtkedit/editcmd.c:2434 gtkedit/editcmd.c:2456 gtkedit/editcmd.c:2509 -#: gtkedit/editcmd.c:2522 +#: gtkedit/editcmd.c:2442 gtkedit/editcmd.c:2464 gtkedit/editcmd.c:2517 +#: gtkedit/editcmd.c:2530 msgid " Unable to save to file. " msgstr " 파일 저장 실패. " -#: gtkedit/editcmd.c:2456 gtkedit/editcmd.c:2522 +#: gtkedit/editcmd.c:2464 gtkedit/editcmd.c:2530 msgid " Cut to clipboard " msgstr " 클립보드로 오려두기 " -#: gtkedit/editcmd.c:2544 gtkedit/editcmd.c:2548 gtkedit/editcmd.c:2553 -#: gtkedit/editcmd.c:2556 src/view.c:1829 +#: gtkedit/editcmd.c:2552 gtkedit/editcmd.c:2556 gtkedit/editcmd.c:2561 +#: gtkedit/editcmd.c:2564 src/view.c:1857 msgid " Goto line " msgstr " 줄찾기 " -#: gtkedit/editcmd.c:2544 gtkedit/editcmd.c:2548 gtkedit/editcmd.c:2553 -#: gtkedit/editcmd.c:2556 +#: gtkedit/editcmd.c:2552 gtkedit/editcmd.c:2556 gtkedit/editcmd.c:2561 +#: gtkedit/editcmd.c:2564 msgid " Enter line: " msgstr " 줄 번호 입력: " -#: gtkedit/editcmd.c:2577 gtkedit/editcmd.c:2594 +#: gtkedit/editcmd.c:2585 gtkedit/editcmd.c:2602 msgid " Save Block " msgstr " 구역 저장 " -#: gtkedit/editcmd.c:2628 +#: gtkedit/editcmd.c:2636 msgid " Insert File " msgstr " 파일 끼워넣기 " -#: gtkedit/editcmd.c:2643 +#: gtkedit/editcmd.c:2651 msgid " Insert file " msgstr " 파일 끼워넣기 " -#: gtkedit/editcmd.c:2643 +#: gtkedit/editcmd.c:2651 msgid " Error trying to insert file. " msgstr " 파일 끼워넣기 실패 " #. Not essential to translate -#: gtkedit/editcmd.c:2663 +#: gtkedit/editcmd.c:2671 msgid " Sort block " msgstr " 구역 정렬 " #. Not essential to translate -#: gtkedit/editcmd.c:2663 gtkedit/editcmd.c:2717 +#: gtkedit/editcmd.c:2671 gtkedit/editcmd.c:2725 msgid " You must first highlight a block of text. " msgstr " You must first highlight a block of text. " -#: gtkedit/editcmd.c:2670 +#: gtkedit/editcmd.c:2678 msgid " Run Sort " msgstr " 정렬 시작 " #. Not essential to translate -#: gtkedit/editcmd.c:2672 +#: gtkedit/editcmd.c:2680 msgid " Enter sort options (see manpage) separated by whitespace: " msgstr " 공백문자로 구분된 정렬 선택항목 입력: " -#: gtkedit/editcmd.c:2683 gtkedit/editcmd.c:2689 +#: gtkedit/editcmd.c:2691 gtkedit/editcmd.c:2697 msgid " Sort " msgstr " 정렬 " #. Not essential to translate -#: gtkedit/editcmd.c:2685 +#: gtkedit/editcmd.c:2693 msgid " Error trying to execute sort command " msgstr " 정렬중 오류 발생 " #. Not essential to translate -#: gtkedit/editcmd.c:2691 +#: gtkedit/editcmd.c:2699 msgid " Sort returned non-zero: " msgstr " Sort returned non-zero: " #. Not essential to translate -#: gtkedit/editcmd.c:2715 gtkedit/editcmd.c:2745 +#: gtkedit/editcmd.c:2723 gtkedit/editcmd.c:2753 msgid " Process block " msgstr " Process block " #. Not essential to translate -#: gtkedit/editcmd.c:2747 +#: gtkedit/editcmd.c:2755 msgid " Error trying to stat file " msgstr " Error trying to stat file " -#: gtkedit/editcmd.c:2817 +#: gtkedit/editcmd.c:2825 msgid " Mail " msgstr " 전자우편 " @@ -1522,67 +1563,424 @@ msgid "Error initialising editor.\n" msgstr "Error initialising editor.\n" -#: gtkedit/editwidget.c:1060 src/help.c:806 src/main.c:1668 src/screen.c:2284 -#: src/screen.c:2314 src/tree.c:1018 src/view.c:1959 +#: gtkedit/editwidget.c:1063 src/help.c:806 src/main.c:1677 src/screen.c:2284 +#: src/screen.c:2314 src/tree.c:1018 src/view.c:1987 msgid "Help" msgstr "도움말" -#: gtkedit/editwidget.c:1062 +#: gtkedit/editwidget.c:1065 msgid "Mark" msgstr "선택" -#: gtkedit/editwidget.c:1063 +#: gtkedit/editwidget.c:1066 msgid "Replac" msgstr "바꿈" -#: gtkedit/editwidget.c:1066 src/view.c:1972 +#: gtkedit/editwidget.c:1069 src/view.c:2000 msgid "Search" msgstr "찾기" -#: gtkedit/editwidget.c:1069 src/main.c:1670 +#: gtkedit/editwidget.c:1072 src/main.c:1679 msgid "PullDn" msgstr "풀다운" -#: gtkedit/editwidget.c:1070 src/help.c:818 src/main.c:1671 src/view.c:1961 -#: src/view.c:1981 +#: gtkedit/editwidget.c:1073 src/help.c:818 src/main.c:1680 src/view.c:1989 +#: src/view.c:2009 msgid "Quit" msgstr "종료" +#: gtkedit/editmenu.c:56 +msgid " Word wrap " +msgstr " Word wrap " + +#. Not essential to translate +#: gtkedit/editmenu.c:58 +msgid " Enter line length, 0 for off: " +msgstr " 라인 길이를 입력, 0은 off: " + +#: gtkedit/editmenu.c:69 +msgid " About " +msgstr " 이 프로그램은 " + +#: gtkedit/editmenu.c:70 +msgid "" +"\n" +" Cooledit v2.1\n" +"\n" +" Copyright (C) 1996 the Free Software Foundation\n" +"\n" +" A user friendly text editor written\n" +" for the Midnight Commander.\n" +msgstr "" +"\n" +" Cooledit v2.1\n" +"\n" +" Copyright (C) 1996 the Free Software Foundation\n" +"\n" +" Midnight Commander를 위해 개발된\n" +" 사용자와 친근한 텍스트 편집기.\n" + +#: gtkedit/editmenu.c:118 gtkedit/editmenu.c:134 +msgid "&Open/load... C-o" +msgstr "열기/불러오기(&O)... C-o" + +#: gtkedit/editmenu.c:119 +msgid "&New C-n" +msgstr "새 파일(&N) C-n" + +#: gtkedit/editmenu.c:121 gtkedit/editmenu.c:137 +msgid "&Save F2" +msgstr "저장(_S) F3" + +#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138 +msgid "save &As... F12" +msgstr "다른 이름으로 저장(&A)... M-d" + +#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140 +msgid "&Insert file... F15" +msgstr "파일 끼워넣기(&I)... F15" + +#: gtkedit/editmenu.c:125 +msgid "copy to &File... C-f" +msgstr "파일로 복사(&F)... C-f" + +#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 +msgid "a&Bout... " +msgstr "이 프로그램은(&B)... " + +#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 +msgid "&Quit F10" +msgstr "종료(&Q) F10" + +#: gtkedit/editmenu.c:135 +msgid "&New C-x k" +msgstr "새 파일(&N) C-x l" + +#: gtkedit/editmenu.c:141 +msgid "copy to &File... " +msgstr "파일로 복사(&F)... " + +#: gtkedit/editmenu.c:150 gtkedit/editmenu.c:167 +msgid "&Toggle Mark F3" +msgstr "마크 토글(&T) F3" + +#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168 +msgid "&Mark Columns S-F3" +msgstr "컬럼 마크(&M) S-F3" + +#: gtkedit/editmenu.c:153 gtkedit/editmenu.c:170 +msgid "toggle &Ins/overw Ins" +msgstr "삽입/겹침 토글(&I) Ins" + +#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172 +msgid "&Copy F5" +msgstr "복사(&C) F5" + +#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 +msgid "&Move F6" +msgstr "이동(&M) F6" + +#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 +msgid "&Delete F8" +msgstr "지우기(&D) F8" + +#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176 +msgid "&Undo C-u" +msgstr "취소(&U) C-u" + +#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 +msgid "&Beginning C-PgUp" +msgstr "파일 처음(&B) C-PgUp" + +#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 +msgid "&End C-PgDn" +msgstr "파일 끝(&E) C-PgDn" + +#: gtkedit/editmenu.c:184 gtkedit/editmenu.c:191 +msgid "&Search... F7" +msgstr "찾기(&S)... F7" + +#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192 +msgid "search &Again F17" +msgstr "다시 찾기(&A) F17" + +#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193 +msgid "&Replace... F4" +msgstr "바꾸기(&R)... F4" + +#: gtkedit/editmenu.c:198 gtkedit/editmenu.c:220 +msgid "&Goto line... M-l" +msgstr "라인 찾아가기(&G)... M-l" + +#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:222 +msgid "insert &Literal... C-q" +msgstr "Literal 입력(&L) C-q" + +#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:224 +msgid "&Refresh screen C-l" +msgstr "화면 갱신(&R) C-l" + +#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:226 +msgid "&Start record macro C-r" +msgstr "매크로 저장 시작(&S) C-r" + +#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227 +msgid "&Finish record macro... C-r" +msgstr "매크로 저장 끝(&F) C-r" + +#: gtkedit/editmenu.c:206 +msgid "&Execute macro... C-a, KEY" +msgstr "매크로 실행(&E)... C-a, KEY" + +#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 +msgid "delete macr&O... " +msgstr "매크로 삭제(&O)... " + +#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231 +msgid "insert &Date/time " +msgstr "날짜/시간 삽입(&D) " + +#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:233 +msgid "format p&Aragraph M-p" +msgstr "format p&Aragraph M-p" + +#: gtkedit/editmenu.c:212 +msgid "'ispell' s&Pell check C-p" +msgstr "'ispell' 철자 검사(&P) C-p" + +#: gtkedit/editmenu.c:213 gtkedit/editmenu.c:235 +msgid "sor&T... M-t" +msgstr "정렬(&T) M-t" + +#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 +msgid "'indent' &C Formatter F19" +msgstr "'indent' &C Formatter F19" + +#: gtkedit/editmenu.c:215 +msgid "&Mail... " +msgstr "전자우편(&M)... " + +#: gtkedit/editmenu.c:228 +msgid "&Execute macro... C-x e, KEY" +msgstr "매크로 실행(&E)... C-x e, KEY" + +#: gtkedit/editmenu.c:234 +msgid "'ispell' s&Pell check M-$" +msgstr "'ispell' 철자 검사(&P) M-$" + +#: gtkedit/editmenu.c:243 gtkedit/editmenu.c:252 +msgid "&General... " +msgstr "일반(&G)... " + +#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253 +msgid "&Save mode..." +msgstr "모드 저장(&S)..." + +#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1311 +msgid "&Layout..." +msgstr "배치(&L)..." + +#. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t' +#: gtkedit/editmenu.c:265 gtkedit/editmenu.c:274 gtkedit/editmenu.c:391 +#: src/chmod.c:164 src/chown.c:130 +msgid " File " +msgstr " 파일 " + +#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:407 +msgid " Edit " +msgstr " 편집 " + +#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276 +msgid " Sear/Repl " +msgstr " 찾기/바꿈 " + +#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277 gtkedit/editmenu.c:442 +msgid " Command " +msgstr " 명령 " + +#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278 +msgid " Options " +msgstr " 선택항목 " + +#: gtkedit/editmenu.c:392 +msgid "Open...\tC-o" +msgstr "열기...\tC-o" + +#: gtkedit/editmenu.c:393 +msgid "New\tC-n" +msgstr "새 글\tC-n" + +#: gtkedit/editmenu.c:395 +msgid "Save\tF2" +msgstr "저장\tF2" + +#: gtkedit/editmenu.c:396 +msgid "Save as...\tF12" +msgstr "새이름으로 저장\tF12" + +#: gtkedit/editmenu.c:398 +msgid "Insert file...\tF15" +msgstr "파일 끼워넣기...\tF15" + +#: gtkedit/editmenu.c:399 +msgid "Copy to file...\tC-f" +msgstr "파일로 복사...\tC-f" + +#. Tool hint +#: gtkedit/editmenu.c:402 +msgid "Disk operations" +msgstr "디스크 조작" + +#: gtkedit/editmenu.c:408 +msgid "Toggle mark\tF3" +msgstr "마크 토글\tF3" + +#: gtkedit/editmenu.c:409 +msgid "Toggle mark columns\tC-b" +msgstr "컬럼 마크 토글\tC-b" + +#: gtkedit/editmenu.c:411 +msgid "Toggle insert/overwrite\tIns" +msgstr "삽입/겹침 토글\tIns" + +#: gtkedit/editmenu.c:413 +msgid "Copy block to cursor\tF5" +msgstr "블럭을 커서위치로 복사\tF5" + +#: gtkedit/editmenu.c:414 +msgid "Move block to cursor\tF6" +msgstr "블럭을 커서위치로 이동\tF6" + +#: gtkedit/editmenu.c:415 +msgid "Delete block\tF8/C-Del" +msgstr "블럭 삭제\tF8/C-Del" + +#: gtkedit/editmenu.c:417 +msgid "Copy block to clipbrd\tC-Ins" +msgstr "블럭을 클립보드로 복사\tC-Ins" + +#: gtkedit/editmenu.c:418 +msgid "Cut block to clipbrd\tS-Del" +msgstr "블럭을 클립보드로 오려두기\tS-Del" + +#: gtkedit/editmenu.c:419 +msgid "Paste block from clipbrd\tS-Ins" +msgstr "클립보드에서 블럭 붙이기\tS-Ins" + +#: gtkedit/editmenu.c:420 +msgid "Selection history\tM-Ins" +msgstr "선택 히스토리\tM-Ins" + +#: gtkedit/editmenu.c:422 +msgid "Undo\tC-BackSpace" +msgstr "취소\tC-BackSpace" + +#. Tool hint +#: gtkedit/editmenu.c:425 +msgid "Manipulating blocks of text" +msgstr "텍스트 블럭 조작" + +#: gtkedit/editmenu.c:430 +msgid " Srch/Replce " +msgstr " 찾기/바꿈 " + +#: gtkedit/editmenu.c:431 +msgid "Search...\tF7" +msgstr "찾기...\tF7" + +#: gtkedit/editmenu.c:432 +msgid "Search again\tF17" +msgstr "다시 찾기\tF17" + +#: gtkedit/editmenu.c:433 +msgid "Replace...\tF4" +msgstr "바꿈...\tF4" + +#: gtkedit/editmenu.c:434 +msgid "Replace again\tF14" +msgstr "모두 바꿈\tF14" + +#. Tool hint +#: gtkedit/editmenu.c:437 +msgid "Search for and replace text" +msgstr "찾아서 바꿀 문자열" + +#: gtkedit/editmenu.c:443 +msgid "Goto line...\tM-l" +msgstr "라인 찾아가기...\tM-l" + +#: gtkedit/editmenu.c:445 +msgid "Start record macro\tC-r" +msgstr "매크로 저장 시작\tC-r" + +#: gtkedit/editmenu.c:446 +msgid "Finish record macro...\tC-r" +msgstr "매크로 저장 끝...\tC-r" + +#: gtkedit/editmenu.c:447 +msgid "Execute macro...\tC-a, KEY" +msgstr "매크로 실행...\tC-a, KEY" + +#: gtkedit/editmenu.c:448 +msgid "Delete macro...\t" +msgstr "매크로 삭제...\t" + +#: gtkedit/editmenu.c:450 +msgid "Insert date/time\tC-d" +msgstr "날짜/시간 삽입\tC-d" + +#: gtkedit/editmenu.c:451 +msgid "Format paragraph\tM-p" +msgstr "Format paragraph\tM-p" + +#: gtkedit/editmenu.c:453 +msgid "Refresh display\tC-l" +msgstr "화면 갱신\tC-l" + +#. Tool hint +#: gtkedit/editmenu.c:456 +msgid "Macros and internal commands" +msgstr "매크로와 내장 명령" + #: gtkedit/gtkedit.c:65 msgid "&Dismiss" msgstr "취소(&D)" -#: gtkedit/gtkedit.c:110 +#: gtkedit/gtkedit.c:66 +msgid " Enter file name: " +msgstr " 파일명 입력: " + +#: gtkedit/gtkedit.c:111 msgid "The Quick Brown Fox Jumps Over The Lazy Dog" msgstr "The Quick Brown Fox Jumps Over The Lazy Dog" -#: gtkedit/gtkedit.c:801 +#: gtkedit/gtkedit.c:802 msgid "" "gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n" msgstr "" "gtkedit.c: HOME 환경변수가 설정되지 않았고, passwd 파일에도 없음 - 중단\n" -#: gtkedit/gtkedit.c:1289 +#: gtkedit/gtkedit.c:1290 msgid "Clear the edit buffer" msgstr "편집 버퍼 지우기" -#: gtkedit/gtkedit.c:1294 +#: gtkedit/gtkedit.c:1295 msgid "Insert File" msgstr "파일 끼워넣기" -#: gtkedit/gtkedit.c:1294 +#: gtkedit/gtkedit.c:1295 msgid "Insert text from a file" msgstr "파일에서 글월 끼워넣기" -#: gtkedit/gtkedit.c:1296 +#: gtkedit/gtkedit.c:1297 msgid "Copy to file" msgstr "파일로 복사" -#: gtkedit/gtkedit.c:1296 +#: gtkedit/gtkedit.c:1297 msgid "copy a block to a file" msgstr "블럭을 파일로 복사" -#: gtkedit/gtkedit.c:1336 +#: gtkedit/gtkedit.c:1337 msgid "Search/Replace" msgstr "찾기/바꿈" @@ -1602,7 +2000,7 @@ #: src/achown.c:71 src/boxes.c:139 src/boxes.c:279 src/boxes.c:376 #: src/boxes.c:464 src/boxes.c:644 src/boxes.c:727 src/boxes.c:781 #: src/chmod.c:114 src/chown.c:79 src/cmd.c:856 src/filegui.c:790 -#: src/find.c:151 src/hotlist.c:138 src/hotlist.c:814 src/hotlist.c:911 +#: src/find.c:171 src/hotlist.c:138 src/hotlist.c:814 src/hotlist.c:911 #: src/layout.c:370 src/learn.c:59 src/option.c:145 src/panelize.c:86 #: src/view.c:404 src/wtools.c:111 src/wtools.c:386 src/wtools.c:559 #: src/wtools.c:640 @@ -1691,7 +2089,7 @@ msgid "Background process:" msgstr "Background 프로세스:" -#: src/background.c:284 src/file.c:2113 +#: src/background.c:284 src/file.c:2139 msgid " Background process error " msgstr " Background 프로세스 에러 " @@ -1848,23 +2246,23 @@ msgid "Running " msgstr "실행중 " -#: src/boxes.c:833 src/find.c:671 +#: src/boxes.c:833 src/find.c:716 src/find.c:957 msgid "Stopped" msgstr "멈춤" -#: src/boxes.c:891 +#: src/boxes.c:894 msgid "&Stop" msgstr "멈춤(&S)" -#: src/boxes.c:892 +#: src/boxes.c:895 msgid "&Resume" msgstr "계속(&R)" -#: src/boxes.c:893 +#: src/boxes.c:896 msgid "&Kill" msgstr "죽임(&K)" -#: src/boxes.c:932 +#: src/boxes.c:935 msgid "Background Jobs" msgstr "Background Jobs" @@ -1948,10 +2346,6 @@ msgid " Permission " msgstr " 허용 " -#: src/chmod.c:164 src/chown.c:130 -msgid " File " -msgstr " 파일 " - #: src/chmod.c:169 msgid "Use SPACE to change" msgstr "바꿀려면 SPACE 사용" @@ -2159,7 +2553,6 @@ " 패널을 서로 바꿀 수 없습니다. " #: src/cmd.c:967 -#, fuzzy msgid "Type `exit' to return to the Midnight Commander" msgstr "The Midnight Commander로 돌아가려면 'exit'을 입력하십시오" @@ -2176,7 +2569,7 @@ msgid " Link " msgstr " 링크 " -#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1621 +#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1647 msgid " to:" msgstr " 대상:" @@ -2302,69 +2695,69 @@ "\n" "\n" -#: src/dir.c:53 +#: src/dir.c:61 msgid "&Unsorted" msgstr "정렬 않함(&U)" -#: src/dir.c:54 +#: src/dir.c:62 msgid "&Name" msgstr "이름(&N)" -#: src/dir.c:55 +#: src/dir.c:63 msgid "&Extension" msgstr "확장자(&E)" -#: src/dir.c:56 +#: src/dir.c:64 msgid "&Modify time" msgstr "수정 시간(&M)" -#: src/dir.c:57 +#: src/dir.c:65 msgid "&Access time" msgstr "접근 시간(&A)" -#: src/dir.c:58 +#: src/dir.c:66 msgid "&Change time" msgstr "바꾼 시간(&C)" -#: src/dir.c:59 +#: src/dir.c:67 msgid "&Size" msgstr "크기(&S)" -#: src/dir.c:60 +#: src/dir.c:68 msgid "&Inode" msgstr "Inode(&I)" #. New sort orders -#: src/dir.c:63 +#: src/dir.c:71 msgid "&Type" msgstr "&Type" -#: src/dir.c:64 +#: src/dir.c:72 msgid "&Links" msgstr "&Links" -#: src/dir.c:65 +#: src/dir.c:73 msgid "N&GID" msgstr "N&GID" -#: src/dir.c:66 +#: src/dir.c:74 msgid "N&UID" msgstr "N&UID" -#: src/dir.c:67 +#: src/dir.c:75 msgid "&Owner" msgstr "소유자(&O)" -#: src/dir.c:68 +#: src/dir.c:76 msgid "&Group" msgstr "집단(&G)" -#: src/dir.c:375 +#: src/dir.c:386 #, c-format msgid "File exists but can not be stat-ed: %s %s" msgstr "파일이 있지만 정보를 얻을 수 없음: %s %s" -#: src/dir.c:633 +#: src/dir.c:662 msgid "Unknown" msgstr "모름" @@ -2435,15 +2828,15 @@ msgid " Delete " msgstr " 지우기 " -#: src/file.c:244 +#: src/file.c:252 msgid " Invalid target mask " msgstr " Invalid target mask " -#: src/file.c:342 +#: src/file.c:350 msgid " Could not make the hardlink " msgstr " 하드링크를 만들 수 없습니다 " -#: src/file.c:384 +#: src/file.c:392 #, c-format msgid "" " Cannot read source link \"%s\" \n" @@ -2452,7 +2845,7 @@ " 원천 링크 \"%s\"를 읽을 수 없어요 \n" " %s " -#: src/file.c:394 +#: src/file.c:402 msgid "" " Cannot make stable symlinks across non-local filesystems: \n" "\n" @@ -2462,7 +2855,7 @@ "\n" " Stable 심볼릭링크 선택항목은 사용않됩니다 " -#: src/file.c:442 +#: src/file.c:450 #, c-format msgid "" " Cannot create target symlink \"%s\" \n" @@ -2471,7 +2864,7 @@ " 심볼릭링크 \"%s\"를 생성할 수 없습니다 \n" " %s " -#: src/file.c:510 +#: src/file.c:518 #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -2480,7 +2873,7 @@ " \"%s\" 자료방를 덮어쓸 수 없습니다 \n" " %s " -#: src/file.c:519 +#: src/file.c:527 #, c-format msgid "" " Cannot stat source file \"%s\" \n" @@ -2489,12 +2882,12 @@ " \"%s\" 파일 정보를 얻을 수 없습니다 \n" " %s " -#: src/file.c:532 +#: src/file.c:540 #, c-format msgid " `%s' and `%s' are the same file. " msgstr " `%s'와 `%s'가 같은 파일입니다. " -#: src/file.c:565 +#: src/file.c:573 #, c-format msgid "" " Cannot create special file \"%s\" \n" @@ -2503,7 +2896,7 @@ " 특수(special) 파일 \"%s\"을 생성할 수 없습니다 \n" " %s " -#: src/file.c:574 src/file.c:794 +#: src/file.c:582 src/file.c:807 #, c-format msgid "" " Cannot chown target file \"%s\" \n" @@ -2512,7 +2905,7 @@ " \"%s\" 파일의 소유자를 바꿀 수 없습니다 \n" " %s " -#: src/file.c:583 src/file.c:809 +#: src/file.c:591 src/file.c:825 #, c-format msgid "" " Cannot chmod target file \"%s\" \n" @@ -2521,7 +2914,7 @@ " 대상파일 \"%s\"의 모드를 바꿀 수 없습니다 \n" " %s " -#: src/file.c:596 +#: src/file.c:604 #, c-format msgid "" " Cannot open source file \"%s\" \n" @@ -2530,11 +2923,11 @@ " \"%s\" 파일을 열 수 없습니다 \n" " %s " -#: src/file.c:606 +#: src/file.c:614 msgid " Reget failed, about to overwrite file " msgstr " 이어받기 실패, 파일을 덮어쓸 예정임 " -#: src/file.c:612 +#: src/file.c:620 #, c-format msgid "" " Cannot fstat source file \"%s\" \n" @@ -2543,7 +2936,7 @@ " 소스파일 \"%s\"의 파일정보를 얻을 수 없습니다 \n" " %s " -#: src/file.c:633 +#: src/file.c:646 #, c-format msgid "" " Cannot create target file \"%s\" \n" @@ -2552,7 +2945,7 @@ " \"%s\" 파일을 생성할 수 없습니다 \n" " %s " -#: src/file.c:647 +#: src/file.c:660 #, c-format msgid "" " Cannot fstat target file \"%s\" \n" @@ -2561,7 +2954,7 @@ " 대상파일 \"%s\"의 파일정보를 얻을 수 없습니다 \n" " %s " -#: src/file.c:678 +#: src/file.c:691 #, c-format msgid "" " Cannot read source file \"%s\" \n" @@ -2570,7 +2963,7 @@ " 바탕파일 \"%s\"을 읽을 수 없습니다 \n" " %s " -#: src/file.c:708 +#: src/file.c:721 #, c-format msgid "" " Cannot write target file \"%s\" \n" @@ -2579,11 +2972,11 @@ " 대상파일 \"%s\"에 쓸 수 없습니다 \n" " %s " -#: src/file.c:727 +#: src/file.c:740 msgid "(stalled)" msgstr "(stalled)" -#: src/file.c:765 +#: src/file.c:778 #, c-format msgid "" " Cannot close source file \"%s\" \n" @@ -2592,7 +2985,7 @@ " 바탕파일 \"%s\"을 닫을 수 없습니다 \n" " %s " -#: src/file.c:774 +#: src/file.c:787 #, c-format msgid "" " Cannot close target file \"%s\" \n" @@ -2601,19 +2994,19 @@ " 대상파일 \"%s\"를 닫을 수 없습니다 \n" " %s " -#: src/file.c:784 +#: src/file.c:797 msgid "Incomplete file was retrieved. Keep it?" msgstr "완전하지 않은 파일이 받아졌습니다. 보존할까요?" -#: src/file.c:785 +#: src/file.c:798 msgid "&Delete" msgstr "지우기(&D)" -#: src/file.c:785 src/hotlist.c:1443 +#: src/file.c:798 src/hotlist.c:1443 msgid "&Keep" msgstr "보존(&K)" -#: src/file.c:854 +#: src/file.c:870 #, c-format msgid "" " Cannot stat source directory \"%s\" \n" @@ -2622,7 +3015,7 @@ " 원본 자료방 \"%s\"의 정보를 얻을 수 없습니다 \n" " %s " -#: src/file.c:877 +#: src/file.c:893 #, c-format msgid "" " Source directory \"%s\" is not a directory \n" @@ -2632,7 +3025,7 @@ " %s " #. we found a cyclic symbolic link -#: src/file.c:885 +#: src/file.c:901 #, c-format msgid "" " Cannot copy cyclic symbolic link \n" @@ -2641,7 +3034,7 @@ " Cyclic 심볼릭링크는 복사할 수 없습니다 \n" " `%s' " -#: src/file.c:938 +#: src/file.c:954 #, c-format msgid "" " Cannot create target directory \"%s\" \n" @@ -2650,7 +3043,7 @@ " 대상 자료방 \"%s\"를 생성할 수 없습니다 \n" " %s " -#: src/file.c:956 +#: src/file.c:972 #, c-format msgid "" " Cannot chown target directory \"%s\" \n" @@ -2660,7 +3053,7 @@ " %s " #. Source doesn't exist -#: src/file.c:1066 +#: src/file.c:1082 #, c-format msgid "" " Cannot stat file \"%s\" \n" @@ -2669,17 +3062,17 @@ " \"%s\" 파일의 정보를 얻을 수 없습니다 \n" " %s " -#: src/file.c:1088 +#: src/file.c:1104 #, c-format msgid " `%s' and `%s' are the same file " msgstr " `%s'와 `%s'는 같은 파일입니다 " -#: src/file.c:1095 +#: src/file.c:1111 #, c-format msgid " Cannot overwrite directory `%s' " msgstr " `%s' 자료방을 덮어쓸 수 없습니다 " -#: src/file.c:1128 +#: src/file.c:1148 #, c-format msgid "" " Cannot move file \"%s\" to \"%s\" \n" @@ -2688,7 +3081,7 @@ " \"%s\" 파일을 \"%s\"로 이동할 수 없습니다 \n" " %s " -#: src/file.c:1148 +#: src/file.c:1168 #, c-format msgid "" " Cannot remove file \"%s\" \n" @@ -2697,17 +3090,17 @@ " \"%s\" 파일을 지울 수 없습니다 \n" " %s " -#: src/file.c:1198 +#: src/file.c:1221 #, c-format msgid " Cannot overwrite directory \"%s\" %s " msgstr " \"%s\" 자료방을 덮어쓸 수 없습니다. %s " -#: src/file.c:1200 +#: src/file.c:1223 #, c-format msgid " Cannot overwrite file \"%s\" %s " msgstr " \"%s\" 파일을 겹쳐쓸 수 없습니다. %s " -#: src/file.c:1223 +#: src/file.c:1246 #, c-format msgid "" " Cannot move directory \"%s\" to \"%s\" \n" @@ -2716,7 +3109,7 @@ " \"%s\" 자료방을 \"%s\"로 이동할 수 없습니다 \n" " %s " -#: src/file.c:1286 +#: src/file.c:1309 #, c-format msgid "" " Cannot delete file \"%s\" \n" @@ -2725,7 +3118,7 @@ " \"%s\" 파일을 지울 수 없습니다 \n" " %s " -#: src/file.c:1344 src/file.c:1411 src/file.c:1440 +#: src/file.c:1370 src/file.c:1437 src/file.c:1466 #, c-format msgid "" " Cannot remove directory \"%s\" \n" @@ -2734,7 +3127,7 @@ " \"%s\" 자료방을 지울 수 없습니다 \n" " %s " -#: src/file.c:1476 +#: src/file.c:1502 msgid " Internal error: get_file \n" msgstr " 내부 오류: get_file \n" @@ -2747,87 +3140,87 @@ #. * (I don't use spaces around the words, because someday they could be #. * dropped, when widgets get smarter) #. -#: src/file.c:1597 +#: src/file.c:1623 msgid "1Copy" msgstr "1Copy" -#: src/file.c:1597 +#: src/file.c:1623 msgid "1Move" msgstr "1Move" -#: src/file.c:1597 +#: src/file.c:1623 msgid "1Delete" msgstr "1Delete" -#: src/file.c:1612 +#: src/file.c:1638 #, c-format msgid "%o %f \"%s\"%m" msgstr "%o %f \"%s\"%m" -#: src/file.c:1613 +#: src/file.c:1639 #, c-format msgid "%o %d %f%m" msgstr "%o %d %f%m" -#: src/file.c:1615 +#: src/file.c:1641 #, c-format msgid "%o %f \"%s\"%e" msgstr "%o %f \"%s\"%e" -#: src/file.c:1616 +#: src/file.c:1642 #, c-format msgid "%o %d %f%e" msgstr "%o %d %f%e" -#: src/file.c:1620 +#: src/file.c:1646 msgid "file" msgstr "file" -#: src/file.c:1620 +#: src/file.c:1646 msgid "files" msgstr "files" -#: src/file.c:1620 +#: src/file.c:1646 msgid "directory" msgstr "directory" -#: src/file.c:1620 +#: src/file.c:1646 msgid "directories" msgstr "directories" -#: src/file.c:1621 +#: src/file.c:1647 msgid "files/directories" msgstr "files/directories" -#: src/file.c:1621 +#: src/file.c:1647 msgid " with source mask:" msgstr " with source mask:" -#: src/file.c:1769 +#: src/file.c:1795 msgid " Can't operate on \"..\"! " msgstr " \"..\"에 대해서는 작업할 수 없습니다! " -#: src/file.c:1788 +#: src/file.c:1814 msgid "Yes" msgstr "예" -#: src/file.c:1788 +#: src/file.c:1814 msgid "No" msgstr "아니오" -#: src/file.c:1841 +#: src/file.c:1867 msgid " Sorry, I could not put the job in background " msgstr " 미안, 백그라운드로 일을 수행할 수 없네요 " -#: src/file.c:1924 src/file.c:2029 +#: src/file.c:1950 src/file.c:2055 msgid " Internal failure " msgstr " 내부 오류 " -#: src/file.c:1924 src/file.c:2029 +#: src/file.c:1950 src/file.c:2055 msgid " Unknown file operation " msgstr " 알려지지 않은 파일 조작 " -#: src/file.c:1943 +#: src/file.c:1969 #, c-format msgid "" " Destination \"%s\" must be a directory \n" @@ -2836,19 +3229,19 @@ " 대상 \"%s\"는 자료방이어야 합니다 \n" " %s " -#: src/file.c:2114 src/filegui.c:263 +#: src/file.c:2140 src/filegui.c:263 msgid "&Skip" msgstr "건너뜀(&S)" -#: src/file.c:2114 +#: src/file.c:2140 msgid "&Retry" msgstr "재시도(&R)" -#: src/file.c:2114 src/file.c:2173 src/filegui.c:260 src/filegui.c:562 +#: src/file.c:2140 src/file.c:2199 src/filegui.c:260 src/filegui.c:562 msgid "&Abort" msgstr "중단(&A)" -#: src/file.c:2164 +#: src/file.c:2190 msgid "" "\n" " Directory not empty. \n" @@ -2858,7 +3251,7 @@ " 빈 자료방이 아닌데요. \n" " 그래도 지울까요? " -#: src/file.c:2165 +#: src/file.c:2191 msgid "" "\n" " Background process: Directory not empty \n" @@ -2868,31 +3261,31 @@ " 백그라운드 프로세스: 자료방이 비지 않았음 \n" " 그래도 지울까요? " -#: src/file.c:2166 +#: src/file.c:2192 msgid " Delete: " msgstr " 지우기: " -#: src/file.c:2172 +#: src/file.c:2198 msgid "a&ll" msgstr "모두(&l)" -#: src/file.c:2172 src/filegui.c:565 +#: src/file.c:2198 src/filegui.c:565 msgid "non&E" msgstr "non&E" -#: src/file.c:2182 +#: src/file.c:2208 msgid " Type 'yes' if you REALLY want to delete " msgstr " 정말로 지우기를 원하시면 'yes'를 입력하십시오 " -#: src/file.c:2184 +#: src/file.c:2210 msgid "all the directories " msgstr "모든 자료방 " -#: src/file.c:2186 +#: src/file.c:2212 msgid " Recursive Delete " msgstr " Recursive 지우기 " -#: src/file.c:2187 +#: src/file.c:2213 msgid " Background process: Recursive Delete " msgstr " 백그라운드 프로세스: Recursive 지우기 " @@ -3012,88 +3405,117 @@ "원본 패턴 `%s'가 잘못되었습니다 \n" " %s " -#: src/find.c:115 +#: src/find.c:130 msgid "&Suspend" msgstr "일시중지(&S)" -#: src/find.c:116 +#: src/find.c:131 msgid "Con&tinue" msgstr "계속(&t)" -#: src/find.c:117 +#: src/find.c:132 msgid "&Chdir" msgstr "&Chdir" -#: src/find.c:118 +#: src/find.c:133 msgid "&Again" msgstr "다시(&A)" -#: src/find.c:119 +#: src/find.c:134 msgid "&Quit" msgstr "종료(&Q)" -#: src/find.c:120 src/panelize.c:89 +#: src/find.c:135 src/panelize.c:89 msgid "Pane&lize" msgstr "패널화(&l)" -#: src/find.c:121 +#: src/find.c:136 msgid "&View - F3" msgstr "보기(&V) - F3" -#: src/find.c:122 +#: src/find.c:137 msgid "&Edit - F4" msgstr "편집(&E) - F4" -#: src/find.c:150 +#: src/find.c:170 msgid "Start at:" msgstr "시작위치:" -#: src/find.c:150 +#: src/find.c:170 msgid "Filename:" msgstr "파일명:" -#: src/find.c:150 +#: src/find.c:170 msgid "Content: " msgstr "내용: " -#: src/find.c:151 src/main.c:1199 src/main.c:1220 +#: src/find.c:171 src/main.c:1208 src/main.c:1229 msgid "&Tree" msgstr "나무꼴(&T)" -#: src/find.c:203 +#: src/find.c:223 msgid "Find File" msgstr "파일 찾기" -#: src/find.c:430 +#: src/find.c:452 #, c-format msgid "Grepping in %s" msgstr "%s에서 문자열 찾는 중" -#: src/find.c:468 +#: src/find.c:490 msgid " Find/read " msgstr " 찾기/읽기 " -#: src/find.c:468 +#: src/find.c:490 msgid " Problem reading from child " msgstr " 자식(child)로 부터 읽을 수 없음 " -#: src/find.c:515 +#: src/find.c:537 msgid "Finished" msgstr "끝났어요" -#: src/find.c:539 src/view.c:1446 +#: src/find.c:561 src/view.c:1465 #, c-format msgid "Searching %s" msgstr "%s 찾는 중" -#: src/find.c:671 src/find.c:788 +#: src/find.c:714 src/find.c:754 +msgid "Suspend" +msgstr "일시중지" + +#: src/find.c:714 +msgid "Restart" +msgstr "재시도" + +#: src/find.c:716 src/find.c:818 src/find.c:957 src/find.c:1053 msgid "Searching" msgstr "찾는 중" -#: src/find.c:763 +#: src/find.c:747 src/find.c:1028 msgid "Find file" msgstr "파일 찾기" +#. The buttons +#: src/find.c:752 +msgid "Change to this directory" +msgstr "이 자료방으로 가기" + +#: src/find.c:753 +msgid "Search again" +msgstr "다시 찾기" + +#: src/find.c:758 +msgid "View this file" +msgstr "이 파일 보기" + +#: src/find.c:759 +msgid "Edit this file" +msgstr "이 파일 편집" + +#: src/find.c:760 +msgid "Send the results to a Panel" +msgstr "그 결과를 패널에 표시" + #: src/fixhlp.c:171 msgid "Usage: fixhlp \n" msgstr "Usage: fixhlp \n" @@ -3598,7 +4020,7 @@ msgid "key, or click with the mouse to define it. Move around with Tab." msgstr "나 마우스로 클릭한 후 글쇠를 정의하십시오. 탭글쇠로 이동하십시오" -#: src/main.c:666 +#: src/main.c:675 msgid "" " The Commander can't change to the directory that \n" " the subshell claims you are in. Perhaps you have \n" @@ -3610,251 +4032,247 @@ " 작업 자료방을 지웠거나, 아니면 \"su\" 명령을\n" " 사용하여 특별한 액세스 권한을 가진 것 아녜요? " -#: src/main.c:741 +#: src/main.c:750 msgid "Press any key to continue..." msgstr "계속하려면 아무 글쇠나 누르십시오..." -#: src/main.c:791 +#: src/main.c:800 msgid " The shell is already running a command " msgstr " 명령해석기가 이미 명령을 수행중입니다 " -#: src/main.c:1196 src/main.c:1217 +#: src/main.c:1205 src/main.c:1226 msgid "&Listing mode..." msgstr "파일목록보기 설정(&L)..." -#: src/main.c:1197 src/main.c:1218 +#: src/main.c:1206 src/main.c:1227 msgid "&Quick view C-x q" msgstr "빠르게 보기(&Q) C-x q" -#: src/main.c:1198 src/main.c:1219 +#: src/main.c:1207 src/main.c:1228 msgid "&Info C-x i" msgstr "정보(&I) C-x i" -#: src/main.c:1201 src/main.c:1222 +#: src/main.c:1210 src/main.c:1231 msgid "&Sort order..." msgstr "정렬 순서(&S)..." -#: src/main.c:1203 src/main.c:1224 +#: src/main.c:1212 src/main.c:1233 msgid "&Filter..." msgstr "필터(&F)..." -#: src/main.c:1206 src/main.c:1227 +#: src/main.c:1215 src/main.c:1236 msgid "&Network link..." msgstr "네트워크 연결(&N)..." -#: src/main.c:1207 src/main.c:1228 +#: src/main.c:1216 src/main.c:1237 msgid "FT&P link..." msgstr "FTP 연결(&P)..." -#: src/main.c:1211 src/main.c:1232 +#: src/main.c:1220 src/main.c:1241 msgid "&Drive... M-d" msgstr "드라이브(&D)... M-d" -#: src/main.c:1213 src/main.c:1234 +#: src/main.c:1222 src/main.c:1243 msgid "&Rescan C-r" msgstr "다시 읽기(&R) C-r" -#: src/main.c:1238 +#: src/main.c:1247 msgid "&User menu F2" msgstr "사용자 메뉴(&U) F2" -#: src/main.c:1239 +#: src/main.c:1248 msgid "&View F3" msgstr "보기(&V) F3" -#: src/main.c:1240 +#: src/main.c:1249 msgid "Vie&w file... " msgstr "파일 보기(&w)... " -#: src/main.c:1241 +#: src/main.c:1250 msgid "&Filtered view M-!" msgstr "필터로 보기(&F) M-!" -#: src/main.c:1242 +#: src/main.c:1251 msgid "&Edit F4" msgstr "편집(&E) F4" -#: src/main.c:1243 +#: src/main.c:1252 msgid "&Copy F5" msgstr "복사(&C) F5" -#: src/main.c:1244 +#: src/main.c:1253 msgid "c&Hmod C-x c" msgstr "파일 모드 바꾸기(&H) C-x c" -#: src/main.c:1246 +#: src/main.c:1255 msgid "&Link C-x l" msgstr "링크(&L) C-x l" -#: src/main.c:1247 +#: src/main.c:1256 msgid "&SymLink C-x s" msgstr "심볼릭링크(&S) C-x s" -#: src/main.c:1248 +#: src/main.c:1257 msgid "edit s&Ymlink C-x C-s" msgstr "심볼릭링크 수정(&Y) C-x C-s" -#: src/main.c:1249 +#: src/main.c:1258 msgid "ch&Own C-x o" msgstr "소유자 바꾸기(&O) C-x o" -#: src/main.c:1250 +#: src/main.c:1259 msgid "&Advanced chown " msgstr "고급 소유자 바꾸기(&A) " -#: src/main.c:1252 +#: src/main.c:1261 msgid "&Rename/Move F6" msgstr "바꾸기/이동(&R) F6" -#: src/main.c:1253 +#: src/main.c:1262 msgid "&Mkdir F7" msgstr "자료방 생성(&M) F7" -#: src/main.c:1254 +#: src/main.c:1263 msgid "&Delete F8" msgstr "지우기(&D) F8" -#: src/main.c:1255 +#: src/main.c:1264 msgid "&Quick cd M-c" msgstr "자료방 빨리 바꾸기(&Q) M-c" -#: src/main.c:1257 +#: src/main.c:1266 msgid "select &Group M-+" msgstr "집단선택(&G) M-+" -#: src/main.c:1258 +#: src/main.c:1267 msgid "u&Nselect group M-\\" msgstr "집단선택 해제(&N) M-\\" -#: src/main.c:1259 +#: src/main.c:1268 msgid "reverse selec&Tion M-*" msgstr "선택반전(&T) M-*" -#: src/main.c:1261 +#: src/main.c:1270 msgid "e&Xit F10" msgstr "종료(&X) F10" -#: src/main.c:1271 +#: src/main.c:1280 msgid "&Directory tree" msgstr "자료방 나무꼴(&D)" -#: src/main.c:1273 +#: src/main.c:1282 msgid "&Find file M-?" msgstr "파일 찾기(&F) M-?" -#: src/main.c:1274 +#: src/main.c:1283 msgid "s&Wap panels C-u" msgstr "패널 바꾸기(&W) C-u" -#: src/main.c:1275 +#: src/main.c:1284 msgid "switch &Panels on/off C-o" msgstr "패널 열기/닫기(&P) C-o" -#: src/main.c:1276 +#: src/main.c:1285 msgid "&Compare directories C-x d" msgstr "자료방 비교(&C) C-x d" -#: src/main.c:1277 +#: src/main.c:1286 msgid "e&Xternal panelize C-x !" msgstr "외부명령 패널화하기(&X) C-x !" -#: src/main.c:1278 +#: src/main.c:1287 msgid "show directory s&Izes" msgstr "자료방 크기 보기(&I)" -#: src/main.c:1280 +#: src/main.c:1289 msgid "command &History" msgstr "명령 히스토리(&H)" -#: src/main.c:1281 +#: src/main.c:1290 msgid "di&Rectory hotlist C-\\" msgstr "자료방 단축목록(&R) C-\\" -#: src/main.c:1283 +#: src/main.c:1292 msgid "&Active VFS list C-x a" msgstr "활성 VFS 목록(&A) C-x a" -#: src/main.c:1286 +#: src/main.c:1295 msgid "&Background jobs C-x j" msgstr "백그라운드 jobs(&B) C-x j" -#: src/main.c:1290 +#: src/main.c:1299 msgid "&Undelete files (ext2fs only)" msgstr "파일 되살림 (est2fs만 가능)" -#: src/main.c:1293 +#: src/main.c:1302 msgid "&Listing format edit" msgstr "파일 목록 형식 바꾸기(&L)" -#: src/main.c:1295 +#: src/main.c:1304 msgid "&Extension file edit" msgstr "확장자 파일 수정(&E)" -#: src/main.c:1296 +#: src/main.c:1305 msgid "&Menu file edit" msgstr "메뉴 파일 수정(&M)" -#: src/main.c:1301 +#: src/main.c:1310 msgid "&Configuration..." msgstr "환경설정(&C)..." -#: src/main.c:1302 -msgid "&Layout..." -msgstr "배치(&L)..." - -#: src/main.c:1303 +#: src/main.c:1312 msgid "c&Onfirmation..." msgstr "확인(&O)..." -#: src/main.c:1304 +#: src/main.c:1313 msgid "&Display bits..." msgstr "출력 비트(&D)..." -#: src/main.c:1306 +#: src/main.c:1315 msgid "learn &Keys..." msgstr "글쇠 배우기(&K)..." -#: src/main.c:1309 +#: src/main.c:1318 msgid "&Virtual FS..." msgstr "가상 파일체계(&V)..." -#: src/main.c:1312 +#: src/main.c:1321 msgid "&Save setup" msgstr "환경 저장(&S)" -#: src/main.c:1328 src/main.c:1330 +#: src/main.c:1337 src/main.c:1339 msgid " &Left " msgstr " 왼쪽(&L) " -#: src/main.c:1330 +#: src/main.c:1339 msgid " &Above " msgstr " 위(&A) " -#: src/main.c:1333 +#: src/main.c:1342 msgid " &File " msgstr " 파일(&F) " -#: src/main.c:1334 +#: src/main.c:1343 msgid " &Command " msgstr " 명령(&C) " -#: src/main.c:1335 +#: src/main.c:1344 msgid " &Options " msgstr " 선택항목(&O) " -#: src/main.c:1337 src/main.c:1339 +#: src/main.c:1346 src/main.c:1348 msgid " &Right " msgstr " 오른쪽(&R) " -#: src/main.c:1339 +#: src/main.c:1348 msgid " &Below " msgstr " 아래(&B) " -#: src/main.c:1394 +#: src/main.c:1403 msgid " Information " msgstr " 정보 " -#: src/main.c:1395 +#: src/main.c:1404 msgid "" " Using the fast reload option may not reflect the exact \n" " directory contents. In this cases you'll need to do a \n" @@ -3866,55 +4284,55 @@ " 당신은 수동으로 자료방을 다시 읽어야만 합니다. \n" " 자세한 내용을 알고 싶으시면 설명서를 보십시오. " -#: src/main.c:1669 src/screen.c:2285 src/screen.c:2315 +#: src/main.c:1678 src/screen.c:2285 src/screen.c:2315 msgid "Menu" msgstr "메뉴" -#: src/main.c:1874 +#: src/main.c:1883 msgid "Thank you for using GNU Midnight Commander" msgstr "GNU Midnight Commander를 사용해주셔서 감사합니다" -#: src/main.c:2227 +#: src/main.c:2242 #, c-format msgid "with mouse support on xterm%s.\n" msgstr "with mouse support on xterm%s.\n" -#: src/main.c:2228 +#: src/main.c:2243 msgid " and the Linux console" msgstr " and the Linux console" -#: src/main.c:2323 +#: src/main.c:2338 msgid "The TERM environment variable is unset!\n" msgstr "TERM 환경변수가 설정되어있지 않습니다!\n" -#: src/main.c:2528 +#: src/main.c:2545 #, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "Midnight Commander용 라이브러리 자료방: %s\n" -#: src/main.c:2539 +#: src/main.c:2556 msgid "" "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" msgstr "" "-m 선택항목은 의미가 없습니다. 선택항목 메뉴의 '출력 비트'를 보십시오\n" -#: src/main.c:2666 +#: src/main.c:2682 msgid "Geometry for the window" msgstr "창의 크기/위치" -#: src/main.c:2666 +#: src/main.c:2682 msgid "GEOMETRY" msgstr "" -#: src/main.c:2667 +#: src/main.c:2683 msgid "No windows opened at startup" msgstr "시작할 때 창을 열지 않아요" -#: src/main.c:2668 +#: src/main.c:2684 msgid "Force activation even if a server is already running" msgstr "서버가 이미 실행 중이더라도 무조건 활성화하기" -#: src/main.c:2940 +#: src/main.c:2956 msgid "" "Couldn't open tty line. You have to run mc without the -P flag.\n" "On some systems you may want to run # `which mc`\n" @@ -3922,11 +4340,11 @@ "tty 선을 열수 없네요. 당신은 -P 선택항목없이 MC를 실행해야 합니다.\n" "특정 체계에서는 # `which mc` 와 같이 실행할 수도 있습니다.\n" -#: src/main.c:3014 +#: src/main.c:3030 msgid " Notice " msgstr " Notice " -#: src/main.c:3015 +#: src/main.c:3031 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -4143,11 +4561,11 @@ msgid "Unknow tag on display format: " msgstr "Unknow tag on display format: " -#: src/screen.c:2049 +#: src/screen.c:2048 msgid " Do you really want to execute? " msgstr " 정말로 실행하시겠읍니까? " -#: src/screen.c:2064 +#: src/screen.c:2063 msgid " No action taken " msgstr " No action taken " @@ -4244,10 +4662,6 @@ " \"%s\"로 자료방을 바꿀 수 없어요 \n" " %s " -#: src/tree.c:1020 -msgid "Rescan" -msgstr "Rescan" - #: src/tree.c:1022 msgid "Forget" msgstr "Forget" @@ -4256,7 +4670,7 @@ msgid "Rmdir" msgstr "Rmdir" -#: src/treestore.c:354 +#: src/treestore.c:356 #, c-format msgid "" "Can't write to the %s file:\n" @@ -4312,11 +4726,11 @@ msgid "name_trunc: too big" msgstr "name_trunc: 너무 길어서" -#: src/utilunix.c:382 +#: src/utilunix.c:388 msgid " Pipe failed " msgstr " 파이프 실패 " -#: src/utilunix.c:386 +#: src/utilunix.c:392 msgid " Dup failed " msgstr " 복제 실패 " @@ -4381,15 +4795,20 @@ msgid " [grow]" msgstr " [grow]" -#: src/view.c:1536 src/view.c:1658 +#: src/view.c:1457 +#, c-format +msgid "Searching for `%s'" +msgstr "`%s' 찾는 중" + +#: src/view.c:1564 src/view.c:1686 msgid " Search string not found " msgstr " 글월을 찾을 수 없군요 " -#: src/view.c:1697 +#: src/view.c:1725 msgid " Invalid regular expression " msgstr " 알수 없는 정규 표현식 " -#: src/view.c:1827 +#: src/view.c:1855 #, c-format msgid "" " The current line number is %d.\n" @@ -4398,63 +4817,63 @@ " 현재 줄 번호는 %d입니다.\n" " 새로운 줄 번호을 입력:" -#: src/view.c:1857 +#: src/view.c:1885 msgid " Enter regexp:" msgstr " 정규표현식 입력:" -#: src/view.c:1889 +#: src/view.c:1917 msgid " Enter search string:" msgstr " 찾을 글월 입력:" -#: src/view.c:1962 +#: src/view.c:1990 msgid "Ascii" msgstr "아스키" -#: src/view.c:1962 +#: src/view.c:1990 msgid "Hex" msgstr "십육진" -#: src/view.c:1963 +#: src/view.c:1991 msgid "Line" msgstr "줄" -#: src/view.c:1964 +#: src/view.c:1992 msgid "RxSrch" msgstr "RxSrch" -#: src/view.c:1967 +#: src/view.c:1995 msgid "EdText" msgstr "EdText" -#: src/view.c:1967 +#: src/view.c:1995 msgid "EdHex" msgstr "EdHex" -#: src/view.c:1969 +#: src/view.c:1997 msgid "UnWrap" msgstr "UnWrap" -#: src/view.c:1969 +#: src/view.c:1997 msgid "Wrap" msgstr "Wrap" -#: src/view.c:1972 +#: src/view.c:2000 msgid "HxSrch" msgstr "HxSrch" -#: src/view.c:1975 +#: src/view.c:2003 msgid "Raw" msgstr "Raw" -#: src/view.c:1975 +#: src/view.c:2003 msgid "Parse" msgstr "Parse" -#: src/view.c:1979 +#: src/view.c:2007 msgid "Unform" msgstr "Unform" -#: src/view.c:1979 +#: src/view.c:2007 msgid "Format" msgstr "Format" @@ -4653,7 +5072,7 @@ msgid "NumLock on keypad" msgstr "NumLock on keypad" -#: src/wtools.c:587 vfs/vfs.c:1757 +#: src/wtools.c:587 vfs/vfs.c:1806 msgid "Password:" msgstr "비밀번호:" @@ -4695,15 +5114,15 @@ "~/.netrc 파일의 모드가 잘못되었습니다.\n" "비밀번호를 지우거나 모드를 고치십시오." -#: vfs/mcfs.c:153 +#: vfs/mcfs.c:154 msgid " MCFS " msgstr " MCFS " -#: vfs/mcfs.c:153 +#: vfs/mcfs.c:154 msgid " The server does not support this version " msgstr " 서버가 이 판번호을 지원하지 않습니다 " -#: vfs/mcfs.c:170 +#: vfs/mcfs.c:171 msgid "" " The remote server is not running on a system port \n" " you need a password to log in, but the information may \n" @@ -4713,27 +5132,27 @@ " 로그인하려면 비밀번호가 필요합니다만 비밀번호의 사용은 \n" " 원격 서버쪽에서는 안전하지 않습니다. 계속할까요? \n" -#: vfs/mcfs.c:173 +#: vfs/mcfs.c:174 msgid " Yes " msgstr " 예 " -#: vfs/mcfs.c:173 +#: vfs/mcfs.c:174 msgid " No " msgstr " 아니오 " -#: vfs/mcfs.c:175 +#: vfs/mcfs.c:176 msgid " The remote server is running on strange port. Giving up.\n" msgstr " 원격서버가 이상한 포트를 사용하고 있습니다. 포기합니다.\n" -#: vfs/mcfs.c:187 +#: vfs/mcfs.c:188 msgid " MCFS Password required " msgstr " MCFS 비밀번호 요구됨 " -#: vfs/mcfs.c:201 +#: vfs/mcfs.c:202 msgid " Invalid password " msgstr " 틀린 비밀번호 " -#: vfs/mcfs.c:321 +#: vfs/mcfs.c:322 msgid " Too many open connections " msgstr " 너무 많은 연결이 이루어짐 " @@ -4765,262 +5184,44 @@ "%s\n" "테잎 아카이브 파일같지 않습니다." -#~ msgid " Word wrap " -#~ msgstr " Word wrap " - -#~ msgid " Enter line length, 0 for off: " -#~ msgstr " 라인 길이를 입력, 0은 off: " - -#~ msgid " About " -#~ msgstr " 이 프로그램은 " - -#~ msgid "" -#~ "\n" -#~ " Cooledit v2.1\n" -#~ "\n" -#~ " Copyright (C) 1996 the Free Software Foundation\n" -#~ "\n" -#~ " A user friendly text editor written\n" -#~ " for the Midnight Commander.\n" -#~ msgstr "" -#~ "\n" -#~ " Cooledit v2.1\n" -#~ "\n" -#~ " Copyright (C) 1996 the Free Software Foundation\n" -#~ "\n" -#~ " Midnight Commander를 위해 개발된\n" -#~ " 사용자와 친근한 텍스트 편집기.\n" - -#~ msgid "&Open/load... C-o" -#~ msgstr "열기/불러오기(&O)... C-o" - -#~ msgid "&New C-n" -#~ msgstr "새 파일(&N) C-n" - -#~ msgid "&Save F2" -#~ msgstr "저장(_S) F3" +#~ msgid "Trashcan" +#~ msgstr "휴지통" -#~ msgid "save &As... F12" -#~ msgstr "다른 이름으로 저장(&A)... M-d" +#~ msgid "Opens a new window" +#~ msgstr "새 창을 열음" -#~ msgid "&Insert file... F15" -#~ msgstr "파일 끼워넣기(&I)... F15" +#~ msgid "_New" +#~ msgstr "새 것(_N)" -#~ msgid "copy to &File... C-f" -#~ msgstr "파일로 복사(&F)... C-f" +#~ msgid "_Open" +#~ msgstr "열기(_O)" -#~ msgid "a&Bout... " -#~ msgstr "이 프로그램은(&B)... " +#~ msgid "Opens the selected files" +#~ msgstr "선택된 파일 열기" -#~ msgid "&Quit F10" -#~ msgstr "종료(&Q) F10" +#~ msgid "Delete files from disk" +#~ msgstr "저장판에서 파일을 지우기" -#~ msgid "&New C-x k" -#~ msgstr "새 파일(&N) C-x l" +#~ msgid "C_lose" +#~ msgstr "닫기(_l)" -#~ msgid "copy to &File... " -#~ msgstr "파일로 복사(&F)... " +#~ msgid "Close this panel" +#~ msgstr "현재 패널 닫기" -#~ msgid "&Toggle Mark F3" -#~ msgstr "마크 토글(&T) F3" +#~ msgid "_About" +#~ msgstr "이 풀그림은(_A)" -#~ msgid "&Mark Columns S-F3" -#~ msgstr "컬럼 마크(&M) S-F3" +#~ msgid "Information on this program" +#~ msgstr "이 풀그림 정보" -#~ msgid "toggle &Ins/overw Ins" -#~ msgstr "삽입/겹침 토글(&I) Ins" +#~ msgid "_File" +#~ msgstr "파일(_F)" -#~ msgid "&Copy F5" -#~ msgstr "복사(&C) F5" +#~ msgid "_Edit" +#~ msgstr "편집(_E)" -#~ msgid "&Move F6" -#~ msgstr "이동(&M) F6" - -#~ msgid "&Delete F8" -#~ msgstr "지우기(&D) F8" - -#~ msgid "&Undo C-u" -#~ msgstr "취소(&U) C-u" - -#~ msgid "&Beginning C-PgUp" -#~ msgstr "파일 처음(&B) C-PgUp" - -#~ msgid "&End C-PgDn" -#~ msgstr "파일 끝(&E) C-PgDn" - -#~ msgid "&Search... F7" -#~ msgstr "찾기(&S)... F7" - -#~ msgid "search &Again F17" -#~ msgstr "다시 찾기(&A) F17" - -#~ msgid "&Replace... F4" -#~ msgstr "바꾸기(&R)... F4" - -#~ msgid "&Goto line... M-l" -#~ msgstr "라인 찾아가기(&G)... M-l" - -#~ msgid "insert &Literal... C-q" -#~ msgstr "Literal 입력(&L) C-q" - -#~ msgid "&Refresh screen C-l" -#~ msgstr "화면 갱신(&R) C-l" - -#~ msgid "&Start record macro C-r" -#~ msgstr "매크로 저장 시작(&S) C-r" - -#~ msgid "&Finish record macro... C-r" -#~ msgstr "매크로 저장 끝(&F) C-r" - -#~ msgid "&Execute macro... C-a, KEY" -#~ msgstr "매크로 실행(&E)... C-a, KEY" - -#~ msgid "delete macr&O... " -#~ msgstr "매크로 삭제(&O)... " - -#~ msgid "insert &Date/time " -#~ msgstr "날짜/시간 삽입(&D) " - -#~ msgid "format p&Aragraph M-p" -#~ msgstr "format p&Aragraph M-p" - -#~ msgid "'ispell' s&Pell check C-p" -#~ msgstr "'ispell' 철자 검사(&P) C-p" - -#~ msgid "sor&T... M-t" -#~ msgstr "정렬(&T) M-t" - -#~ msgid "'indent' &C Formatter F19" -#~ msgstr "'indent' &C Formatter F19" - -#~ msgid "&Mail... " -#~ msgstr "전자우편(&M)... " - -#~ msgid "&Execute macro... C-x e, KEY" -#~ msgstr "매크로 실행(&E)... C-x e, KEY" - -#~ msgid "'ispell' s&Pell check M-$" -#~ msgstr "'ispell' 철자 검사(&P) M-$" - -#~ msgid "&General... " -#~ msgstr "일반(&G)... " - -#~ msgid "&Save mode..." -#~ msgstr "모드 저장(&S)..." - -#~ msgid " Edit " -#~ msgstr " 편집 " - -#~ msgid " Sear/Repl " -#~ msgstr " 찾기/바꿈 " - -#~ msgid " Command " -#~ msgstr " 명령 " - -#~ msgid " Options " -#~ msgstr " 선택항목 " - -#~ msgid "Open...\tC-o" -#~ msgstr "열기...\tC-o" - -#~ msgid "New\tC-n" -#~ msgstr "새 글\tC-n" - -#~ msgid "Save\tF2" -#~ msgstr "저장\tF2" - -#~ msgid "Save as...\tF12" -#~ msgstr "새이름으로 저장\tF12" - -#~ msgid "Insert file...\tF15" -#~ msgstr "파일 끼워넣기...\tF15" - -#~ msgid "Copy to file...\tC-f" -#~ msgstr "파일로 복사...\tC-f" - -#~ msgid "Disk operations" -#~ msgstr "디스크 조작" - -#~ msgid "Toggle mark\tF3" -#~ msgstr "마크 토글\tF3" - -#~ msgid "Toggle mark columns\tC-b" -#~ msgstr "컬럼 마크 토글\tC-b" - -#~ msgid "Toggle insert/overwrite\tIns" -#~ msgstr "삽입/겹침 토글\tIns" - -#~ msgid "Copy block to cursor\tF5" -#~ msgstr "블럭을 커서위치로 복사\tF5" - -#~ msgid "Move block to cursor\tF6" -#~ msgstr "블럭을 커서위치로 이동\tF6" - -#~ msgid "Delete block\tF8/C-Del" -#~ msgstr "블럭 삭제\tF8/C-Del" - -#~ msgid "Copy block to clipbrd\tC-Ins" -#~ msgstr "블럭을 클립보드로 복사\tC-Ins" - -#~ msgid "Cut block to clipbrd\tS-Del" -#~ msgstr "블럭을 클립보드로 오려두기\tS-Del" - -#~ msgid "Paste block from clipbrd\tS-Ins" -#~ msgstr "클립보드에서 블럭 붙이기\tS-Ins" - -#~ msgid "Selection history\tM-Ins" -#~ msgstr "선택 히스토리\tM-Ins" - -#~ msgid "Undo\tC-BackSpace" -#~ msgstr "취소\tC-BackSpace" - -#~ msgid "Manipulating blocks of text" -#~ msgstr "텍스트 블럭 조작" - -#~ msgid " Srch/Replce " -#~ msgstr " 찾기/바꿈 " - -#~ msgid "Search...\tF7" -#~ msgstr "찾기...\tF7" - -#~ msgid "Search again\tF17" -#~ msgstr "다시 찾기\tF17" - -#~ msgid "Replace...\tF4" -#~ msgstr "바꿈...\tF4" - -#~ msgid "Replace again\tF14" -#~ msgstr "모두 바꿈\tF14" - -#~ msgid "Search for and replace text" -#~ msgstr "찾아서 바꿀 문자열" - -#~ msgid "Goto line...\tM-l" -#~ msgstr "라인 찾아가기...\tM-l" - -#~ msgid "Start record macro\tC-r" -#~ msgstr "매크로 저장 시작\tC-r" - -#~ msgid "Finish record macro...\tC-r" -#~ msgstr "매크로 저장 끝...\tC-r" - -#~ msgid "Execute macro...\tC-a, KEY" -#~ msgstr "매크로 실행...\tC-a, KEY" - -#~ msgid "Delete macro...\t" -#~ msgstr "매크로 삭제...\t" - -#~ msgid "Insert date/time\tC-d" -#~ msgstr "날짜/시간 삽입\tC-d" - -#~ msgid "Format paragraph\tM-p" -#~ msgstr "Format paragraph\tM-p" - -#~ msgid "Refresh display\tC-l" -#~ msgstr "화면 갱신\tC-l" - -#~ msgid "Macros and internal commands" -#~ msgstr "매크로와 내장 명령" +#~ msgid "_Mode" +#~ msgstr "모드(_M)" #~ msgid "Open/Load" #~ msgstr "열기/가져오기" @@ -5039,9 +5240,6 @@ #~ msgid "Save the current edit buffer as filename" #~ msgstr "현재의 편집 버퍼를 파일이름으로서 저장" - -#~ msgid "Exit" -#~ msgstr "종료" #~ msgid "Quit editor" #~ msgstr "편집기 종료" diff -ruN old/mc-4.5.21/po/mc.pot new/mc-4.5.22/po/mc.pot --- old/mc-4.5.21/po/mc.pot Thu Feb 25 01:53:39 1999 +++ new/mc-4.5.22/po/mc.pot Fri Feb 26 19:25:19 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-02-25 00:53-0600\n" +"POT-Creation-Date: 1999-02-26 18:19-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -55,15 +55,15 @@ msgid " Do you really want to quit the Midnight Commander? " msgstr "" -#: gnome/gcmd.c:123 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1817 -#: src/file.c:2197 src/filegui.c:573 src/hotlist.c:1035 src/main.c:829 +#: gnome/gcmd.c:123 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1813 +#: src/file.c:2195 src/filegui.c:573 src/hotlist.c:1035 src/main.c:829 #: src/screen.c:2049 src/subshell.c:701 src/subshell.c:727 src/tree.c:755 #: src/view.c:404 msgid "&Yes" msgstr "" -#: gnome/gcmd.c:123 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1817 -#: src/file.c:2197 src/filegui.c:572 src/hotlist.c:1035 src/main.c:829 +#: gnome/gcmd.c:123 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1813 +#: src/file.c:2195 src/filegui.c:572 src/hotlist.c:1035 src/main.c:829 #: src/screen.c:2049 src/subshell.c:701 src/subshell.c:727 src/tree.c:755 #: src/view.c:404 msgid "&No" @@ -153,7 +153,7 @@ msgstr "" #: gnome/gcmd.c:593 gnome/gcmd.c:634 gnome/gcmd.c:639 gnome/gcmd.c:643 -#: gnome/gscreen.c:2579 +#: gnome/gscreen.c:2582 msgid "Show all files" msgstr "" @@ -173,15 +173,15 @@ msgid "Enter a Regular Expression to filter files in the panel view." msgstr "" -#: gnome/gcmd.c:675 gnome/gpopup.c:52 +#: gnome/gcmd.c:675 gnome/gpopup.c:53 msgid " Open with..." msgstr "" -#: gnome/gcmd.c:676 gnome/gpopup.c:53 +#: gnome/gcmd.c:676 gnome/gpopup.c:54 msgid "Enter extra arguments:" msgstr "" -#: gnome/gdesktop.c:392 gnome/gdesktop.c:1816 +#: gnome/gdesktop.c:392 gnome/gdesktop.c:1828 msgid "Warning" msgstr "" @@ -203,28 +203,28 @@ msgstr "" #. Create the link to the user's home directory so that he will have an icon -#: gnome/gdesktop.c:1812 +#: gnome/gdesktop.c:1824 msgid "Home directory" msgstr "" -#: gnome/gdesktop.c:1817 +#: gnome/gdesktop.c:1829 #, c-format msgid "Could not symlink %s to %s; will not have initial desktop icons." msgstr "" -#: gnome/gdesktop.c:2148 gnome/glayout.c:410 +#: gnome/gdesktop.c:2160 gnome/glayout.c:410 msgid "Arrange Icons" msgstr "" -#: gnome/gdesktop.c:2150 +#: gnome/gdesktop.c:2162 msgid "Create New Window" msgstr "" -#: gnome/gdesktop.c:2152 +#: gnome/gdesktop.c:2164 msgid "Rescan Mountable Devices" msgstr "" -#: gnome/gdesktop.c:2153 gnome/glayout.c:413 +#: gnome/gdesktop.c:2165 gnome/glayout.c:413 msgid "Rescan Desktop" msgstr "" @@ -287,7 +287,7 @@ msgid "Replace it?" msgstr "" -#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1067 src/file.c:797 +#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1067 src/file.c:789 #: src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 msgid "Copy" msgstr "" @@ -342,27 +342,43 @@ msgid "If set, this will copy the directories recursively" msgstr "" +#: gnome/gdialogs.c:720 +#, c-format +msgid "" +"%s\n" +"\n" +"Directory not empty. Delete it recursively?" +msgstr "" + +#: gnome/gdialogs.c:729 src/file.c:2190 +msgid " Delete: " +msgstr "" + #: gnome/gdialogs.c:733 +msgid "Do the same for the rest" +msgstr "" + +#: gnome/gdialogs.c:802 msgid "Move Progress" msgstr "" -#: gnome/gdialogs.c:736 +#: gnome/gdialogs.c:805 msgid "Copy Progress" msgstr "" -#: gnome/gdialogs.c:739 +#: gnome/gdialogs.c:808 msgid "Delete Progress" msgstr "" -#: gnome/gdialogs.c:784 +#: gnome/gdialogs.c:853 msgid "File " msgstr "" -#: gnome/gdialogs.c:788 +#: gnome/gdialogs.c:857 msgid " is " msgstr "" -#: gnome/gdialogs.c:791 +#: gnome/gdialogs.c:860 msgid " Done." msgstr "" @@ -603,148 +619,148 @@ msgid "File/New/Directory..." msgstr "" -#: gnome/gpopup.c:257 gnome/gpopup.c:258 +#: gnome/gpopup.c:258 gnome/gpopup.c:259 msgid "Properties" msgstr "" -#: gnome/gpopup.c:259 +#: gnome/gpopup.c:260 msgid "Mount device" msgstr "" -#: gnome/gpopup.c:260 +#: gnome/gpopup.c:261 msgid "Unmount device" msgstr "" -#: gnome/gpopup.c:261 +#: gnome/gpopup.c:262 msgid "Eject device" msgstr "" -#: gnome/gpopup.c:263 gnome/gpopup.c:264 +#: gnome/gpopup.c:264 gnome/gpopup.c:265 msgid "Open" msgstr "" -#: gnome/gpopup.c:265 +#: gnome/gpopup.c:266 msgid "Open with" msgstr "" -#: gnome/gpopup.c:266 src/screen.c:2286 src/screen.c:2316 +#: gnome/gpopup.c:267 src/screen.c:2286 src/screen.c:2316 msgid "View" msgstr "" -#: gnome/gpopup.c:267 +#: gnome/gpopup.c:268 msgid "View unfiltered" msgstr "" -#: gnome/gpopup.c:268 src/screen.c:2287 src/screen.c:2317 src/view.c:1996 +#: gnome/gpopup.c:269 src/screen.c:2287 src/screen.c:2317 src/view.c:1996 msgid "Edit" msgstr "" -#: gnome/gpopup.c:270 +#: gnome/gpopup.c:271 msgid "Link..." msgstr "" -#: gnome/gpopup.c:271 +#: gnome/gpopup.c:272 msgid "Symlink..." msgstr "" -#: gnome/gpopup.c:272 +#: gnome/gpopup.c:273 msgid "Edit symlink..." msgstr "" -#: gnome/gpopup.c:279 gnome/gpopup.c:290 +#: gnome/gpopup.c:280 gnome/gpopup.c:291 msgid "Move/rename..." msgstr "" -#: gnome/gpopup.c:280 gnome/gpopup.c:291 +#: gnome/gpopup.c:281 gnome/gpopup.c:292 msgid "Copy..." msgstr "" -#: gnome/gpopup.c:281 gnome/gpopup.c:293 gtkedit/editwidget.c:1070 +#: gnome/gpopup.c:282 gnome/gpopup.c:294 gtkedit/editwidget.c:1070 #: src/screen.c:2291 src/screen.c:2321 msgid "Delete" msgstr "" -#: gnome/gprefs.c:78 +#: gnome/gprefs.c:81 msgid "Show backup files" msgstr "" -#: gnome/gprefs.c:82 +#: gnome/gprefs.c:85 msgid "Show hidden files" msgstr "" -#: gnome/gprefs.c:86 +#: gnome/gprefs.c:89 msgid "Mix files and directories" msgstr "" -#: gnome/gprefs.c:90 +#: gnome/gprefs.c:93 msgid "Use shell patterns instead of regular expressions" msgstr "" -#: gnome/gprefs.c:99 +#: gnome/gprefs.c:102 msgid "Confirm when deleting file" msgstr "" -#: gnome/gprefs.c:103 +#: gnome/gprefs.c:106 msgid "Confirm when overwriting files" msgstr "" -#: gnome/gprefs.c:107 +#: gnome/gprefs.c:110 msgid "Confirm when executing files" msgstr "" -#: gnome/gprefs.c:111 +#: gnome/gprefs.c:114 msgid "Show progress while operations are being performed" msgstr "" -#: gnome/gprefs.c:120 +#: gnome/gprefs.c:123 msgid "VFS Timeout:" msgstr "" -#: gnome/gprefs.c:121 gnome/gprefs.c:146 +#: gnome/gprefs.c:124 gnome/gprefs.c:149 msgid "Seconds" msgstr "" -#: gnome/gprefs.c:124 +#: gnome/gprefs.c:127 msgid "Anonymous FTP password:" msgstr "" -#: gnome/gprefs.c:128 +#: gnome/gprefs.c:131 msgid "Always use FTP proxy" msgstr "" -#: gnome/gprefs.c:137 +#: gnome/gprefs.c:140 msgid "Fast directory reload" msgstr "" -#: gnome/gprefs.c:141 +#: gnome/gprefs.c:144 msgid "Compute totals before copying files" msgstr "" -#: gnome/gprefs.c:145 +#: gnome/gprefs.c:148 msgid "FTP directory cache timeout :" msgstr "" -#: gnome/gprefs.c:149 +#: gnome/gprefs.c:152 msgid "Allow customization of icons in icon view" msgstr "" -#: gnome/gprefs.c:158 +#: gnome/gprefs.c:161 msgid "File display" msgstr "" -#: gnome/gprefs.c:162 +#: gnome/gprefs.c:165 msgid "Confirmation" msgstr "" -#: gnome/gprefs.c:166 +#: gnome/gprefs.c:169 msgid "VFS" msgstr "" -#: gnome/gprefs.c:170 +#: gnome/gprefs.c:173 msgid "Caching" msgstr "" -#: gnome/gprefs.c:447 +#: gnome/gprefs.c:452 msgid "Preferences" msgstr "" @@ -837,7 +853,7 @@ msgid "Title" msgstr "" -#: gnome/gprop.c:521 gnome/gscreen.c:2366 +#: gnome/gprop.c:521 gnome/gscreen.c:2369 msgid "Icon" msgstr "" @@ -845,174 +861,182 @@ msgid "Select icon" msgstr "" -#: gnome/gscreen.c:1451 +#: gnome/gscreen.c:1452 msgid "Rescan Directory" msgstr "" -#: gnome/gscreen.c:1451 +#: gnome/gscreen.c:1452 msgid "Reloads the current directory" msgstr "" -#: gnome/gscreen.c:1629 +#: gnome/gscreen.c:1454 +msgid "New folder" +msgstr "" + +#: gnome/gscreen.c:1454 +msgid "Creates a new folder here" +msgstr "" + +#: gnome/gscreen.c:1632 msgid "All files" msgstr "" -#: gnome/gscreen.c:1631 +#: gnome/gscreen.c:1634 msgid "Archives and compressed files" msgstr "" -#: gnome/gscreen.c:1633 +#: gnome/gscreen.c:1636 msgid "RPM/DEB files" msgstr "" -#: gnome/gscreen.c:1635 +#: gnome/gscreen.c:1638 msgid "Text/Document files" msgstr "" -#: gnome/gscreen.c:1637 +#: gnome/gscreen.c:1640 msgid "HTML and SGML files" msgstr "" -#: gnome/gscreen.c:1639 +#: gnome/gscreen.c:1642 msgid "Postscript and PDF files" msgstr "" -#: gnome/gscreen.c:1641 +#: gnome/gscreen.c:1644 msgid "Spreadsheet files" msgstr "" -#: gnome/gscreen.c:1643 +#: gnome/gscreen.c:1646 msgid "Image files" msgstr "" -#: gnome/gscreen.c:1646 +#: gnome/gscreen.c:1649 msgid "Video/animation files" msgstr "" -#: gnome/gscreen.c:1648 +#: gnome/gscreen.c:1651 msgid "Audio files" msgstr "" -#: gnome/gscreen.c:1650 +#: gnome/gscreen.c:1653 msgid "C program files" msgstr "" -#: gnome/gscreen.c:1652 +#: gnome/gscreen.c:1655 msgid "C++ program files" msgstr "" -#: gnome/gscreen.c:1654 +#: gnome/gscreen.c:1657 msgid "Objective-C program files" msgstr "" -#: gnome/gscreen.c:1656 +#: gnome/gscreen.c:1659 msgid "Scheme program files" msgstr "" -#: gnome/gscreen.c:1658 +#: gnome/gscreen.c:1661 msgid "Assembler program files" msgstr "" -#: gnome/gscreen.c:1660 +#: gnome/gscreen.c:1663 msgid "Misc. program files" msgstr "" -#: gnome/gscreen.c:1662 +#: gnome/gscreen.c:1665 msgid "Font files" msgstr "" -#: gnome/gscreen.c:1789 +#: gnome/gscreen.c:1792 #, c-format msgid "Search: %s" msgstr "" -#: gnome/gscreen.c:1799 +#: gnome/gscreen.c:1802 #, c-format msgid "%s bytes in %d file" msgstr "" -#: gnome/gscreen.c:1799 +#: gnome/gscreen.c:1802 #, c-format msgid "%s bytes in %d files" msgstr "" -#: gnome/gscreen.c:1825 src/screen.c:677 +#: gnome/gscreen.c:1828 src/screen.c:677 msgid "" msgstr "" -#: gnome/gscreen.c:1879 +#: gnome/gscreen.c:1882 msgid "Filter" msgstr "" -#: gnome/gscreen.c:2366 +#: gnome/gscreen.c:2369 msgid "Switch view to an Icon view" msgstr "" -#: gnome/gscreen.c:2368 +#: gnome/gscreen.c:2371 msgid "Brief" msgstr "" -#: gnome/gscreen.c:2368 +#: gnome/gscreen.c:2371 msgid "Switch view to show just file name and type" msgstr "" -#: gnome/gscreen.c:2370 +#: gnome/gscreen.c:2373 msgid "Detailed" msgstr "" -#: gnome/gscreen.c:2370 +#: gnome/gscreen.c:2373 msgid "Switch view to show detailed file statistics" msgstr "" -#: gnome/gscreen.c:2372 +#: gnome/gscreen.c:2375 msgid "Custom" msgstr "" -#: gnome/gscreen.c:2372 +#: gnome/gscreen.c:2375 msgid "Switch view to show custom determined statistics." msgstr "" -#: gnome/gscreen.c:2380 +#: gnome/gscreen.c:2383 msgid "Back" msgstr "" -#: gnome/gscreen.c:2380 +#: gnome/gscreen.c:2383 msgid "Go to the previously visited directory" msgstr "" -#: gnome/gscreen.c:2382 +#: gnome/gscreen.c:2385 msgid "Up" msgstr "" -#: gnome/gscreen.c:2382 +#: gnome/gscreen.c:2385 msgid "Go up a level in the directory heirarchy" msgstr "" -#: gnome/gscreen.c:2384 +#: gnome/gscreen.c:2387 msgid "Forward" msgstr "" -#: gnome/gscreen.c:2384 +#: gnome/gscreen.c:2387 msgid "Go to the next directory" msgstr "" -#: gnome/gscreen.c:2387 src/tree.c:1020 +#: gnome/gscreen.c:2390 src/tree.c:1020 msgid "Rescan" msgstr "" -#: gnome/gscreen.c:2387 +#: gnome/gscreen.c:2390 msgid "Rescan the current directory" msgstr "" -#: gnome/gscreen.c:2390 +#: gnome/gscreen.c:2393 msgid "Home" msgstr "" -#: gnome/gscreen.c:2390 +#: gnome/gscreen.c:2393 msgid "Go to your home directory" msgstr "" -#: gnome/gscreen.c:2524 +#: gnome/gscreen.c:2527 msgid "Location:" msgstr "" @@ -1023,67 +1047,67 @@ msgid "&Ok" msgstr "" -#: gnome/gview.c:119 src/view.c:683 +#: gnome/gview.c:122 src/view.c:683 #, c-format msgid "Offset 0x%08x" msgstr "" -#: gnome/gview.c:121 src/view.c:685 +#: gnome/gview.c:124 src/view.c:685 #, c-format msgid "Col %d" msgstr "" -#: gnome/gview.c:125 src/view.c:689 +#: gnome/gview.c:128 src/view.c:689 #, c-format msgid "%s bytes" msgstr "" -#: gnome/gview.c:289 +#: gnome/gview.c:292 msgid "_Goto line" msgstr "" -#: gnome/gview.c:290 +#: gnome/gview.c:293 msgid "Jump to a specified line number" msgstr "" -#: gnome/gview.c:292 +#: gnome/gview.c:295 msgid "_Monitor file" msgstr "" -#: gnome/gview.c:292 +#: gnome/gview.c:295 msgid "Monitor file growing" msgstr "" -#: gnome/gview.c:299 +#: gnome/gview.c:302 msgid "Regexp search" msgstr "" -#: gnome/gview.c:300 +#: gnome/gview.c:303 msgid "Regular expression search" msgstr "" -#: gnome/gview.c:309 +#: gnome/gview.c:312 msgid "_Wrap" msgstr "" -#: gnome/gview.c:310 +#: gnome/gview.c:313 msgid "Wrap the text" msgstr "" #. Can not use this one yet, as it destroys the viewer, need to fix that -#: gnome/gview.c:313 +#: gnome/gview.c:316 msgid "_Parsed view" msgstr "" -#: gnome/gview.c:316 +#: gnome/gview.c:319 msgid "_Formatted" msgstr "" -#: gnome/gview.c:318 +#: gnome/gview.c:321 msgid "_Hex" msgstr "" -#: gnome/gview.c:324 +#: gnome/gview.c:327 msgid "_Search" msgstr "" @@ -1099,11 +1123,11 @@ msgid "help" msgstr "" -#: gnome/gwidget.c:96 src/file.c:2216 +#: gnome/gwidget.c:96 src/file.c:2214 msgid "yes" msgstr "" -#: gnome/gwidget.c:98 src/file.c:2214 +#: gnome/gwidget.c:98 src/file.c:2212 msgid "no" msgstr "" @@ -1156,7 +1180,7 @@ #. Warning message with a query to continue or cancel the operation #: gtkedit/editcmd.c:482 gtkedit/editcmd.c:801 gtkedit/editcmd.c:831 -#: gtkedit/editcmd.c:978 gtkedit/editcmd.c:1075 src/ext.c:294 src/file.c:614 +#: gtkedit/editcmd.c:978 gtkedit/editcmd.c:1075 src/ext.c:301 src/file.c:606 #: src/help.c:318 src/main.c:674 src/screen.c:2063 src/subshell.c:700 #: src/subshell.c:726 src/utilunix.c:388 src/utilunix.c:392 src/utilunix.c:458 #: vfs/mcfs.c:170 @@ -2063,7 +2087,7 @@ msgid "Background process:" msgstr "" -#: src/background.c:284 src/file.c:2139 +#: src/background.c:284 src/file.c:2135 msgid " Background process error " msgstr "" @@ -2537,7 +2561,7 @@ msgid " Link " msgstr "" -#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1647 +#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1639 msgid " to:" msgstr "" @@ -2730,40 +2754,40 @@ msgid " Parameter " msgstr "" -#: src/ext.c:294 +#: src/ext.c:301 msgid " Can't execute commands on a Virtual File System directory " msgstr "" -#: src/ext.c:391 +#: src/ext.c:398 msgid " file error" msgstr "" -#: src/ext.c:392 +#: src/ext.c:399 msgid "Format of the " msgstr "" -#: src/ext.c:410 +#: src/ext.c:417 msgid " file error " msgstr "" -#: src/ext.c:411 +#: src/ext.c:418 msgid "Format of the ~/" msgstr "" -#: src/ext.c:411 +#: src/ext.c:418 msgid "" " file has changed\n" "with version 3.0. You may want either to\n" "copy it from " msgstr "" -#: src/ext.c:413 +#: src/ext.c:420 msgid "" "mc.ext or use that\n" "file as an example of how to write it.\n" msgstr "" -#: src/ext.c:415 +#: src/ext.c:422 msgid "mc.ext will be used for this moment." msgstr "" @@ -2779,159 +2803,159 @@ msgid " Delete " msgstr "" -#: src/file.c:252 +#: src/file.c:244 msgid " Invalid target mask " msgstr "" -#: src/file.c:350 +#: src/file.c:342 msgid " Could not make the hardlink " msgstr "" -#: src/file.c:392 +#: src/file.c:384 #, c-format msgid "" " Cannot read source link \"%s\" \n" " %s " msgstr "" -#: src/file.c:402 +#: src/file.c:394 msgid "" " Cannot make stable symlinks across non-local filesystems: \n" "\n" " Option Stable Symlinks will be disabled " msgstr "" -#: src/file.c:450 +#: src/file.c:442 #, c-format msgid "" " Cannot create target symlink \"%s\" \n" " %s " msgstr "" -#: src/file.c:518 +#: src/file.c:510 #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" " %s " msgstr "" -#: src/file.c:527 +#: src/file.c:519 #, c-format msgid "" " Cannot stat source file \"%s\" \n" " %s " msgstr "" -#: src/file.c:540 +#: src/file.c:532 #, c-format msgid " `%s' and `%s' are the same file. " msgstr "" -#: src/file.c:573 +#: src/file.c:565 #, c-format msgid "" " Cannot create special file \"%s\" \n" " %s " msgstr "" -#: src/file.c:582 src/file.c:807 +#: src/file.c:574 src/file.c:799 #, c-format msgid "" " Cannot chown target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:591 src/file.c:825 +#: src/file.c:583 src/file.c:817 #, c-format msgid "" " Cannot chmod target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:604 +#: src/file.c:596 #, c-format msgid "" " Cannot open source file \"%s\" \n" " %s " msgstr "" -#: src/file.c:614 +#: src/file.c:606 msgid " Reget failed, about to overwrite file " msgstr "" -#: src/file.c:620 +#: src/file.c:612 #, c-format msgid "" " Cannot fstat source file \"%s\" \n" " %s " msgstr "" -#: src/file.c:646 +#: src/file.c:638 #, c-format msgid "" " Cannot create target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:660 +#: src/file.c:652 #, c-format msgid "" " Cannot fstat target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:691 +#: src/file.c:683 #, c-format msgid "" " Cannot read source file \"%s\" \n" " %s " msgstr "" -#: src/file.c:721 +#: src/file.c:713 #, c-format msgid "" " Cannot write target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:740 +#: src/file.c:732 msgid "(stalled)" msgstr "" -#: src/file.c:778 +#: src/file.c:770 #, c-format msgid "" " Cannot close source file \"%s\" \n" " %s " msgstr "" -#: src/file.c:787 +#: src/file.c:779 #, c-format msgid "" " Cannot close target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:797 +#: src/file.c:789 msgid "Incomplete file was retrieved. Keep it?" msgstr "" -#: src/file.c:798 +#: src/file.c:790 msgid "&Delete" msgstr "" -#: src/file.c:798 src/hotlist.c:1443 +#: src/file.c:790 src/hotlist.c:1443 msgid "&Keep" msgstr "" -#: src/file.c:870 +#: src/file.c:862 #, c-format msgid "" " Cannot stat source directory \"%s\" \n" " %s " msgstr "" -#: src/file.c:893 +#: src/file.c:885 #, c-format msgid "" " Source directory \"%s\" is not a directory \n" @@ -2939,21 +2963,21 @@ msgstr "" #. we found a cyclic symbolic link -#: src/file.c:901 +#: src/file.c:893 #, c-format msgid "" " Cannot copy cyclic symbolic link \n" " `%s' " msgstr "" -#: src/file.c:954 +#: src/file.c:946 #, c-format msgid "" " Cannot create target directory \"%s\" \n" " %s " msgstr "" -#: src/file.c:972 +#: src/file.c:964 #, c-format msgid "" " Cannot chown target directory \"%s\" \n" @@ -2961,69 +2985,69 @@ msgstr "" #. Source doesn't exist -#: src/file.c:1082 +#: src/file.c:1074 #, c-format msgid "" " Cannot stat file \"%s\" \n" " %s " msgstr "" -#: src/file.c:1104 +#: src/file.c:1096 #, c-format msgid " `%s' and `%s' are the same file " msgstr "" -#: src/file.c:1111 +#: src/file.c:1103 #, c-format msgid " Cannot overwrite directory `%s' " msgstr "" -#: src/file.c:1148 +#: src/file.c:1140 #, c-format msgid "" " Cannot move file \"%s\" to \"%s\" \n" " %s " msgstr "" -#: src/file.c:1168 +#: src/file.c:1160 #, c-format msgid "" " Cannot remove file \"%s\" \n" " %s " msgstr "" -#: src/file.c:1221 +#: src/file.c:1213 #, c-format msgid " Cannot overwrite directory \"%s\" %s " msgstr "" -#: src/file.c:1223 +#: src/file.c:1215 #, c-format msgid " Cannot overwrite file \"%s\" %s " msgstr "" -#: src/file.c:1246 +#: src/file.c:1238 #, c-format msgid "" " Cannot move directory \"%s\" to \"%s\" \n" " %s " msgstr "" -#: src/file.c:1309 +#: src/file.c:1301 #, c-format msgid "" " Cannot delete file \"%s\" \n" " %s " msgstr "" -#: src/file.c:1370 src/file.c:1437 src/file.c:1466 +#: src/file.c:1362 src/file.c:1429 src/file.c:1458 #, c-format msgid "" " Cannot remove directory \"%s\" \n" " %s " msgstr "" -#: src/file.c:1502 +#: src/file.c:1494 msgid " Internal error: get_file \n" msgstr "" @@ -3036,144 +3060,140 @@ #. * (I don't use spaces around the words, because someday they could be #. * dropped, when widgets get smarter) #. -#: src/file.c:1623 +#: src/file.c:1615 msgid "1Copy" msgstr "" -#: src/file.c:1623 +#: src/file.c:1615 msgid "1Move" msgstr "" -#: src/file.c:1623 +#: src/file.c:1615 msgid "1Delete" msgstr "" -#: src/file.c:1638 +#: src/file.c:1630 #, c-format msgid "%o %f \"%s\"%m" msgstr "" -#: src/file.c:1639 +#: src/file.c:1631 #, c-format msgid "%o %d %f%m" msgstr "" -#: src/file.c:1641 +#: src/file.c:1633 #, c-format msgid "%o %f \"%s\"%e" msgstr "" -#: src/file.c:1642 +#: src/file.c:1634 #, c-format msgid "%o %d %f%e" msgstr "" -#: src/file.c:1646 +#: src/file.c:1638 msgid "file" msgstr "" -#: src/file.c:1646 +#: src/file.c:1638 msgid "files" msgstr "" -#: src/file.c:1646 +#: src/file.c:1638 msgid "directory" msgstr "" -#: src/file.c:1646 +#: src/file.c:1638 msgid "directories" msgstr "" -#: src/file.c:1647 +#: src/file.c:1639 msgid "files/directories" msgstr "" -#: src/file.c:1647 +#: src/file.c:1639 msgid " with source mask:" msgstr "" -#: src/file.c:1795 +#: src/file.c:1791 msgid " Can't operate on \"..\"! " msgstr "" -#: src/file.c:1814 +#: src/file.c:1810 msgid "Yes" msgstr "" -#: src/file.c:1814 +#: src/file.c:1810 msgid "No" msgstr "" -#: src/file.c:1867 +#: src/file.c:1863 msgid " Sorry, I could not put the job in background " msgstr "" -#: src/file.c:1950 src/file.c:2055 +#: src/file.c:1946 src/file.c:2051 msgid " Internal failure " msgstr "" -#: src/file.c:1950 src/file.c:2055 +#: src/file.c:1946 src/file.c:2051 msgid " Unknown file operation " msgstr "" -#: src/file.c:1969 +#: src/file.c:1965 #, c-format msgid "" " Destination \"%s\" must be a directory \n" " %s " msgstr "" -#: src/file.c:2140 src/filegui.c:263 +#: src/file.c:2136 src/filegui.c:263 msgid "&Skip" msgstr "" -#: src/file.c:2140 +#: src/file.c:2136 msgid "&Retry" msgstr "" -#: src/file.c:2140 src/file.c:2199 src/filegui.c:260 src/filegui.c:562 +#: src/file.c:2136 src/file.c:2197 src/filegui.c:260 src/filegui.c:562 msgid "&Abort" msgstr "" -#: src/file.c:2190 +#: src/file.c:2188 msgid "" "\n" " Directory not empty. \n" " Delete it recursively? " msgstr "" -#: src/file.c:2191 +#: src/file.c:2189 msgid "" "\n" " Background process: Directory not empty \n" " Delete it recursively? " msgstr "" -#: src/file.c:2192 -msgid " Delete: " -msgstr "" - -#: src/file.c:2198 +#: src/file.c:2196 msgid "a&ll" msgstr "" -#: src/file.c:2198 src/filegui.c:565 +#: src/file.c:2196 src/filegui.c:565 msgid "non&E" msgstr "" -#: src/file.c:2208 +#: src/file.c:2206 msgid " Type 'yes' if you REALLY want to delete " msgstr "" -#: src/file.c:2210 +#: src/file.c:2208 msgid "all the directories " msgstr "" -#: src/file.c:2212 +#: src/file.c:2210 msgid " Recursive Delete " msgstr "" -#: src/file.c:2213 +#: src/file.c:2211 msgid " Background process: Recursive Delete " msgstr "" diff -ruN old/mc-4.5.21/src/ChangeLog new/mc-4.5.22/src/ChangeLog --- old/mc-4.5.21/src/ChangeLog Thu Feb 25 01:53:32 1999 +++ new/mc-4.5.22/src/ChangeLog Fri Feb 26 19:25:14 1999 @@ -1,3 +1,14 @@ +1999-02-26 Miguel de Icaza + + * view.c (view_percent, view_update): Take an extra argument: + update_gui, which controls whether we want to update the displayed + region in the GUI version. + +1999-02-25 Owen Taylor + + * fileopctx.h file.c: Moved recursive delete query + dialog into gdialogs.c for GNOME. + 1999-02-24 Miguel de Icaza * file.c: Moved FileCopyMode here (thanks to Wolfgang Scherer for diff -ruN old/mc-4.5.21/src/ext.c new/mc-4.5.22/src/ext.c --- old/mc-4.5.21/src/ext.c Thu Feb 25 01:53:32 1999 +++ new/mc-4.5.22/src/ext.c Fri Feb 26 19:25:14 1999 @@ -97,7 +97,7 @@ } void -exec_extension (const char *filename, const char *data, char **drops, int *move_dir, int start_line) +exec_extension (const char *filename, const char *data, char **drops, int *move_dir, int start_line, int needs_term) { char *file_name; int cmd_file_fd; @@ -274,7 +274,14 @@ q[1] = 0; do_cd (p, cd_parse_command); } else { +#ifdef HAVE_GNOME + if (needs_term) + gnome_open_terminal_with_cmd (file_name); + else + shell_execute (file_name, EXECUTE_INTERNAL | EXECUTE_TEMPFILE); +#else shell_execute (file_name, EXECUTE_INTERNAL | EXECUTE_TEMPFILE); +#endif if (console_flag) { handle_console (CONSOLE_SAVE); @@ -653,7 +660,7 @@ if (p < q) { char *filename_copy = g_strdup (filename); - exec_extension (filename_copy, r + 1, drops, move_dir, view_at_line_number); + exec_extension (filename_copy, r + 1, drops, move_dir, view_at_line_number, 0); g_free (filename_copy); to_return = "Success"; diff -ruN old/mc-4.5.21/src/ext.h new/mc-4.5.22/src/ext.h --- old/mc-4.5.21/src/ext.h Thu Feb 25 01:53:32 1999 +++ new/mc-4.5.22/src/ext.h Fri Feb 26 19:25:13 1999 @@ -2,7 +2,7 @@ #define __EXT_H char *regex_command (char *filename, char *action, char **drops, int *move_dir); -void exec_extension (const char *filename, const char *data, char **drops, int *move_dir, int start_line); +void exec_extension (const char *filename, const char *data, char **drops, int *move_dir, int start_line, int needs_term); /* Call it after the user has edited the mc.ext file, * to flush the cached mc.ext file diff -ruN old/mc-4.5.21/src/file.c new/mc-4.5.22/src/file.c --- old/mc-4.5.21/src/file.c Thu Feb 25 01:53:32 1999 +++ new/mc-4.5.22/src/file.c Fri Feb 26 19:25:14 1999 @@ -107,7 +107,7 @@ /* }}} */ -/* rcsid [] = "$Id: file.c,v 1.48 1999/02/25 04:21:38 unammx Exp $" */ +/* rcsid [] = "$Id: file.c,v 1.49 1999/02/26 00:27:27 owen Exp $" */ int verbose = 1; @@ -156,14 +156,6 @@ N_(" Delete ") }; -typedef enum { - RECURSIVE_YES, - RECURSIVE_NO, - RECURSIVE_ALWAYS, - RECURSIVE_NEVER, - RECURSIVE_ABORT -} FileCopyMode; - static int recursive_erase (FileOpContext *ctx, char *s, long *progress_count, double *progress_bytes); @@ -1749,6 +1741,10 @@ #ifdef HAVE_GNOME extern FileProgressStatus file_progress_query_replace_policy (FileOpContext *ctx, gboolean dialog_needed); +extern int file_delete_query_recursive (FileOpContext *ctx, + enum OperationMode mode, + gchar *s); + #endif /** @@ -2180,10 +2176,12 @@ return do_file_error (cmd_buf); } +#ifndef HAVE_GNOME static int real_query_recursive (FileOpContext *ctx, enum OperationMode mode, char *s) { - char *confirm, *text; + char *confirm, *textb; + gchar *text; if (ctx->recursive_result < RECURSIVE_ALWAYS){ char *msg = @@ -2236,6 +2234,7 @@ return FILE_ABORT; } } +#endif #ifdef WITH_BACKGROUND static int @@ -2250,10 +2249,17 @@ static int query_recursive (FileOpContext *ctx, char *s) { +#ifdef HAVE_GNOME + if (we_are_background) + return parent_call (file_delete_query_recursive, ctx, 1, strlen (s), s); + else + return file_delete_query_recursive (ctx, Foreground, s); +#else if (we_are_background) return parent_call (real_query_recursive, ctx, 1, strlen (s), s); else return real_query_recursive (ctx, Foreground, s); +#endif } static int diff -ruN old/mc-4.5.21/src/fileopctx.h new/mc-4.5.22/src/fileopctx.h --- old/mc-4.5.21/src/fileopctx.h Thu Feb 25 01:53:32 1999 +++ new/mc-4.5.22/src/fileopctx.h Fri Feb 26 19:25:13 1999 @@ -120,6 +120,14 @@ FILE_ABORT } FileProgressStatus; +typedef enum { + RECURSIVE_YES, + RECURSIVE_NO, + RECURSIVE_ALWAYS, + RECURSIVE_NEVER, + RECURSIVE_ABORT +} FileCopyMode; + /* First argument passed to real functions */ enum OperationMode { Foreground, diff -ruN old/mc-4.5.21/src/find.c new/mc-4.5.22/src/find.c --- old/mc-4.5.21/src/find.c Thu Feb 25 01:53:32 1999 +++ new/mc-4.5.22/src/find.c Fri Feb 26 19:25:14 1999 @@ -821,8 +821,8 @@ g_status_label, TRUE, TRUE, GNOME_PAD_SMALL); gtk_widget_show_all (g_find_dlg); - gtk_widget_hide (GTK_WIDGET (find_do_view)); - gtk_widget_hide (GTK_WIDGET (find_do_edit)); + gtk_widget_hide (GTK_WIDGET (g_view)); + gtk_widget_hide (GTK_WIDGET (g_edit)); } static int diff -ruN old/mc-4.5.21/src/view.c new/mc-4.5.22/src/view.c --- old/mc-4.5.21/src/view.c Thu Feb 25 01:53:32 1999 +++ new/mc-4.5.22/src/view.c Fri Feb 26 19:25:14 1999 @@ -121,7 +121,7 @@ int altered_nroff_flag = 0; /* }}} */ -/* "$Id: view.c,v 1.27 1999/02/10 01:16:50 unammx Exp $" */ +/* "$Id: view.c,v 1.28 1999/02/26 07:26:45 unammx Exp $" */ static char hex_char[] = "0123456789ABCDEF"; @@ -352,7 +352,7 @@ node->value = byte_val; } view->dirty++; - view_update (view); + view_update (view, TRUE); move_right (view); } @@ -645,7 +645,7 @@ #ifndef HAVE_X void -view_percent (WView *view, int p, int w) +view_percent (WView *view, int p, int w, gboolean update_gui) { int percent; @@ -665,7 +665,7 @@ } void -view_status (WView *view) +view_status (WView *view, gboolean update_gui) { int w = view->widget.cols - (view->have_frame * 2); int i; @@ -695,9 +695,9 @@ } if (w - i > 4) if (view->hex_mode) - view_percent (view, view->edit_cursor - view->first, w); + view_percent (view, view->edit_cursor - view->first, w, update_gui); else - view_percent (view, view->start_display - view->first, w); + view_percent (view, view->start_display - view->first, w, update_gui); } attrset (SELECTED_COLOR); } @@ -1010,14 +1010,14 @@ } void -view_update (WView *view) +view_update (WView *view, gboolean update_gui) { static int dirt_limit = 1; if (view->dirty > dirt_limit){ /* Too many updates skipped -> force a update */ display (view); - view_status (view); + view_status (view, update_gui); view->dirty = 0; /* Raise the update skipping limit */ dirt_limit++; @@ -1028,14 +1028,14 @@ if (is_idle ()){ /* We have time to update the screen properly */ display (view); - view_status (view); + view_status (view, update_gui); view->dirty = 0; if (dirt_limit > 1) dirt_limit--; } else { /* We are busy -> skipping full update, only the status line is updated */ - view_status (view); + view_status (view, update_gui); } /* Here we had a refresh, if fast scrolling does not work restore the refresh, although this should not happen */ @@ -1499,7 +1499,7 @@ if (p >= update_activate){ update_activate += update_steps; if (verbose){ - view_percent (view, p, w); + view_percent (view, p, w, TRUE); mc_refresh (); } if (got_interrupt ()) @@ -1587,7 +1587,7 @@ if (e >= update_activate){ update_activate += update_steps; if (verbose){ - view_percent (view, e, w); + view_percent (view, e, w, TRUE); mc_refresh (); } if (got_interrupt ()) @@ -1743,7 +1743,7 @@ search (view, regexp, regexp_view_search); /* Had a refresh here */ view->dirty++; - view_update (view); + view_update (view, TRUE); } static void do_normal_search (void *xview, char *text) @@ -1757,7 +1757,7 @@ search (view, text, icase_search_p); /* Had a refresh here */ view->dirty++; - view_update (view); + view_update (view, TRUE); } /* }}} */ @@ -1789,7 +1789,7 @@ } view_labels (view); view->dirty++; - view_update (view); + view_update (view, TRUE); return; } view->wrap_mode = 1 - view->wrap_mode; @@ -1805,7 +1805,7 @@ } view_labels (view); view->dirty++; - view_update (view); + view_update (view, TRUE); } /* Both views */ @@ -1830,7 +1830,7 @@ get_bottom_first (view, 1, 1); view_labels (view); view->dirty++; - view_update (view); + view_update (view, TRUE); } /* Both views */ @@ -1864,7 +1864,7 @@ } view->dirty++; view->wrap_mode = saved_wrap_mode; - view_update (view); + view_update (view, TRUE); } /* Both views */ @@ -1956,7 +1956,7 @@ g_free (t); view_labels (view); view->dirty++; - view_update (view); + view_update (view, TRUE); } } @@ -1967,7 +1967,7 @@ altered_nroff_flag = 1; view_labels (view); view->dirty++; - view_update (view); + view_update (view, TRUE); } /* Real view only */ @@ -2286,7 +2286,7 @@ int result; if (view_event ((WView *) x, event, &result)) - view_update ((WView *) x); + view_update ((WView *) x, TRUE); return result; } @@ -2397,7 +2397,7 @@ view_init (view, 0, panel->dir.list [panel->selected].fname, 0); display (view); - view_status (view); + view_status (view, TRUE); } static int @@ -2417,7 +2417,7 @@ case WIDGET_DRAW: display (view); - view_status (view); + view_status (view, TRUE); break; case WIDGET_CURSOR: @@ -2430,7 +2430,7 @@ if (view->view_quit) dlg_stop (h); else { - view_update (view); + view_update (view, TRUE); } return i; @@ -2439,7 +2439,7 @@ view->bottom_first = -1; move_to_bottom (view); display (view); - view_status (view); + view_status (view, TRUE); sleep (1); return 1; diff -ruN old/mc-4.5.21/src/view.h new/mc-4.5.22/src/view.h --- old/mc-4.5.21/src/view.h Thu Feb 25 01:53:32 1999 +++ new/mc-4.5.22/src/view.h Fri Feb 26 19:25:13 1999 @@ -117,9 +117,9 @@ int view_file (char *filename, int normal, int internal); /* Internal view routines */ -void view_status (WView *); -void view_percent (WView *, int, int); -void view_update (WView *view); +void view_status (WView *, gboolean update_gui); +void view_percent (WView *, int p, int w, gboolean update_gui); +void view_update (WView *view, gboolean update_gui); void view_labels (WView *view); int view_event (WView *view, Gpm_Event *event,int *result); void toggle_wrap_mode (WView *);