diff -ruN old/mc-4.5.26/Makefile.in new/mc-4.5.27/Makefile.in --- old/mc-4.5.26/Makefile.in Sun Mar 14 19:19:25 1999 +++ new/mc-4.5.27/Makefile.in Thu Mar 18 20:42:26 1999 @@ -18,7 +18,7 @@ Makefile.in FAQ COPYING create_vcs install-sh \ config.h.in mc-aclocal.m4 aclocal.m4 acconfig.h \ VERSION mcfn_install.in Make.common.in README.PC \ - mc.spec Specfile README.QNX VERSION.in \ + mc.spec mc.spec.in Specfile README.QNX VERSION.in \ mkinstalldirs autogen.sh ABOUT-NLS gettext.m4 all: @@ -139,4 +139,4 @@ @echo *********************************** distcheck: - @echo use mydistcheck only if you know what you are doing. \ No newline at end of file + @echo use mydistcheck only if you know what you are doing. diff -ruN old/mc-4.5.26/Specfile new/mc-4.5.27/Specfile --- old/mc-4.5.26/Specfile Sun Mar 14 19:19:25 1999 +++ new/mc-4.5.27/Specfile Thu Mar 18 20:42:26 1999 @@ -1,5 +1,5 @@ # Note that this is NOT a relocatable package -%define ver 4.5.26 +%define ver 4.5.27 %define rel 1 %define prefix /usr diff -ruN old/mc-4.5.26/VERSION new/mc-4.5.27/VERSION --- old/mc-4.5.26/VERSION Sun Mar 14 19:19:25 1999 +++ new/mc-4.5.27/VERSION Thu Mar 18 20:42:26 1999 @@ -1 +1 @@ -#define VERSION "4.5.26" +#define VERSION "4.5.27" diff -ruN old/mc-4.5.26/configure new/mc-4.5.27/configure --- old/mc-4.5.26/configure Sun Mar 14 19:19:25 1999 +++ new/mc-4.5.27/configure Thu Mar 18 20:42:26 1999 @@ -586,7 +586,7 @@ PACKAGE=mc -VERSION=4.5.26 +VERSION=4.5.27 cat >> confdefs.h <&6 fi - min_glib_version=0.99.7 + min_glib_version=1.2.0 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 echo "configure:3564: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" diff -ruN old/mc-4.5.26/configure.in new/mc-4.5.27/configure.in --- old/mc-4.5.26/configure.in Sun Mar 14 19:19:25 1999 +++ new/mc-4.5.27/configure.in Thu Mar 18 20:42:26 1999 @@ -5,7 +5,7 @@ AC_CONFIG_HEADER(config.h) PACKAGE=mc -VERSION=4.5.26 +VERSION=4.5.27 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(VERSION) @@ -119,7 +119,7 @@ dnl dnl We now use glib dnl -AM_PATH_GLIB(,,AC_MSG_ERROR(Test for GLIB failed. MC requires GLIB.)) +AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(Test for GLIB failed. MC requires GLIB.)) LIBS="$LIBS $GLIB_LIBS" CFLAGS="$CFLAGS $GLIB_CFLAGS" diff -ruN old/mc-4.5.26/gnome/ChangeLog new/mc-4.5.27/gnome/ChangeLog --- old/mc-4.5.26/gnome/ChangeLog Sun Mar 14 19:19:37 1999 +++ new/mc-4.5.27/gnome/ChangeLog Thu Mar 18 20:42:31 1999 @@ -1,3 +1,61 @@ +1999-03-18 Miguel de Icaza + + * gdesktop.c (desktop_icon_info_open): Fix condition. Should not + open a new panel if it fails to mount the device. + +Thu Mar 18 14:59:12 1999 Timur Bakeyev + + * gnome-open-dialog.c (read_directory): s/basename/x_basename/g + +1999-03-17 Jonathan Blandford + + * gnome-file-property-dialog.c (generate_icon_sel): I don't know + who broke this, but it was a mess. It now does the right thing, + and works... + +1999-03-16 Jonathan Blandford + + * gnome-open-dialog.c (read_directory): We now honor .order files. + +1999-03-16 Federico Mena Quintero + + * gicon.c (get_icon_set): Use iset->filename (which is a + strdup()ed string) instead of filename as a key in the hash table, + since the user will very likely free filename. + + * gdialogs.c (symlink_dialog): Finished implementing the new + symlink dialog. + + * gdesktop.c (icon_event): I'm an idiot. Someone teach me boolean + logic again. Fixed edit-on-release for icons. + +1999-03-15 Federico Mena Quintero + + * gdialogs.c (real_input_dialog_help): Now we use a + gnome_request_dialog() for generic input dialogs. They look + prettier and consistent now. + (file_progress_show): Update the progress bars. Thanks to Greg + for noticing this! + + * Makefile.in: Removed references to gpopup.[co]. + +Mon Mar 15 17:09:37 1999 Gregory McLean + + * gdialogs.c (file_progress_show_bytes): Fixed a GTK Warning when + done / total >= 1.0 + * file.c : Actually update the progress bar when copying files around. + +1999-03-15 Federico Mena Quintero + + * gscreen.c (x_select_item): It is not necessary to call + gnome_canvas_update_now() here. + + * gdesktop-icon.c (set_icon): Do not destroy the icon image. + + * gnome-file-property-dialog.c + (gnome_file_property_dialog_finalize): Do not destroy the icon + image, since it is a shared resource. + 1999-03-14 Federico Mena Quintero * gdesktop.c (text_changed): If the file has the "icon-caption" diff -ruN old/mc-4.5.26/gnome/Makefile.in new/mc-4.5.27/gnome/Makefile.in --- old/mc-4.5.26/gnome/Makefile.in Sun Mar 14 19:19:37 1999 +++ new/mc-4.5.27/gnome/Makefile.in Thu Mar 18 20:42:31 1999 @@ -49,7 +49,6 @@ gmenu.c \ gmetadata.c \ gpageprop.c \ - gpopup.c \ gpopup2.c \ gprefs.c \ gprint.c \ @@ -81,7 +80,6 @@ gmetadata.h \ gpageprop.h \ gpopup.h \ - gpopup2.h \ gprefs.h \ gprint.h \ gprop.h \ @@ -156,7 +154,6 @@ gmenu.o \ gmetadata.o \ gpageprop.o \ - gpopup.o \ gpopup2.o \ gprefs.o \ gprint.o \ diff -ruN old/mc-4.5.26/gnome/gdesktop-icon.c new/mc-4.5.27/gnome/gdesktop-icon.c --- old/mc-4.5.26/gnome/gdesktop-icon.c Sun Mar 14 19:19:37 1999 +++ new/mc-4.5.27/gnome/gdesktop-icon.c Thu Mar 18 20:42:31 1999 @@ -185,24 +185,11 @@ static void set_icon (DesktopIcon *dicon, GdkImlibImage *im) { - GdkImlibImage *old_im; - GtkArg arg; - - /* Destroy the old image if it exists */ - - arg.name = "image"; - gtk_object_getv (GTK_OBJECT (dicon->icon), 1, &arg); - - old_im = GTK_VALUE_POINTER (arg); - gnome_canvas_item_set (dicon->icon, "image", im, "width", (double) im->rgb_width, "height", (double) im->rgb_height, NULL); - - if (old_im != im) - gdk_imlib_destroy_image (old_im); } /* Sets the text in the desktop icon, but does not re-create its window shape. */ diff -ruN old/mc-4.5.26/gnome/gdesktop.c new/mc-4.5.27/gnome/gdesktop.c --- old/mc-4.5.26/gnome/gdesktop.c Sun Mar 14 19:19:37 1999 +++ new/mc-4.5.27/gnome/gdesktop.c Thu Mar 18 20:42:31 1999 @@ -1003,20 +1003,21 @@ return FALSE; if (op){ + gboolean success = TRUE; char *command; FILE *f; command = g_strconcat (op, " ", buffer, NULL); open_error_pipe (); f = popen (command, "r"); - if (f == NULL) - close_error_pipe (1, _("While running the mount/umount command")); - else - close_error_pipe (0, 0); + if (f == NULL){ + success = !close_error_pipe (1, _("While running the mount/umount command")); + } else + success = !close_error_pipe (0, 0); pclose (f); g_free (buffer); - return TRUE; + return success; } g_free (buffer); return FALSE; @@ -1140,6 +1141,8 @@ if (!is_mounted){ if (try_to_mount (filename, fe)) launch = TRUE; + else + launch = FALSE; } else launch = TRUE; @@ -1531,7 +1534,7 @@ break; case GDK_BUTTON_RELEASE: - if (event->button.button != 1 || event->button.button != 2) + if (!(event->button.button == 1 || event->button.button != 2)) break; if (on_text && icon_select_on_text) { diff -ruN old/mc-4.5.26/gnome/gdialogs.c new/mc-4.5.27/gnome/gdialogs.c --- old/mc-4.5.26/gnome/gdialogs.c Sun Mar 14 19:19:37 1999 +++ new/mc-4.5.27/gnome/gdialogs.c Thu Mar 18 20:42:31 1999 @@ -8,6 +8,7 @@ #include "filegui.h" #include "fileopctx.h" #include "eregex.h" +#include "main.h" #include "../vfs/vfs.h" enum { @@ -224,8 +225,9 @@ FileProgressStatus file_progress_show (FileOpContext *ctx, long done, long total) { - static gchar count[10]; + static gchar count[20]; FileOpContextUI *ui; + double perc; g_return_val_if_fail (ctx != NULL, FILE_CONT); @@ -238,8 +240,14 @@ if (ui->aborting) return FILE_ABORT; - snprintf (count, 9, "%d%%", (gint)(100.0 *(gfloat)done/(gfloat)total)); - gtk_label_set_text (GTK_LABEL (ui->file_label), count); + if (total > 0) { + perc = (double) done / (double) total; + snprintf (count, 9, "%d%%", (gint) (100.0 * perc)); + gtk_label_set_text (GTK_LABEL (ui->file_label), count); + gtk_progress_bar_update (GTK_PROGRESS_BAR (ui->byte_prog), perc); + } else + gtk_progress_bar_update (GTK_PROGRESS_BAR (ui->byte_prog), 0.0); + while (gtk_events_pending ()) gtk_main_iteration (); return FILE_CONT; @@ -273,6 +281,7 @@ file_progress_show_bytes (FileOpContext *ctx, double done, double total) { FileOpContextUI *ui; + double perc; g_return_val_if_fail (ctx != NULL, FILE_CONT); @@ -285,11 +294,9 @@ if (ui->aborting) return FILE_ABORT; - if (total == 0.0) - gtk_progress_bar_update (GTK_PROGRESS_BAR (ui->byte_prog), 0.0); - else - gtk_progress_bar_update (GTK_PROGRESS_BAR (ui->byte_prog), - (gfloat) done/(gfloat) total); + perc = done / total; + gtk_progress_bar_update (GTK_PROGRESS_BAR (ui->byte_prog), CLAMP (perc, 0.0, 1.0)); + while (gtk_events_pending ()) gtk_main_iteration (); return FILE_CONT; @@ -927,4 +934,112 @@ fmd_init_i18n (int force) { /* unneccessary func */ +} + +/* Callback for the gnome_request_dialog() in the input dialog */ +static void +input_dialog_cb (gchar *string, gpointer data) +{ + char **s; + + s = data; + *s = string; + + gtk_main_quit (); +} + +/* Our implementation of the general-purpose input dialog */ +char * +real_input_dialog_help (char *header, char *text, char *help, char *def_text) +{ + int is_password; + GtkWidget *dialog; + char *string; + + if (strncmp (text, _("Password:"), strlen (_("Password"))) == 0) + is_password = TRUE; + else + is_password = FALSE; + + dialog = gnome_request_dialog (is_password, text, def_text, 0, + input_dialog_cb, &string, + NULL); + gtk_window_set_title (GTK_WINDOW (dialog), header); + gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); + gtk_main (); + return string; +} + +/* Our implementation of the symlink-to dialog */ +void +symlink_dialog (char *existing, char *new, char **ret_existing, char **ret_new) +{ + GtkWidget *dialog; + GtkWidget *vbox; + GtkWidget *w; + GtkWidget *entry1, *entry2; + WPanel *panel; + int ret; + + g_return_if_fail (existing != NULL); + g_return_if_fail (new != NULL); + g_return_if_fail (ret_existing != NULL); + g_return_if_fail (ret_new != NULL); + + /* Create the dialog */ + + dialog = gnome_dialog_new (_("Symbolic Link"), + GNOME_STOCK_BUTTON_OK, + GNOME_STOCK_BUTTON_CANCEL, + NULL); + gnome_dialog_close_hides (GNOME_DIALOG (dialog), TRUE); + gnome_dialog_set_default (GNOME_DIALOG (dialog), 0); + + panel = cpanel; + if (!is_a_desktop_panel (panel)) + gnome_dialog_set_parent (GNOME_DIALOG (dialog), panel->xwindow); + + /* File symlink will point to */ + + vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL); + gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), vbox, FALSE, FALSE, 0); + + w = gtk_label_new (_("Existing filename (filename symlink will point to):")); + gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0); + + entry1 = gtk_entry_new (); + gtk_entry_set_text (GTK_ENTRY (entry1), existing); + gtk_box_pack_start (GTK_BOX (vbox), entry1, FALSE, FALSE, 0); + gnome_dialog_editable_enters (GNOME_DIALOG (dialog), GTK_EDITABLE (entry1)); + + /* Name of symlink */ + + vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL); + gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), vbox, FALSE, FALSE, 0); + + w = gtk_label_new (_("Symbolic link filename:")); + gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0); + + entry2 = gtk_entry_new (); + gtk_entry_set_text (GTK_ENTRY (entry2), new); + gtk_box_pack_start (GTK_BOX (vbox), entry2, FALSE, FALSE, 0); + gnome_dialog_editable_enters (GNOME_DIALOG (dialog), GTK_EDITABLE (entry2)); + gtk_widget_grab_focus (entry2); + + /* Run */ + + gtk_widget_show_all (GNOME_DIALOG (dialog)->vbox); + ret = gnome_dialog_run (GNOME_DIALOG (dialog)); + + if (ret != 0) { + *ret_existing = NULL; + *ret_new = NULL; + } else { + *ret_existing = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry1))); + *ret_new = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry2))); + } + + gtk_widget_destroy (dialog); } diff -ruN old/mc-4.5.26/gnome/gicon.c new/mc-4.5.27/gnome/gicon.c --- old/mc-4.5.26/gnome/gicon.c Sun Mar 14 19:19:37 1999 +++ new/mc-4.5.27/gnome/gicon.c Thu Mar 18 20:42:31 1999 @@ -141,7 +141,7 @@ /* Insert the icon information into the hash tables */ - g_hash_table_insert (name_hash, (char *) filename, iset); + g_hash_table_insert (name_hash, iset->filename, iset); g_hash_table_insert (image_hash, iset->plain, iset); return iset; diff -ruN old/mc-4.5.26/gnome/gnome-file-property-dialog.c new/mc-4.5.27/gnome/gnome-file-property-dialog.c --- old/mc-4.5.26/gnome/gnome-file-property-dialog.c Sun Mar 14 19:19:38 1999 +++ new/mc-4.5.27/gnome/gnome-file-property-dialog.c Thu Mar 18 20:42:31 1999 @@ -113,8 +113,6 @@ if (gfpd->file_name) g_free (gfpd->file_name); - if (gfpd->im) - gdk_imlib_destroy_image (gfpd->im); if (gfpd->fm_open) g_free (gfpd->fm_open); if (gfpd->fm_view) @@ -440,14 +438,11 @@ retval = gnome_icon_entry_new ("gmc_file_icon", "Select an Icon"); icon = g_strdup (gicon_get_filename_for_icon (fp_dlg->im)); - if (icon) - return retval; - - if (icon[0]){ + + if (icon == NULL) return retval; - } gnome_icon_entry_set_icon (GNOME_ICON_ENTRY (retval), icon); - fp_dlg->icon_filename = g_strdup (icon); + fp_dlg->icon_filename = icon; return retval; } diff -ruN old/mc-4.5.26/gnome/gnome-open-dialog.c new/mc-4.5.27/gnome/gnome-open-dialog.c --- old/mc-4.5.26/gnome/gnome-open-dialog.c Sun Mar 14 19:19:38 1999 +++ new/mc-4.5.27/gnome/gnome-open-dialog.c Thu Mar 18 20:42:32 1999 @@ -27,6 +27,7 @@ static void gnome_open_dialog_class_init (GnomeOpenDialogClass *klass); static void gnome_open_dialog_destroy (GtkObject *object); static void gnome_open_dialog_generate_tree_helper (GtkCTree *ctree, GtkCTreeNode *parent, GNode *node); +static GSList *get_presorted_from(char *dir); static void gnome_open_dialog_destroy_func (GtkCTree *ctree, GtkCTreeNode *node, gpointer data); static GnomeDialogClass *parent_class = NULL; @@ -102,6 +103,83 @@ } /* Private internal functions */ +/* this will help order our tree */ +static gchar * +strip_name_from_gde (GnomeDesktopEntry *gde, + gboolean fname) +{ + gchar *retval = NULL; + gchar *ptr; + + if (gde == NULL) + return NULL; + if (!fname) + return (g_strdup (gde->name)); + + if (strcmp (x_basename (gde->location), ".directory")) { + return g_strdup (x_basename(gde->location)); + } + + ptr = strrchr (gde->location, '/'); + if (ptr) + ptr--; + while (ptr && ptr != gde->location && *ptr != '/') { + ptr--; + } + if (ptr) { + retval = g_strdup (ptr +1); + ptr = strrchr (retval, '/'); + if (ptr) + ptr[0] = '\000'; + } + return retval; +} +static void +insert_node_custom (GSList *order, + GNode *sorted_list, + GNode *node, + gchar *name) +{ + /* This little insertion sort is pretty ugly, but I guess + * it works. It'd be good to move this information into + * Gnome-libs, somewhere... + */ + GNode *temp_node; + gchar *fname; + gchar *fname2; + + g_return_if_fail (sorted_list != NULL); + + temp_node = sorted_list->children; + while (order) { + if (!strcmp ((gchar *) order->data, x_basename (name))) { + if (temp_node) + g_node_insert_before (sorted_list, temp_node, node); + else + g_node_append (sorted_list, node); + return; + } + if (temp_node) { + fname = strip_name_from_gde ((GnomeDesktopEntry *) temp_node->data, TRUE); + if (fname && !strcmp (fname, (gchar *) order->data)) { + temp_node = temp_node->next; + } + g_free (fname); + } + order = order->next; + } + fname2 = strip_name_from_gde (node->data, FALSE); + for (;temp_node;temp_node = temp_node->next) { + fname = strip_name_from_gde (temp_node->data, FALSE); + if (fname && fname2 && strcmp (fname2, fname) < 0) { + g_node_insert_before (sorted_list, temp_node, node); + return; + } + g_free (fname); + } + g_free (fname2); + g_node_append (sorted_list, node); +} /* Stolen from gnomecc:tree.c */ static GNode * read_directory (gchar *directory) @@ -109,13 +187,16 @@ DIR *parent_dir; struct dirent *child_dir; struct stat filedata; + GSList *order; GNode *retval = g_node_new(NULL); - + GNode *new_node; + parent_dir = opendir (directory); if (parent_dir == NULL) return NULL; - + order = get_presorted_from (directory); while ((child_dir = readdir (parent_dir)) != NULL) { + new_node = NULL; if (child_dir->d_name[0] != '.') { /* we check to see if it is interesting. */ @@ -127,37 +208,32 @@ gchar* test; if (S_ISDIR (filedata.st_mode)) { /* it might be interesting... */ - GNode *next_dir = read_directory (name->str); - if (next_dir) + new_node = read_directory (name->str); + if (new_node) /* it is interesting!!! */ - g_node_prepend (retval, next_dir); + insert_node_custom (order, retval, new_node, name->str); +/* g_node_prepend (retval, new_node);*/ } - test = rindex(child_dir->d_name, '.'); + test = strrchr(child_dir->d_name, '.'); if (test && !strcmp (".desktop", test)) { /* it's a .desktop file -- it's interesting for sure! */ - GNode *new_node = g_node_new (gnome_desktop_entry_load (name->str)); - g_node_prepend (retval, new_node); + new_node = g_node_new (gnome_desktop_entry_load (name->str)); + insert_node_custom (order, retval, new_node, name->str); +/* g_node_prepend (retval, new_node);*/ } } g_string_free (name, TRUE); - } - else if (!strcmp (child_dir->d_name, ".directory")) { + } else if (!strcmp (child_dir->d_name, ".directory")) { GString *name = g_string_new (directory); g_string_append (name, "/.directory"); retval->data = gnome_desktop_entry_load (name->str); g_string_free (name, TRUE); } } -#if 0 - if (!retval->data) { - /* no .directory file. Well, I guess we abort. */ - /* FIXME: i guess we should free memory now... */ - return NULL; - } -#endif if (retval->children == NULL) { if (retval->data) gnome_desktop_entry_free (retval->data); + g_node_destroy (retval); return NULL; } return retval; @@ -213,6 +289,29 @@ */ } } + +/* Stolen from gnome-core/panel/menu.c */ +static GSList * +get_presorted_from(char *dir) +{ + char buf[PATH_MAX+1]; + GSList *list = NULL; + char *fname = g_concat_dir_and_file(dir,".order"); + FILE *fp = fopen(fname,"r"); + + if(!fp) { + g_free(fname); + return NULL; + } + while(fgets(buf,PATH_MAX+1,fp)!=NULL) { + char *p = strchr(buf,'\n'); + if(p) *p = '\0'; + list = g_slist_prepend(list,g_strdup(buf)); + } + fclose(fp); + g_free(fname); + return g_slist_reverse(list); +} static void gnome_open_dialog_selected_row_callback (GtkWidget *widget, GtkCTreeNode *node, gint column, gpointer *data) { @@ -293,7 +392,6 @@ /* Watch me do something evil... (-: */ label_string = gnome_unconditional_libdir_file (""); strcpy (label_string + strlen (label_string) - 4, "bin"); - g_print ("%s\n", label_string); gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (dialog->entry), label_string); diff -ruN old/mc-4.5.26/gnome/gpopup.c new/mc-4.5.27/gnome/gpopup.c --- old/mc-4.5.26/gnome/gpopup.c Sun Mar 14 19:19:38 1999 +++ new/mc-4.5.27/gnome/gpopup.c Wed Dec 31 19:00:00 1969 @@ -1,642 +0,0 @@ -/* Popup menus for the Midnight Commander - * - * Copyright (C) 1998 The Free Software Foundation - * - * Authors: Federico Mena - * Miguel de Icaza - */ - - -#include -#include "global.h" -#include -#include "panel.h" -#include "cmd.h" -#include "dialog.h" -#include "ext.h" -#include "gpageprop.h" -#include "gpopup.h" -#include "main.h" -#include "gnome-file-property-dialog.h" -#define CLIST_FROM_SW(panel_list) GTK_CLIST (GTK_BIN (panel_list)->child) - - -extern int we_can_afford_the_speed; - -/* Flags for the popup menu entries. They specify to which kinds of files an entry is valid for. */ -enum { - F_ALL = 1 << 0, /* Applies to all files */ - F_REGULAR = 1 << 1, /* Applies only to regular files */ - F_SYMLINK = 1 << 2, /* Applies only to symlinks */ - F_SINGLE = 1 << 3, /* Applies only to a single file, not to a multiple selection */ - F_NOTDIR = 1 << 4, /* Applies to non-directories */ - F_DICON = 1 << 5, /* Applies to desktop icons */ - 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_LOCAL = 1 << 10 /* File must be on a local file system */ -}; - -struct action { - char *text; /* Menu item text */ - int flags; /* Flags from the above enum */ - GtkSignalFunc callback; /* Callback for menu item */ -}; - - -static void -panel_action_open_with (GtkWidget *widget, WPanel *panel) -{ - char *command; - - command = input_expand_dialog (_(" Open with..."), - _("Enter extra arguments:"), panel->dir.list [panel->selected].fname); - if (!command) - return; - execute (command); - g_free (command); -} - -static void -panel_action_open (GtkWidget *widget, WPanel *panel) -{ - if (do_enter (panel)) - return; - panel_action_open_with (widget, panel); -} - -static void -panel_action_view (GtkWidget *widget, WPanel *panel) -{ - view_cmd (panel); -} - -static void -panel_action_view_unfiltered (GtkWidget *widget, WPanel *panel) -{ - view_simple_cmd (panel); -} - -static void -panel_action_edit (GtkWidget *widget, WPanel *panel) -{ - char *full = g_concat_dir_and_file (panel->cwd, selection (panel)->fname); - - gmc_edit (full); - g_free (full); -} - -/* Pops up the icon properties pages */ -static void -dicon_properties (GtkWidget *widget, DesktopIconInfo *dii) -{ - int retval = 1; - char *path; - GtkWidget *dlg; - - path = concat_dir_and_file (desktop_directory, dii->filename); -/* retval = item_properties (dii->dicon, path, dii);*/ - dlg = gnome_file_property_dialog_new (path, TRUE); - gtk_widget_show_all (dlg); - if (gnome_dialog_run (GNOME_DIALOG (dlg)) == 0) - retval = gnome_file_property_dialog_make_changes (GNOME_FILE_PROPERTY_DIALOG (dlg)); - - gtk_widget_destroy (dlg); - g_free(path); - - if (retval) - reread_cmd (); -} - -/* Executes a desktop icon */ -static void -dicon_execute (GtkWidget *widget, DesktopIconInfo *dii) -{ - desktop_icon_info_open (dii); -} - -static void -dicon_unmount (GtkWidget *widget, DesktopIconInfo *dii) -{ - char *full = g_concat_dir_and_file (desktop_directory, dii->filename); - - do_mount_umount (full, FALSE); - g_free (full); -} - -static void -dicon_mount (GtkWidget *widget, DesktopIconInfo *dii) -{ - char *full = g_concat_dir_and_file (desktop_directory, dii->filename); - - do_mount_umount (full, TRUE); - g_free (full); -} - -static void -dicon_eject (GtkWidget *widget, DesktopIconInfo *dii) -{ - char *full = g_concat_dir_and_file (desktop_directory, dii->filename); - - do_mount_umount (full, FALSE); - do_eject (full); - g_free (full); -} - -static void -panel_action_properties (GtkWidget *widget, WPanel *panel) -{ - gint retval; - file_entry *fe = &panel->dir.list [panel->selected]; - char *full_name = concat_dir_and_file (panel->cwd, fe->fname); - GtkWidget *dlg; - -/* if (item_properties (GTK_WIDGET (CLIST_FROM_SW (panel->list)), full_name, NULL) != 0) - reread_cmd ();*/ - dlg = gnome_file_property_dialog_new (full_name, we_can_afford_the_speed); - gnome_dialog_set_parent (GNOME_DIALOG (dlg), GTK_WINDOW (panel->xwindow)); - if (gnome_dialog_run (GNOME_DIALOG (dlg)) == 0) - retval = gnome_file_property_dialog_make_changes (GNOME_FILE_PROPERTY_DIALOG (dlg)); - gtk_widget_destroy (dlg); - g_free (full_name); - if (retval) - reread_cmd (); -} - -static void -dicon_move (GtkWidget *widget, DesktopIconInfo *dii) -{ - g_warning ("Implement this function!"); -} - -static void -dicon_copy (GtkWidget *widget, DesktopIconInfo *dii) -{ - g_warning ("Implement this function!"); -} - -static void -dicon_delete (GtkWidget *widget, DesktopIconInfo *dii) -{ - desktop_icon_info_delete (dii); -} - -/* This is our custom signal connection function for popup menu items -- see below for the - * marshaller information. We pass the original callback function as the data pointer for the - * marshaller (uiinfo->moreinfo). - */ -static void -popup_connect_func (GnomeUIInfo *uiinfo, gchar *signal_name, GnomeUIBuilderData *uibdata) -{ - g_assert (uibdata->is_interp); - - if (uiinfo->moreinfo) { - gtk_object_set_data (GTK_OBJECT (uiinfo->widget), "popup_user_data", uiinfo->user_data); - gtk_signal_connect_full (GTK_OBJECT (uiinfo->widget), signal_name, - NULL, - uibdata->relay_func, - uiinfo->moreinfo, - uibdata->destroy_func, - FALSE, - FALSE); - } -} - -/* Our custom marshaller for menu items. We need it so that it can extract the per-attachment - * user_data pointer from the parent menu shell and pass it to the callback. This overrides the - * user-specified data from the GnomeUIInfo structures. - */ - -typedef void (* ActivateFunc) (GtkObject *object, gpointer data); - -static void -popup_marshal_func (GtkObject *object, gpointer data, guint n_args, GtkArg *args) -{ - ActivateFunc func; - gpointer user_data; - - func = (ActivateFunc) data; - user_data = gtk_object_get_data (object, "popup_user_data"); - - gtk_object_set_data (GTK_OBJECT (GTK_WIDGET (object)->parent), "popup_active_item", object); - (* func) (object, user_data); -} - -/* Fills the menu with the specified uiinfo at the specified position, using our magic marshallers - * to be able to fetch the active item. The code is shamelessly ripped from gnome-popup-menu. - */ -static void -fill_menu (GtkMenuShell *menu_shell, GnomeUIInfo *uiinfo, int pos) -{ - GnomeUIBuilderData uibdata; - - /* We use our own callback marshaller so that it can fetch the popup user data - * from the popup menu and pass it on to the user-defined callbacks. - */ - - uibdata.connect_func = popup_connect_func; - uibdata.data = NULL; - uibdata.is_interp = TRUE; - uibdata.relay_func = popup_marshal_func; - uibdata.destroy_func = NULL; - - gnome_app_fill_menu_custom (menu_shell, uiinfo, &uibdata, NULL, FALSE, pos); -} - - -/* The context menu: text displayed, condition that must be met and the routine that gets invoked - * upon activation. - */ -static struct action file_actions[] = { - { N_("Properties"), F_SINGLE | F_PANEL, (GtkSignalFunc) panel_action_properties }, - { N_("Delete"), F_PANEL | F_ALL, (GtkSignalFunc) delete_cmd }, - { N_("Delete"), F_DICON | F_ALL, (GtkSignalFunc) dicon_delete }, - { N_("Properties"), F_SINGLE | F_DICON, (GtkSignalFunc) dicon_properties }, - { N_("Mount device"), F_SINGLE|F_MOUNTABLE|F_DICON, (GtkSignalFunc) dicon_mount }, - { 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_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 }, - { "", 0, NULL }, - { N_("Move/rename..."), F_PANEL | F_ALL, (GtkSignalFunc) ren_cmd }, - { N_("Copy..."), F_PANEL | F_ALL, (GtkSignalFunc) copy_cmd }, - { "", 0, NULL }, - { N_("Link..."), F_PANEL | F_REGULAR | F_SINGLE, (GtkSignalFunc) link_cmd }, - { N_("Symlink..."), F_PANEL | F_SINGLE, (GtkSignalFunc) symlink_cmd }, - { N_("Edit symlink..."), F_PANEL | F_SYMLINK, (GtkSignalFunc) edit_symlink_cmd }, - { NULL, 0, NULL }, -}; - - -/* Creates the menu items for the standard actions. Returns the position at which additional menu - * items should be inserted. - */ -static int -create_actions (GtkWidget *menu, WPanel *panel, - DesktopIconInfo *dii, - int panel_row, char *filename) -{ - gpointer closure; - struct action *action; - int pos; - GnomeUIInfo uiinfo[] = { - { 0 }, - GNOMEUIINFO_END - }; - - closure = panel ? (gpointer) panel : (gpointer) dii; - - pos = 0; - - for (action = file_actions; action->text; action++) { - /* First, try F_PANEL and F_DICON flags */ - - if (!panel && (action->flags & F_PANEL)) - continue; - - if (!dii && (action->flags & F_DICON)) - continue; - - /* Items with F_ALL bypass any other condition */ - - if (!(action->flags & F_ALL)) { - /* Items with F_SINGLE require that ONLY ONE marked files exist */ - - if (panel && (action->flags & F_SINGLE)) - if (panel->marked > 1) - continue; - - /* Items with F_NOTDIR requiere that the selection is not a directory */ - - if (panel && (action->flags & F_NOTDIR)) { - struct stat *s = &panel->dir.list[panel_row].buf; - - if (panel->dir.list [panel_row].f.link_to_dir) - continue; - - if (S_ISDIR (s->st_mode)) - continue; - } - - /* Items with F_REGULAR do not accept any strange file types */ - - if (panel && (action->flags & F_REGULAR)) { - struct stat *s = &panel->dir.list[panel_row].buf; - - if (S_ISLNK (s->st_mode) && panel->dir.list[panel_row].f.link_to_dir) - continue; - - if (S_ISSOCK (s->st_mode) || S_ISCHR (s->st_mode) || - S_ISFIFO (s->st_mode) || S_ISBLK (s->st_mode)) - continue; - } - - /* Items with F_SYMLINK only operate on symbolic links */ - - if (panel && action->flags & F_SYMLINK) { - struct stat *s = &panel->dir.list[panel_row].buf; - - if (!S_ISLNK (s->st_mode)) - continue; - } - - if (action->flags & (F_MOUNTABLE|F_UNMOUNTABLE)){ - char *fullname; - file_entry *fe; - int v; - int is_mounted; - - fullname = g_concat_dir_and_file (desktop_directory, dii->filename); - fe = file_entry_from_file (fullname); - if (fe){ - v = is_mountable (fullname, fe, &is_mounted, NULL); - file_entry_free (fe); - g_free (fullname); - - if (!v) - continue; - - if (is_mounted && (action->flags & F_MOUNTABLE)) - continue; - - if ((!is_mounted) && (action->flags & F_UNMOUNTABLE)) - continue; - } else { - g_free (fullname); - continue; - } - } - - if (action->flags & (F_EJECTABLE)){ - char *fullname; - file_entry *fe; - int v; - int is_mounted; - - fullname = g_concat_dir_and_file (desktop_directory, dii->filename); - fe = file_entry_from_file (fullname); - if (fe){ - v = is_mountable (fullname, fe, &is_mounted, NULL); - file_entry_free (fe); - - if (!v){ - g_free (fullname); - continue; - } - - if (!is_ejectable (fullname)){ - g_free (fullname); - continue; - } - g_free (fullname); - - } else { - g_free (fullname); - continue; - } - } - - } - - /* Create the appropriate GnomeUIInfo structure for the menu item */ - - if (action->text[0]) { - uiinfo[0].type = GNOME_APP_UI_ITEM; - uiinfo[0].label = _(action->text); - uiinfo[0].hint = NULL; - uiinfo[0].moreinfo = action->callback; - uiinfo[0].user_data = closure; - uiinfo[0].unused_data = NULL; - uiinfo[0].pixmap_type = GNOME_APP_PIXMAP_NONE; - uiinfo[0].pixmap_info = NULL; - uiinfo[0].accelerator_key = 0; - uiinfo[0].ac_mods = 0; - uiinfo[0].widget = NULL; - } else - uiinfo[0].type = GNOME_APP_UI_SEPARATOR; - - fill_menu (GTK_MENU_SHELL (menu), uiinfo, pos); - pos++; - } - - return pos; -} - -/* These functions activate a menu popup action for a filename in a hackish way, as they have to - * fetch the action from the menu item's label. - */ - -static char * -get_label_text (GtkMenuItem *item) -{ - GtkWidget *label; - - /* THIS DEPENDS ON THE LATEST GNOME-LIBS! Keep this in sync with gnome-app-helper until we - * figure a way to do this in a non-hackish way. - */ - - label = GTK_BIN (item)->child; - g_assert (label != NULL); - - return GTK_LABEL (label)->label; -} - -static void -mime_command_from_panel (GtkMenuItem *item, WPanel *panel) -{ - char *filename; - char *action; - int movedir; - - /* - * This is broken, but we dont mind. Federico - * needs to explain me what was he intending here. - * panel->selected does not mean, it was the icon - * that got clicked. - */ -} - -static void -mime_command_from_desktop_icon (GtkMenuItem *item, char *filename) -{ - 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, needs_terminal); -} - -/* Create the menu items common to files from panel window and desktop icons, and also the items for - * regexp_command() actions. - */ -static void -create_regexp_actions (GtkWidget *menu, WPanel *panel, - DesktopIconInfo *dii, - int panel_row, char *filename, int insert_pos) -{ - gpointer closure, regex_closure; - int i; - GtkSignalFunc regex_callback; - const char *mime_type; - GList *keys, *l; - GnomeUIInfo uiinfo[] = { - { 0 }, - GNOMEUIINFO_END - }; - - regex_callback = mime_command_from_desktop_icon; - if (panel) { - closure = panel; - regex_closure = filename; - } else { - closure = dii; - regex_closure = filename; - } - - /* Fill in the regex command part */ - - mime_type = gnome_mime_type_or_default (filename, NULL); - if (!mime_type) - return; - - keys = gnome_mime_get_keys (mime_type); - - for (l = keys; l; l = l->next) { - char *key = l->data; - char *str; - - str = key; - if (strncmp (key, "open.", 5) != 0) - continue; - - str += 5; - while (*str && *str != '.') - str++; - - if (*str) - str++; - - if (!*str) - continue; - - /* Create the item for that entry */ - - uiinfo[0].type = GNOME_APP_UI_ITEM; - uiinfo[0].label = str; - uiinfo[0].hint = NULL; - uiinfo[0].moreinfo = regex_callback; - uiinfo[0].user_data = regex_closure; - uiinfo[0].unused_data = NULL; - uiinfo[0].pixmap_type = GNOME_APP_PIXMAP_NONE; - uiinfo[0].pixmap_info = NULL; - uiinfo[0].accelerator_key = 0; - uiinfo[0].ac_mods = 0; - uiinfo[0].widget = NULL; - - fill_menu (GTK_MENU_SHELL (menu), uiinfo, insert_pos++); - gtk_object_set_user_data (GTK_OBJECT (uiinfo [0].widget), key); - } - g_list_free (keys); -} - -/* Convenience callback to exit the main loop of a modal popup menu when it is deactivated*/ -static void -menu_shell_deactivated (GtkMenuShell *menu_shell, gpointer data) -{ - gtk_main_quit (); -} - -/* Returns the index of the active item in the specified menu, or -1 if none is active */ -static int -get_active_index (GtkMenu *menu) -{ - GList *l; - GtkWidget *active; - int i; - - active = gtk_object_get_data (GTK_OBJECT (menu), "popup_active_item"); - - for (i = 0, l = GTK_MENU_SHELL (menu)->children; l; l = l->next, i++) - if (active == l->data) - return i; - - return -1; -} - -/* - * Create a context menu - * It can take either a WPanel or a GnomeDesktopEntry. One of them should - * be set to NULL. - */ -int -gpopup_do_popup (GdkEventButton *event, WPanel *from_panel, - DesktopIconInfo *dii, - int panel_row, char *filename) -{ - GtkWidget *menu; - int pos; - guint id; - - g_return_val_if_fail (event != NULL, -1); - g_return_val_if_fail (from_panel != NULL || dii != NULL || filename != NULL, -1); - - menu = gtk_menu_new (); - - /* Connect to the deactivation signal to be able to quit our - modal main loop */ - id = gtk_signal_connect (GTK_OBJECT (menu), "deactivate", - (GtkSignalFunc) menu_shell_deactivated, - NULL); - - /* Fill the menu */ - - pos = create_actions (menu, from_panel, dii, - panel_row, filename); - create_regexp_actions (menu, from_panel, dii, - panel_row, filename, pos); - - /* Run it */ - - gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event->button, event->time); - gtk_grab_add (menu); - gtk_main (); - gtk_grab_remove (menu); - - gtk_signal_disconnect (GTK_OBJECT (menu), id); - - return get_active_index (GTK_MENU (menu)); -} - - - - diff -ruN old/mc-4.5.26/gnome/gpopup.h new/mc-4.5.27/gnome/gpopup.h --- old/mc-4.5.26/gnome/gpopup.h Sun Mar 14 19:19:38 1999 +++ new/mc-4.5.27/gnome/gpopup.h Thu Mar 18 20:42:32 1999 @@ -16,9 +16,11 @@ int gpopup_do_popup2 (GdkEventButton *event, WPanel *panel, DesktopIconInfo *dii); +#if 0 int gpopup_do_popup (GdkEventButton *event, WPanel *from_panel, DesktopIconInfo *dii, int panel_row, char *filename); +#endif #endif diff -ruN old/mc-4.5.26/gnome/gscreen.c new/mc-4.5.27/gnome/gscreen.c --- old/mc-4.5.26/gnome/gscreen.c Sun Mar 14 19:19:38 1999 +++ new/mc-4.5.27/gnome/gscreen.c Thu Mar 18 20:42:32 1999 @@ -321,7 +321,6 @@ if (gnome_icon_list_icon_is_visible (list, panel->selected) != GTK_VISIBILITY_FULL) gnome_icon_list_moveto (list, panel->selected, 0.5); } - gnome_canvas_update_now (GNOME_CANVAS (list)); } else { GtkCList *clist = CLIST_FROM_SW (panel->list); diff -ruN old/mc-4.5.26/mc.spec new/mc-4.5.27/mc.spec --- old/mc-4.5.26/mc.spec Sun Mar 14 19:19:25 1999 +++ new/mc-4.5.27/mc.spec Thu Mar 18 20:42:26 1999 @@ -1,5 +1,5 @@ # Note that this is NOT a relocatable package -%define ver 4.5.26 +%define ver 4.5.27 %define rel 1 %define prefix /usr diff -ruN old/mc-4.5.26/mc.spec.in new/mc-4.5.27/mc.spec.in --- old/mc-4.5.26/mc.spec.in Wed Dec 31 19:00:00 1969 +++ new/mc-4.5.27/mc.spec.in Thu Mar 18 20:42:26 1999 @@ -0,0 +1,244 @@ +# Note that this is NOT a relocatable package +%define ver @VERSION@ +%define rel 1 +%define prefix /usr + +Summary: Midnight Commander visual shell +Name: mc +Version: %ver +Release: %rel +Copyright: GPL +Group: Shells +Source0: ftp://ftp.nuclecu.unam.mx/linux/local/devel/mc-%{PACKAGE_VERSION}.tar.gz +URL: http://www.gnome.org/mc/ +BuildRoot: /var/tmp/mc-%{PACKAGE_VERSION}-root +Requires: pam >= 0.59 +Prereq: /sbin/chkconfig + +%description +Midnight Commander is a visual shell much like a file manager, only with way +more features. It is text mode, but also includes mouse support if you are +running GPM. Its coolest feature is the ability to ftp, view tar, zip +files, and poke into RPMs for specific files. :-) + +%package -n gmc +Summary: Midnight Commander visual shell (GNOME version) +Requires: mc >= %{PACKAGE_VERSION} +Group: X11/Shells +%description -n gmc +Midnight Commander is a visual shell much like a file manager, only with +way more features. This is the GNOME version. It's coolest feature is the +ability to ftp, view tar, zip files and poke into RPMs for specific files. +The GNOME version of Midnight Commander is not yet finished though. :-( + +%package -n mcserv +Summary: Midnight Commander file server +Group: X11/Shells +Requires: portmap +%description -n mcserv +mcserv is the server program for the Midnight Commander networking file +system. It provides access to the host file system to clients running the +Midnight file system (currently, only the Midnight Commander file manager). + +%prep +%setup + +%build +CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \ + --prefix=%{prefix} \ + --with-gnome \ + --without-debug \ + --sysconfdir=/etc + +if [ "$SMP" != "" ]; then + (make "MAKE=make -k -j $SMP"; exit 0) + make +else + make +fi + +%install +echo $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,profile.d,X11/wmconfig} + +mkdir -p $RPM_BUILD_ROOT/etc/CORBA/servers + +make prefix=$RPM_BUILD_ROOT%{prefix} install +(cd icons; make prefix=$RPM_BUILD_ROOT%{prefix} install_icons) +install lib/mcserv.init $RPM_BUILD_ROOT/etc/rc.d/init.d/mcserv + +install lib/mcserv.pamd $RPM_BUILD_ROOT/etc/pam.d/mcserv +install lib/{mc.sh,mc.csh} $RPM_BUILD_ROOT/etc/profile.d + +#musta's kludge +install gnome/gmc.gnorba $RPM_BUILD_ROOT/etc/CORBA/servers/gmc.gnorba + + +# clean up this setuid problem for now +chmod 755 $RPM_BUILD_ROOT/usr/lib/mc/bin/cons.saver + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -n mcserv +/sbin/chkconfig --add mcserv + +%postun -n mcserv +/sbin/chkconfig --del mcserv + +%files +%defattr(-, root, root) + +%doc FAQ COPYING NEWS README +%{prefix}/bin/mc +%{prefix}/bin/mcedit +%{prefix}/bin/mcmfmt +%{prefix}/lib/mc/mc.ext +%{prefix}/lib/mc/mc.hint +%{prefix}/lib/mc/mc.hlp +%{prefix}/lib/mc/mc.lib +%{prefix}/lib/mc/mc.menu +%{prefix}/lib/mc/bin/cons.saver +%{prefix}/lib/mc/extfs/* +%{prefix}/man/man1/* +%config /etc/profile.d/* +%dir %{prefix}/lib/mc +%dir %{prefix}/lib/mc/bin + +%files -n mcserv +%defattr(-, root, root) + +%config /etc/pam.d/mcserv +%config /etc/rc.d/init.d/mcserv +%attr(-, root, man) %{prefix}/man/man8/mcserv.8 +%{prefix}/bin/mcserv + +%files -n gmc +%defattr(-, root, root) +%{prefix}/bin/gmc +%{prefix}/bin/plain-gmc +%{prefix}/lib/mc/layout +%{prefix}/lib/mc/mc-gnome.ext +%{prefix}/share/pixmaps/mc/* +%{prefix}/share/mime-info/mc.keys +%config %{prefix}/../etc/CORBA/servers/gmc.gnorba + +%changelog +* Thu Aug 20 1998 Michael Fulbright +- rebuilt against gnome-libs 0.27 and gtk+-1.1 + +* Thu Jul 09 1998 Michael Fulbright +- made cons.saver not setuid + +* Sun Apr 19 1998 Marc Ewing +- removed tkmc + +* Wed Apr 8 1998 Marc Ewing +- add /usr/lib/mc/layout to gmc + +* Tue Dec 23 1997 Tomasz K這czko +- added --without-debug to configure, +- modification in %build and %install and cosmetic modification in packages + headers, +- added %%{PACKAGE_VERSION} macro to Buildroot, +- removed "rm -rf $RPM_BUILD_ROOT" from %prep. +- removed Packager field. + +* Thu Dec 18 1997 Michele Marziani +- Merged spec file with that from RedHat-5.0 distribution + (now a Hurricane-based distribution is needed) +- Added patch for RPM script (didn't always work with rpm-2.4.10) +- Corrected patch for mcserv init file (chkconfig init levels) +- Added more documentation files on termcap, terminfo, xterm + +* Thu Oct 30 1997 Michael K. Johnson + +- Added dependency on portmap + +* Wed Oct 29 1997 Michael K. Johnson + +- fixed spec file. +- Updated to 4.1.8 + +* Sun Oct 26 1997 Tomasz K這czko + +- updated to 4.1.6 +- added %attr macros in %files, +- a few simplification in %install, +- removed glibc patch, +- fixed installing /etc/X11/wmconfig/tkmc. + +* Thu Oct 23 1997 Michael K. Johnson + +- updated to 4.1.5 +- added wmconfig + +* Wed Oct 15 1997 Erik Troan + +- chkconfig is for mcserv package, not mc one + +* Tue Oct 14 1997 Erik Troan + +- patched init script for chkconfig +- don't turn on the service by default + +* Fri Oct 10 1997 Michael K. Johnson + +- Converted to new PAM conventions. +- Updated to 4.1.3 +- No longer needs glibc patch. + +* Thu May 22 1997 Michele Marziani + +- added support for mc alias in /etc/profile.d/mc.csh (for csh and tcsh) +- lowered number of SysV init scripts in /etc/rc.d/rc[0,1,6].d + (mcserv needs to be killed before inet) +- removed all references to $RPM_SOURCE_DIR +- restored $RPM_OPT_FLAGS when compiling +- minor cleanup of spec file: redundant directives and comments removed + +* Sun May 18 1997 Michele Marziani + +- removed all references to non-existent mc.rpmfs +- added mcedit.1 to the %files section +- reverted to un-gzipped man pages (RedHat style) +- removed double install line for mcserv.pamd + +* Tue May 13 1997 Tomasz K這czko + +- added new rpmfs script, +- removed mcfn_install from mc (adding mc() to bash enviroment is in + /etc/profile.d/mc.sh), +- /etc/profile.d/mc.sh changed to %config, +- removed /usr/lib/mc/bin/create_vcs, +- removed /usr/lib/mc/term. + +* Wed May 9 1997 Tomasz K這czko + +- changed source url, +- fixed link mcedit to mc, + +* Tue May 7 1997 Tomasz K這czko + +- new version 3.5.27, +- %dir /usr/lib/mc/icons and icons removed from tkmc, +- added commented xmc part. + +* Tue Apr 22 1997 Tomasz K這czko + +- FIX spec: + - added URL field, + - in mc added missing /usr/lib/mc/mc.ext, /usr/lib/mc/mc.hint, + /usr/lib/mc/mc.hlp, /usr/lib/mc/mc.lib, /usr/lib/mc/mc.menu. + +* Fri Apr 18 1997 Tomasz K這czko + +- added making packages: tkmc, mcserv (xmc not work yet), +- gziped man pages, +- added /etc/pamd.d/mcserv PAM config file. +- added instaling icons, +- added /etc/profile.d/mc.sh, +- in %doc added NEWS README, +- removed /usr/lib/mc/FAQ, +- added mcserv.init script for mcserv (start/stop on level 86). diff -ruN old/mc-4.5.26/po/POTFILES.in new/mc-4.5.27/po/POTFILES.in --- old/mc-4.5.26/po/POTFILES.in Sun Mar 14 19:19:41 1999 +++ new/mc-4.5.27/po/POTFILES.in Thu Mar 18 20:42:35 1999 @@ -1,11 +1,14 @@ edit/edit_key_translator.c gnome/gcmd.c +gnome/gcustom-layout.c gnome/gdesktop.c gnome/gdialogs.c gnome/gdnd.c gnome/gicon.c gnome/glayout.c -gnome/gpopup.c +gnome/gnome-file-property-dialog.c +gnome/gnome-open-dialog.c +gnome/gpopup2.c gnome/gprefs.c gnome/gprop.c gnome/gscreen.c diff -ruN old/mc-4.5.26/po/cat-id-tbl.c new/mc-4.5.27/po/cat-id-tbl.c --- old/mc-4.5.26/po/cat-id-tbl.c Sun Mar 14 19:19:46 1999 +++ new/mc-4.5.27/po/cat-id-tbl.c Thu Mar 18 20:42:36 1999 @@ -108,338 +108,343 @@ {"File ", 88}, {" is ", 89}, {" Done.", 90}, - {"_Move here", 91}, - {"_Copy here", 92}, - {"_Link here", 93}, - {"Cancel drag", 94}, + {"Password:", 91}, + {"Password", 92}, + {"Symbolic Link", 93}, + {"Existing filename (filename symlink will point to):", 94}, + {"Symbolic link filename:", 95}, + {"_Move here", 96}, + {"_Copy here", 97}, + {"_Link here", 98}, + {"Cancel drag", 99}, {"\ Could not stat %s\n\ -%s", 95}, - {"Default set of icons not found, please check your installation", 96}, - {"_Icon View", 97}, - {"Switch view to an icon display", 98}, - {"_Brief View", 99}, - {"Switch view to show just file name and type", 100}, - {"_Detailed View", 101}, - {"Switch view to show detailed file statistics", 102}, - {"_Custom View", 103}, - {"Switch view to show user-defined statistics", 104}, - {"Icons", 105}, - {"Brief", 106}, - {"Detailed", 107}, - {"Custom", 108}, - {"Enter command to run", 109}, +%s", 100}, + {"Default set of icons not found, please check your installation", 101}, + {"_Icon View", 102}, + {"Switch view to an icon display", 103}, + {"_Brief View", 104}, + {"Switch view to show just file name and type", 105}, + {"_Detailed View", 106}, + {"Switch view to show detailed file statistics", 107}, + {"_Custom View", 108}, + {"Switch view to show user-defined statistics", 109}, + {"Icons", 110}, + {"Brief", 111}, + {"Detailed", 112}, + {"Custom", 113}, + {"Enter command to run", 114}, {"\ 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 exit?", 110}, +Are you sure you want to exit?", 115}, {"\ 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.", 111}, - {"_Copy...", 112}, - {"Copy files", 113}, - {"_Delete...", 114}, - {"Delete files", 115}, - {"_Move...", 116}, - {"Rename or move files", 117}, - {"Show directory sizes", 118}, - {"Shows the disk space used by each directory", 119}, - {"Select _All", 120}, - {"Select all files in the current Panel", 121}, - {"_Select Files...", 122}, - {"Select a group of files", 123}, - {"_Invert Selection", 124}, - {"Reverses the list of tagged files", 125}, - {"_Rescan Directory", 126}, - {"Rescan the directory contents", 127}, - {"_Sort By...", 128}, - {"Confirmation settings", 129}, - {"_Filter View...", 130}, - {"Global option settings", 131}, - {"_Find File...", 132}, - {"Locate files on disk", 133}, - {"_Run Command...", 134}, - {"Runs a command", 135}, - {"_Run Command in panel...", 136}, - {"Run a command and put the results in a panel", 137}, - {"_Background jobs...", 138}, - {"List of background operations", 139}, - {"Exit", 140}, - {"Terminates the file manager and the desktop", 141}, - {"Rescan System Devices", 142}, - {"_Layout", 143}, - {"_Commands", 144}, - {"_Desktop", 145}, - {"_Help", 146}, - {"File/New/Directory...", 147}, - {"Properties", 148}, - {"Delete", 149}, - {"Mount device", 150}, - {"Unmount device", 151}, - {"Eject device", 152}, - {"Open", 153}, - {"Open with", 154}, - {"View", 155}, - {"View unfiltered", 156}, - {"Edit", 157}, - {"Move/rename...", 158}, - {"Copy...", 159}, - {"Link...", 160}, - {"Symlink...", 161}, - {"Edit symlink...", 162}, - {"Show backup files", 163}, - {"Show hidden files", 164}, - {"Mix files and directories", 165}, - {"Use shell patterns instead of regular expressions", 166}, - {"Confirm when deleting file", 167}, - {"Confirm when overwriting files", 168}, - {"Confirm when executing files", 169}, - {"Show progress while operations are being performed", 170}, - {"VFS Timeout:", 171}, - {"Seconds", 172}, - {"Anonymous FTP password:", 173}, - {"Always use FTP proxy", 174}, - {"Fast directory reload", 175}, - {"Compute totals before copying files", 176}, - {"FTP directory cache timeout :", 177}, - {"Allow customization of icons in icon view", 178}, - {"File display", 179}, - {"Confirmation", 180}, - {"VFS", 181}, - {"Caching", 182}, - {"Preferences", 183}, - {"Filename", 184}, - {"Full name: ", 185}, - {"Command", 186}, - {"Command:", 187}, - {"Use terminal", 188}, - {"File mode (permissions)", 189}, - {"Current mode: ", 190}, - {"Read", 191}, - {"Write", 192}, - {"Exec", 193}, - {"Special", 194}, - {"User", 195}, - {"Group", 196}, - {"Other", 197}, - {"Set UID", 198}, - {"Set GID", 199}, - {"Sticky", 200}, - {"", 201}, - {"Owner", 202}, - {"General", 203}, - {"Title", 204}, - {"Icon", 205}, - {"Select icon", 206}, - {"Rescan Directory", 207}, - {"Reloads the current directory", 208}, - {"New folder", 209}, - {"Creates a new folder here", 210}, - {"All files", 211}, - {"Archives and compressed files", 212}, - {"RPM/DEB files", 213}, - {"Text/Document files", 214}, - {"HTML and SGML files", 215}, - {"Postscript and PDF files", 216}, - {"Spreadsheet files", 217}, - {"Image files", 218}, - {"Video/animation files", 219}, - {"Audio files", 220}, - {"C program files", 221}, - {"C++ program files", 222}, - {"Objective-C program files", 223}, - {"Scheme program files", 224}, - {"Assembler program files", 225}, - {"Misc. program files", 226}, - {"Font files", 227}, - {"Search: %s", 228}, - {"%s bytes in %d file", 229}, - {"%s bytes in %d files", 230}, - {"", 231}, - {"Filter", 232}, - {"Back", 233}, - {"Go to the previously visited directory", 234}, - {"Up", 235}, - {"Go up a level in the directory heirarchy", 236}, - {"Forward", 237}, - {"Go to the next directory", 238}, - {"Rescan", 239}, - {"Rescan the current directory", 240}, - {"Home", 241}, - {"Go to your home directory", 242}, - {"Location:", 243}, - {"&Ok", 244}, - {"Offset 0x%08x", 245}, - {"Col %d", 246}, - {"%s bytes", 247}, - {"_Goto line", 248}, - {"Jump to a specified line number", 249}, - {"_Monitor file", 250}, - {"Monitor file growing", 251}, - {"Regexp search", 252}, - {"Regular expression search", 253}, - {"_Wrap", 254}, - {"Wrap the text", 255}, - {"_Parsed view", 256}, - {"_Formatted", 257}, - {"_Hex", 258}, - {"_Search", 259}, - {"ok", 260}, - {"cancel", 261}, - {"help", 262}, - {"yes", 263}, - {"no", 264}, - {"exit", 265}, - {"abort", 266}, - {" Error ", 267}, - {" Failed trying to open file for reading: ", 268}, - {" Cannot get size/permissions info on file: ", 269}, - {" Not an ordinary file: ", 270}, - {" File is too large: ", 271}, +Press OK to terminate the application, or cancel to continue using it.", 116}, + {"_Copy...", 117}, + {"Copy files", 118}, + {"_Delete...", 119}, + {"Delete files", 120}, + {"_Move...", 121}, + {"Rename or move files", 122}, + {"Show directory sizes", 123}, + {"Shows the disk space used by each directory", 124}, + {"Select _All", 125}, + {"Select all files in the current Panel", 126}, + {"_Select Files...", 127}, + {"Select a group of files", 128}, + {"_Invert Selection", 129}, + {"Reverses the list of tagged files", 130}, + {"_Rescan Directory", 131}, + {"Rescan the directory contents", 132}, + {"_Sort By...", 133}, + {"Confirmation settings", 134}, + {"_Filter View...", 135}, + {"Global option settings", 136}, + {"_Find File...", 137}, + {"Locate files on disk", 138}, + {"_Run Command...", 139}, + {"Runs a command", 140}, + {"_Run Command in panel...", 141}, + {"Run a command and put the results in a panel", 142}, + {"_Background jobs...", 143}, + {"List of background operations", 144}, + {"Exit", 145}, + {"Terminates the file manager and the desktop", 146}, + {"Rescan System Devices", 147}, + {"_Layout", 148}, + {"_Commands", 149}, + {"_Desktop", 150}, + {"_Help", 151}, + {"File/New/Directory...", 152}, + {"Properties", 153}, + {"Delete", 154}, + {"Mount device", 155}, + {"Unmount device", 156}, + {"Eject device", 157}, + {"Open", 158}, + {"Open with", 159}, + {"View", 160}, + {"View unfiltered", 161}, + {"Edit", 162}, + {"Move/rename...", 163}, + {"Copy...", 164}, + {"Link...", 165}, + {"Symlink...", 166}, + {"Edit symlink...", 167}, + {"Show backup files", 168}, + {"Show hidden files", 169}, + {"Mix files and directories", 170}, + {"Use shell patterns instead of regular expressions", 171}, + {"Confirm when deleting file", 172}, + {"Confirm when overwriting files", 173}, + {"Confirm when executing files", 174}, + {"Show progress while operations are being performed", 175}, + {"VFS Timeout:", 176}, + {"Seconds", 177}, + {"Anonymous FTP password:", 178}, + {"Always use FTP proxy", 179}, + {"Fast directory reload", 180}, + {"Compute totals before copying files", 181}, + {"FTP directory cache timeout :", 182}, + {"Allow customization of icons in icon view", 183}, + {"File display", 184}, + {"Confirmation", 185}, + {"VFS", 186}, + {"Caching", 187}, + {"Preferences", 188}, + {"Filename", 189}, + {"Full name: ", 190}, + {"Command", 191}, + {"Command:", 192}, + {"Use terminal", 193}, + {"File mode (permissions)", 194}, + {"Current mode: ", 195}, + {"Read", 196}, + {"Write", 197}, + {"Exec", 198}, + {"Special", 199}, + {"User", 200}, + {"Group", 201}, + {"Other", 202}, + {"Set UID", 203}, + {"Set GID", 204}, + {"Sticky", 205}, + {"", 206}, + {"Owner", 207}, + {"General", 208}, + {"Title", 209}, + {"Icon", 210}, + {"Select icon", 211}, + {"Rescan Directory", 212}, + {"Reloads the current directory", 213}, + {"New folder", 214}, + {"Creates a new folder here", 215}, + {"All files", 216}, + {"Archives and compressed files", 217}, + {"RPM/DEB files", 218}, + {"Text/Document files", 219}, + {"HTML and SGML files", 220}, + {"Postscript and PDF files", 221}, + {"Spreadsheet files", 222}, + {"Image files", 223}, + {"Video/animation files", 224}, + {"Audio files", 225}, + {"C program files", 226}, + {"C++ program files", 227}, + {"Objective-C program files", 228}, + {"Scheme program files", 229}, + {"Assembler program files", 230}, + {"Misc. program files", 231}, + {"Font files", 232}, + {"Search: %s", 233}, + {"%s bytes in %d file", 234}, + {"%s bytes in %d files", 235}, + {"", 236}, + {"Filter", 237}, + {"Back", 238}, + {"Go to the previously visited directory", 239}, + {"Up", 240}, + {"Go up a level in the directory heirarchy", 241}, + {"Forward", 242}, + {"Go to the next directory", 243}, + {"Rescan", 244}, + {"Rescan the current directory", 245}, + {"Home", 246}, + {"Go to your home directory", 247}, + {"Location:", 248}, + {"&Ok", 249}, + {"Offset 0x%08x", 250}, + {"Col %d", 251}, + {"%s bytes", 252}, + {"_Goto line", 253}, + {"Jump to a specified line number", 254}, + {"_Monitor file", 255}, + {"Monitor file growing", 256}, + {"Regexp search", 257}, + {"Regular expression search", 258}, + {"_Wrap", 259}, + {"Wrap the text", 260}, + {"_Parsed view", 261}, + {"_Formatted", 262}, + {"_Hex", 263}, + {"_Search", 264}, + {"ok", 265}, + {"cancel", 266}, + {"help", 267}, + {"yes", 268}, + {"no", 269}, + {"exit", 270}, + {"abort", 271}, + {" Error ", 272}, + {" Failed trying to open file for reading: ", 273}, + {" Cannot get size/permissions info on file: ", 274}, + {" Not an ordinary file: ", 275}, + {" File is too large: ", 276}, {"\ \n\ - Increase edit.h:MAXBUF and recompile the editor. ", 272}, - {" Error allocating memory ", 273}, - {"Quick save ", 274}, - {"Safe save ", 275}, - {"Do backups -->", 276}, - {"&Cancel", 277}, - {"Extension:", 278}, - {" Edit Save Mode ", 279}, - {" Save As ", 280}, - {" Warning ", 281}, - {" A file already exists with this name. ", 282}, - {"Overwrite", 283}, - {"Cancel", 284}, - {" Save as ", 285}, - {" Error trying to save file. ", 286}, - {" Delete macro ", 287}, - {" Error trying to open temp file ", 288}, - {" Error trying to open macro file ", 289}, - {"key '%d 0': ", 290}, - {" Error trying to overwrite macro file ", 291}, - {" Macro ", 292}, - {" Press the macro's new hotkey: ", 293}, - {" Save macro ", 294}, - {" Delete Macro ", 295}, - {" Load macro ", 296}, - {" Confirm save file? : ", 297}, - {" Save file ", 298}, - {"Save", 299}, + Increase edit.h:MAXBUF and recompile the editor. ", 277}, + {" Error allocating memory ", 278}, + {"Quick save ", 279}, + {"Safe save ", 280}, + {"Do backups -->", 281}, + {"&Cancel", 282}, + {"Extension:", 283}, + {" Edit Save Mode ", 284}, + {" Save As ", 285}, + {" Warning ", 286}, + {" A file already exists with this name. ", 287}, + {"Overwrite", 288}, + {"Cancel", 289}, + {" Save as ", 290}, + {" Error trying to save file. ", 291}, + {" Delete macro ", 292}, + {" Error trying to open temp file ", 293}, + {" Error trying to open macro file ", 294}, + {"key '%d 0': ", 295}, + {" Error trying to overwrite macro file ", 296}, + {" Macro ", 297}, + {" Press the macro's new hotkey: ", 298}, + {" Save macro ", 299}, + {" Delete Macro ", 300}, + {" Load macro ", 301}, + {" Confirm save file? : ", 302}, + {" Save file ", 303}, + {"Save", 304}, {"\ Current text was modified without a file save. \n\ - Continue discards these changes. ", 300}, - {"Continue", 301}, - {" Load ", 302}, - {" Error trying to open file for reading ", 303}, - {" Block is large, you may not be able to undo this action. ", 304}, - {" Continue ", 305}, - {" Cancel ", 306}, - {"al&L", 307}, - {"&Skip", 308}, - {"&Replace", 309}, - {" Replace with: ", 310}, - {" Confirm replace ", 311}, - {"scanf &Expression", 312}, - {"replace &All", 313}, - {"pr&Ompt on replace", 314}, - {"&Backwards", 315}, - {"&Regular expression", 316}, - {"&Whole words only", 317}, - {"case &Sensitive", 318}, - {" Enter replacement argument order eg. 3,2,1,4 ", 319}, - {" Enter replacement string:", 320}, - {" Enter search string:", 321}, - {" Replace ", 322}, - {" Search ", 323}, - {" Enter search text : ", 324}, - {" Enter replace text : ", 325}, - {" Enter argument order : ", 326}, - {"Enter the order of replacement of your scanf format specifiers", 327}, - {" Whole words only ", 328}, - {" Case sensitive ", 329}, - {" Regular expression ", 330}, - {"See the regex man page for how to compose a regular expression", 331}, - {" Backwards ", 332}, - {"Warning: Searching backward can be slow", 333}, - {" Prompt on replace ", 334}, - {"Ask before making each replacement", 335}, - {" Replace all ", 336}, - {" Scanf expression ", 337}, - {"Allows entering of a C format string, see the scanf man page", 338}, - {"Begin search, Enter", 339}, - {"Abort this dialog, Esc", 340}, - {"Replace", 341}, - {"Skip", 342}, - {"Replace all", 343}, - {"\ - Invalid regular expression, or scanf expression with to many conversions ", 344}, - {" Error in replacement format string. ", 345}, - {" %ld replacements made. ", 346}, - {" Search string not found. ", 347}, - {" Quit ", 348}, + Continue discards these changes. ", 305}, + {"Continue", 306}, + {" Load ", 307}, + {" Error trying to open file for reading ", 308}, + {" Block is large, you may not be able to undo this action. ", 309}, + {" Continue ", 310}, + {" Cancel ", 311}, + {"al&L", 312}, + {"&Skip", 313}, + {"&Replace", 314}, + {" Replace with: ", 315}, + {" Confirm replace ", 316}, + {"scanf &Expression", 317}, + {"replace &All", 318}, + {"pr&Ompt on replace", 319}, + {"&Backwards", 320}, + {"&Regular expression", 321}, + {"&Whole words only", 322}, + {"case &Sensitive", 323}, + {" Enter replacement argument order eg. 3,2,1,4 ", 324}, + {" Enter replacement string:", 325}, + {" Enter search string:", 326}, + {" Replace ", 327}, + {" Search ", 328}, + {" Enter search text : ", 329}, + {" Enter replace text : ", 330}, + {" Enter argument order : ", 331}, + {"Enter the order of replacement of your scanf format specifiers", 332}, + {" Whole words only ", 333}, + {" Case sensitive ", 334}, + {" Regular expression ", 335}, + {"See the regex man page for how to compose a regular expression", 336}, + {" Backwards ", 337}, + {"Warning: Searching backward can be slow", 338}, + {" Prompt on replace ", 339}, + {"Ask before making each replacement", 340}, + {" Replace all ", 341}, + {" Scanf expression ", 342}, + {"Allows entering of a C format string, see the scanf man page", 343}, + {"Begin search, Enter", 344}, + {"Abort this dialog, Esc", 345}, + {"Replace", 346}, + {"Skip", 347}, + {"Replace all", 348}, + {"\ + Invalid regular expression, or scanf expression with to many conversions ", 349}, + {" Error in replacement format string. ", 350}, + {" %ld replacements made. ", 351}, + {" Search string not found. ", 352}, + {" Quit ", 353}, {"\ Current text was modified without a file save. \n\ - Save with exit? ", 349}, - {" File was modified, Save with exit? ", 350}, - {"Cancel quit", 351}, - {" &Cancel quit ", 352}, - {" &Yes ", 353}, - {" &No ", 354}, - {" Copy to clipboard ", 355}, - {" Unable to save to file. ", 356}, - {" Cut to clipboard ", 357}, - {" Goto line ", 358}, - {" Enter line: ", 359}, - {" Save Block ", 360}, - {" Insert File ", 361}, - {" Insert file ", 362}, - {" Error trying to insert file. ", 363}, - {" Sort block ", 364}, - {" You must first highlight a block of text. ", 365}, - {" Run Sort ", 366}, - {" Enter sort options (see manpage) separated by whitespace: ", 367}, - {" Sort ", 368}, - {" Error trying to execute sort command ", 369}, - {" Sort returned non-zero: ", 370}, - {" Process block ", 371}, - {" Error trying to stat file ", 372}, - {" Mail ", 373}, - {" Copies to", 374}, - {" Subject", 375}, - {" To", 376}, - {" mail -s -c ", 377}, - {"Intuitive", 378}, - {"Emacs", 379}, - {"None", 380}, - {"Dynamic paragraphing", 381}, - {"Type writer wrap", 382}, - {"Word wrap line length : ", 383}, - {"Tab spacing : ", 384}, - {"synta&X highlighting", 385}, - {"confir&M before saving", 386}, - {"fill tabs with &Spaces", 387}, - {"&Return does autoindent", 388}, - {"&Backspace through tabs", 389}, - {"&Fake half tabs", 390}, - {"Wrap mode", 391}, - {"Key emulation", 392}, - {" Editor options ", 393}, - {"Error initialising editor.\n", 394}, - {"Help", 395}, - {"Mark", 396}, - {"Replac", 397}, - {"Search", 398}, - {"PullDn", 399}, - {"Quit", 400}, - {" Word wrap ", 401}, - {" Enter line length, 0 for off: ", 402}, - {" About ", 403}, + Save with exit? ", 354}, + {" File was modified, Save with exit? ", 355}, + {"Cancel quit", 356}, + {" &Cancel quit ", 357}, + {" &Yes ", 358}, + {" &No ", 359}, + {" Copy to clipboard ", 360}, + {" Unable to save to file. ", 361}, + {" Cut to clipboard ", 362}, + {" Goto line ", 363}, + {" Enter line: ", 364}, + {" Save Block ", 365}, + {" Insert File ", 366}, + {" Insert file ", 367}, + {" Error trying to insert file. ", 368}, + {" Sort block ", 369}, + {" You must first highlight a block of text. ", 370}, + {" Run Sort ", 371}, + {" Enter sort options (see manpage) separated by whitespace: ", 372}, + {" Sort ", 373}, + {" Error trying to execute sort command ", 374}, + {" Sort returned non-zero: ", 375}, + {" Process block ", 376}, + {" Error trying to stat file ", 377}, + {" Mail ", 378}, + {" Copies to", 379}, + {" Subject", 380}, + {" To", 381}, + {" mail -s -c ", 382}, + {"Intuitive", 383}, + {"Emacs", 384}, + {"None", 385}, + {"Dynamic paragraphing", 386}, + {"Type writer wrap", 387}, + {"Word wrap line length : ", 388}, + {"Tab spacing : ", 389}, + {"synta&X highlighting", 390}, + {"confir&M before saving", 391}, + {"fill tabs with &Spaces", 392}, + {"&Return does autoindent", 393}, + {"&Backspace through tabs", 394}, + {"&Fake half tabs", 395}, + {"Wrap mode", 396}, + {"Key emulation", 397}, + {" Editor options ", 398}, + {"Error initialising editor.\n", 399}, + {"Help", 400}, + {"Mark", 401}, + {"Replac", 402}, + {"Search", 403}, + {"PullDn", 404}, + {"Quit", 405}, + {" Word wrap ", 406}, + {" Enter line length, 0 for off: ", 407}, + {" About ", 408}, {"\ \n\ Cooledit v2.1\n\ @@ -447,616 +452,613 @@ Copyright (C) 1996 the Free Software Foundation\n\ \n\ A user friendly text editor written\n\ - for the Midnight Commander.\n", 404}, - {"&Open/load... C-o", 405}, - {"&New C-n", 406}, - {"&Save F2", 407}, - {"save &As... F12", 408}, - {"&Insert file... F15", 409}, - {"copy to &File... C-f", 410}, - {"a&Bout... ", 411}, - {"&Quit F10", 412}, - {"&New C-x k", 413}, - {"copy to &File... ", 414}, - {"&Toggle Mark F3", 415}, - {"&Mark Columns S-F3", 416}, - {"toggle &Ins/overw Ins", 417}, - {"&Copy F5", 418}, - {"&Move F6", 419}, - {"&Delete F8", 420}, - {"&Undo C-u", 421}, - {"&Beginning C-PgUp", 422}, - {"&End C-PgDn", 423}, - {"&Search... F7", 424}, - {"search &Again F17", 425}, - {"&Replace... F4", 426}, - {"&Goto line... M-l", 427}, - {"insert &Literal... C-q", 428}, - {"&Refresh screen C-l", 429}, - {"&Start record macro C-r", 430}, - {"&Finish record macro... C-r", 431}, - {"&Execute macro... C-a, KEY", 432}, - {"delete macr&O... ", 433}, - {"insert &Date/time ", 434}, - {"format p&Aragraph M-p", 435}, - {"'ispell' s&Pell check C-p", 436}, - {"sor&T... M-t", 437}, - {"'indent' &C Formatter F19", 438}, - {"&Mail... ", 439}, - {"&Execute macro... C-x e, KEY", 440}, - {"'ispell' s&Pell check M-$", 441}, - {"&General... ", 442}, - {"&Save mode...", 443}, - {"&Layout...", 444}, - {" File ", 445}, - {" Edit ", 446}, - {" Sear/Repl ", 447}, - {" Command ", 448}, - {" Options ", 449}, - {"Open...\tC-o", 450}, - {"New\tC-n", 451}, - {"Save\tF2", 452}, - {"Save as...\tF12", 453}, - {"Insert file...\tF15", 454}, - {"Copy to file...\tC-f", 455}, - {"Disk operations", 456}, - {"Toggle mark\tF3", 457}, - {"Toggle mark columns\tC-b", 458}, - {"Toggle insert/overwrite\tIns", 459}, - {"Copy block to cursor\tF5", 460}, - {"Move block to cursor\tF6", 461}, - {"Delete block\tF8/C-Del", 462}, - {"Copy block to clipbrd\tC-Ins", 463}, - {"Cut block to clipbrd\tS-Del", 464}, - {"Paste block from clipbrd\tS-Ins", 465}, - {"Selection history\tM-Ins", 466}, - {"Undo\tC-BackSpace", 467}, - {"Manipulating blocks of text", 468}, - {" Srch/Replce ", 469}, - {"Search...\tF7", 470}, - {"Search again\tF17", 471}, - {"Replace...\tF4", 472}, - {"Replace again\tF14", 473}, - {"Search for and replace text", 474}, - {"Goto line...\tM-l", 475}, - {"Start record macro\tC-r", 476}, - {"Finish record macro...\tC-r", 477}, - {"Execute macro...\tC-a, KEY", 478}, - {"Delete macro...\t", 479}, - {"Insert date/time\tC-d", 480}, - {"Format paragraph\tM-p", 481}, - {"Refresh display\tC-l", 482}, - {"Macros and internal commands", 483}, - {"&Dismiss", 484}, - {" Enter file name: ", 485}, - {"The Quick Brown Fox Jumps Over The Lazy Dog", 486}, - {"\ -gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n", 487}, - {"Clear the edit buffer", 488}, - {"Insert File", 489}, - {"Insert text from a file", 490}, - {"Copy to file", 491}, - {"copy a block to a file", 492}, - {"Search/Replace", 493}, - {" Load syntax file ", 494}, - {" File access error ", 495}, - {" Syntax error in file %s on line %d ", 496}, - {"&Set", 497}, - {"S&kip", 498}, - {"Set &all", 499}, - {"owner", 500}, - {"group", 501}, - {"other", 502}, - {"On", 503}, - {"Flag", 504}, - {"Mode", 505}, - {"%6d of %d", 506}, - {" Chown advanced command ", 507}, + for the Midnight Commander.\n", 409}, + {"&Open/load... C-o", 410}, + {"&New C-n", 411}, + {"&Save F2", 412}, + {"save &As... F12", 413}, + {"&Insert file... F15", 414}, + {"copy to &File... C-f", 415}, + {"a&Bout... ", 416}, + {"&Quit F10", 417}, + {"&New C-x k", 418}, + {"copy to &File... ", 419}, + {"&Toggle Mark F3", 420}, + {"&Mark Columns S-F3", 421}, + {"toggle &Ins/overw Ins", 422}, + {"&Copy F5", 423}, + {"&Move F6", 424}, + {"&Delete F8", 425}, + {"&Undo C-u", 426}, + {"&Beginning C-PgUp", 427}, + {"&End C-PgDn", 428}, + {"&Search... F7", 429}, + {"search &Again F17", 430}, + {"&Replace... F4", 431}, + {"&Goto line... M-l", 432}, + {"insert &Literal... C-q", 433}, + {"&Refresh screen C-l", 434}, + {"&Start record macro C-r", 435}, + {"&Finish record macro... C-r", 436}, + {"&Execute macro... C-a, KEY", 437}, + {"delete macr&O... ", 438}, + {"insert &Date/time ", 439}, + {"format p&Aragraph M-p", 440}, + {"'ispell' s&Pell check C-p", 441}, + {"sor&T... M-t", 442}, + {"'indent' &C Formatter F19", 443}, + {"&Mail... ", 444}, + {"&Execute macro... C-x e, KEY", 445}, + {"'ispell' s&Pell check M-$", 446}, + {"&General... ", 447}, + {"&Save mode...", 448}, + {"&Layout...", 449}, + {" File ", 450}, + {" Edit ", 451}, + {" Sear/Repl ", 452}, + {" Command ", 453}, + {" Options ", 454}, + {"Open...\tC-o", 455}, + {"New\tC-n", 456}, + {"Save\tF2", 457}, + {"Save as...\tF12", 458}, + {"Insert file...\tF15", 459}, + {"Copy to file...\tC-f", 460}, + {"Disk operations", 461}, + {"Toggle mark\tF3", 462}, + {"Toggle mark columns\tC-b", 463}, + {"Toggle insert/overwrite\tIns", 464}, + {"Copy block to cursor\tF5", 465}, + {"Move block to cursor\tF6", 466}, + {"Delete block\tF8/C-Del", 467}, + {"Copy block to clipbrd\tC-Ins", 468}, + {"Cut block to clipbrd\tS-Del", 469}, + {"Paste block from clipbrd\tS-Ins", 470}, + {"Selection history\tM-Ins", 471}, + {"Undo\tC-BackSpace", 472}, + {"Manipulating blocks of text", 473}, + {" Srch/Replce ", 474}, + {"Search...\tF7", 475}, + {"Search again\tF17", 476}, + {"Replace...\tF4", 477}, + {"Replace again\tF14", 478}, + {"Search for and replace text", 479}, + {"Goto line...\tM-l", 480}, + {"Start record macro\tC-r", 481}, + {"Finish record macro...\tC-r", 482}, + {"Execute macro...\tC-a, KEY", 483}, + {"Delete macro...\t", 484}, + {"Insert date/time\tC-d", 485}, + {"Format paragraph\tM-p", 486}, + {"Refresh display\tC-l", 487}, + {"Macros and internal commands", 488}, + {"&Dismiss", 489}, + {" Enter file name: ", 490}, + {"The Quick Brown Fox Jumps Over The Lazy Dog", 491}, + {"\ +gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n", 492}, + {"Clear the edit buffer", 493}, + {"Insert File", 494}, + {"Insert text from a file", 495}, + {"Copy to file", 496}, + {"copy a block to a file", 497}, + {"Search/Replace", 498}, + {" Load syntax file ", 499}, + {" File access error ", 500}, + {" Syntax error in file %s on line %d ", 501}, + {"&Set", 502}, + {"S&kip", 503}, + {"Set &all", 504}, + {"owner", 505}, + {"group", 506}, + {"other", 507}, + {"On", 508}, + {"Flag", 509}, + {"Mode", 510}, + {"%6d of %d", 511}, + {" Chown advanced command ", 512}, {"\ Couldn't chmod \"%s\" \n\ - %s ", 508}, + %s ", 513}, {"\ Couldn't chown \"%s\" \n\ - %s ", 509}, - {" Oops... ", 510}, - {" I can't run the Advanced Chown command on an extfs ", 511}, - {" I can't run the Advanced Chown command on a tarfs ", 512}, - {"Background process:", 513}, - {" Background process error ", 514}, - {" Child died unexpectedly ", 515}, - {" Unknown error in child ", 516}, - {" Background protocol error ", 517}, + %s ", 514}, + {" Oops... ", 515}, + {" I can't run the Advanced Chown command on an extfs ", 516}, + {" I can't run the Advanced Chown command on a tarfs ", 517}, + {"Background process:", 518}, + {" Background process error ", 519}, + {" Child died unexpectedly ", 520}, + {" Unknown error in child ", 521}, + {" Background protocol error ", 522}, {"\ Background process sent us a request for more arguments \n\ - than we can handle. \n", 518}, - {" Listing mode ", 519}, - {"&Full file list", 520}, - {"&Brief file list", 521}, - {"&Long file list", 522}, - {"&User defined:", 523}, - {"&Icon view", 524}, - {"user &Mini status", 525}, - {"Listing mode", 526}, - {"&Reverse", 527}, - {"case sensi&tive", 528}, - {"Sort order", 529}, - {" confirm &Exit ", 530}, - {" confirm e&Xecute ", 531}, - {" confirm o&Verwrite ", 532}, - {" confirm &Delete ", 533}, - {" Confirmation ", 534}, - {"Full 8 bits output", 535}, - {"ISO 8859-1", 536}, - {"7 bits", 537}, - {"F&ull 8 bits input", 538}, - {" Display bits ", 539}, - {"&Always use ftp proxy", 540}, - {"sec", 541}, - {"ftpfs directory cache timeout:", 542}, - {"ftp anonymous password:", 543}, - {"Timeout for freeing VFSs:", 544}, - {" Virtual File System Setting ", 545}, - {"Quick cd", 546}, - {"cd", 547}, - {"Symbolic link", 548}, - {"Symbolic link filename:", 549}, - {"Existing filename (filename symlink will point to):", 550}, - {"Running ", 551}, - {"Stopped", 552}, - {"&Stop", 553}, - {"&Resume", 554}, - {"&Kill", 555}, - {"Background Jobs", 556}, - {"execute/search by others", 557}, - {"write by others", 558}, - {"read by others", 559}, - {"execute/search by group", 560}, - {"write by group", 561}, - {"read by group", 562}, - {"execute/search by owner", 563}, - {"write by owner", 564}, - {"read by owner", 565}, - {"sticky bit", 566}, - {"set group ID on execution", 567}, - {"set user ID on execution", 568}, - {"C&lear marked", 569}, - {"S&et marked", 570}, - {"&Marked all", 571}, - {"Permissions (Octal)", 572}, - {"Owner name", 573}, - {"Group name", 574}, - {" Chmod command ", 575}, - {" Permission ", 576}, - {"Use SPACE to change", 577}, - {"an option, ARROW KEYS", 578}, - {"to move between options", 579}, - {"and T or INS to mark", 580}, - {"Chmod command", 581}, - {" I can't run the Chmod command on an extfs ", 582}, - {"Set &users", 583}, - {"Set &groups", 584}, - {" Name ", 585}, - {" Owner name ", 586}, - {" Group name ", 587}, - {" Size ", 588}, - {" Chown command ", 589}, - {" User name ", 590}, - {"", 591}, - {"", 592}, - {" I can't run the Chown command on an extfs ", 593}, - {" I can't run the Chown command on a tarfs ", 594}, - {" Can not fetch a local copy of %s ", 595}, - {" CD ", 596}, - {"Files tagged, want to cd?", 597}, - {"Could not change directory", 598}, - {" View file ", 599}, - {" Filename:", 600}, - {" Filtered view ", 601}, - {" Filter command and arguments:", 602}, - {"Create a new Directory", 603}, - {" Enter directory name:", 604}, - {" Filter ", 605}, - {" Set expression for filtering filenames", 606}, - {" Select ", 607}, - {" Malformed regular expression ", 608}, - {" Unselect ", 609}, - {"Extension file edit", 610}, - {" Which extension file you want to edit? ", 611}, - {"&User", 612}, - {"&System Wide", 613}, - {"Menu file edit", 614}, - {" Which menu file will you edit? ", 615}, - {"&Local", 616}, - {"&Home", 617}, - {" Compare directories ", 618}, - {" Select compare method: ", 619}, - {"&Quick", 620}, - {"&Size only", 621}, - {"&Thorough", 622}, - {" Both panels should be on the listing view mode to use this command ", 623}, - {" The command history is empty ", 624}, - {" Command history ", 625}, + than we can handle. \n", 523}, + {" Listing mode ", 524}, + {"&Full file list", 525}, + {"&Brief file list", 526}, + {"&Long file list", 527}, + {"&User defined:", 528}, + {"&Icon view", 529}, + {"user &Mini status", 530}, + {"Listing mode", 531}, + {"&Reverse", 532}, + {"case sensi&tive", 533}, + {"Sort order", 534}, + {" confirm &Exit ", 535}, + {" confirm e&Xecute ", 536}, + {" confirm o&Verwrite ", 537}, + {" confirm &Delete ", 538}, + {" Confirmation ", 539}, + {"Full 8 bits output", 540}, + {"ISO 8859-1", 541}, + {"7 bits", 542}, + {"F&ull 8 bits input", 543}, + {" Display bits ", 544}, + {"&Always use ftp proxy", 545}, + {"sec", 546}, + {"ftpfs directory cache timeout:", 547}, + {"ftp anonymous password:", 548}, + {"Timeout for freeing VFSs:", 549}, + {" Virtual File System Setting ", 550}, + {"Quick cd", 551}, + {"cd", 552}, + {"Symbolic link", 553}, + {"Running ", 554}, + {"Stopped", 555}, + {"&Stop", 556}, + {"&Resume", 557}, + {"&Kill", 558}, + {"Background Jobs", 559}, + {"execute/search by others", 560}, + {"write by others", 561}, + {"read by others", 562}, + {"execute/search by group", 563}, + {"write by group", 564}, + {"read by group", 565}, + {"execute/search by owner", 566}, + {"write by owner", 567}, + {"read by owner", 568}, + {"sticky bit", 569}, + {"set group ID on execution", 570}, + {"set user ID on execution", 571}, + {"C&lear marked", 572}, + {"S&et marked", 573}, + {"&Marked all", 574}, + {"Permissions (Octal)", 575}, + {"Owner name", 576}, + {"Group name", 577}, + {" Chmod command ", 578}, + {" Permission ", 579}, + {"Use SPACE to change", 580}, + {"an option, ARROW KEYS", 581}, + {"to move between options", 582}, + {"and T or INS to mark", 583}, + {"Chmod command", 584}, + {" I can't run the Chmod command on an extfs ", 585}, + {"Set &users", 586}, + {"Set &groups", 587}, + {" Name ", 588}, + {" Owner name ", 589}, + {" Group name ", 590}, + {" Size ", 591}, + {" Chown command ", 592}, + {" User name ", 593}, + {"", 594}, + {"", 595}, + {" I can't run the Chown command on an extfs ", 596}, + {" I can't run the Chown command on a tarfs ", 597}, + {" Can not fetch a local copy of %s ", 598}, + {" CD ", 599}, + {"Files tagged, want to cd?", 600}, + {"Could not change directory", 601}, + {" View file ", 602}, + {" Filename:", 603}, + {" Filtered view ", 604}, + {" Filter command and arguments:", 605}, + {"Create a new Directory", 606}, + {" Enter directory name:", 607}, + {" Filter ", 608}, + {" Set expression for filtering filenames", 609}, + {" Select ", 610}, + {" Malformed regular expression ", 611}, + {" Unselect ", 612}, + {"Extension file edit", 613}, + {" Which extension file you want to edit? ", 614}, + {"&User", 615}, + {"&System Wide", 616}, + {"Menu file edit", 617}, + {" Which menu file will you edit? ", 618}, + {"&Local", 619}, + {"&Home", 620}, + {" Compare directories ", 621}, + {" Select compare method: ", 622}, + {"&Quick", 623}, + {"&Size only", 624}, + {"&Thorough", 625}, + {" Both panels should be on the listing view mode to use this command ", 626}, + {" The command history is empty ", 627}, + {" Command history ", 628}, {"\ Not an xterm or Linux console; \n\ - the panels cannot be toggled. ", 626}, - {"Type `exit' to return to the Midnight Commander", 627}, + the panels cannot be toggled. ", 629}, + {"Type `exit' to return to the Midnight Commander", 630}, {"\ Couldn't stat %s \n\ - %s ", 628}, - {" Link ", 629}, - {" to:", 630}, - {" link: %s ", 631}, - {" symlink: %s ", 632}, - {" Symlink ", 633}, - {" points to:", 634}, - {" Edit symlink ", 635}, - {" edit symlink, unable to remove %s: %s ", 636}, - {" edit symlink: %s ", 637}, - {" Link symbolically ", 638}, - {" Relative symlink ", 639}, - {" relative symlink: %s ", 640}, - {" Enter machine name (F1 for details): ", 641}, - {" Could not chdir to %s ", 642}, - {" Link to a remote machine ", 643}, - {" FTP to machine ", 644}, - {" Socket source routing setup ", 645}, - {" Enter host name to use as a source routing hop: ", 646}, - {" Host name ", 647}, - {" Error while looking up IP address ", 648}, - {" Undelete files on an ext2 file system ", 649}, + %s ", 631}, + {" Link ", 632}, + {" to:", 633}, + {" link: %s ", 634}, + {" symlink: %s ", 635}, + {" Symlink `%s' points to: ", 636}, + {" Edit symlink ", 637}, + {" edit symlink, unable to remove %s: %s ", 638}, + {" edit symlink: %s ", 639}, + {" Link symbolically ", 640}, + {" Relative symlink ", 641}, + {" relative symlink: %s ", 642}, + {" Enter machine name (F1 for details): ", 643}, + {" Could not chdir to %s ", 644}, + {" Link to a remote machine ", 645}, + {" FTP to machine ", 646}, + {" Socket source routing setup ", 647}, + {" Enter host name to use as a source routing hop: ", 648}, + {" Host name ", 649}, + {" Error while looking up IP address ", 650}, + {" Undelete files on an ext2 file system ", 651}, {"\ Enter device (without /dev/) to undelete\n\ - files on: (F1 for details)", 650}, - {" Setup saved to ~/", 651}, - {" Setup ", 652}, + files on: (F1 for details)", 652}, + {" Setup saved to ~/", 653}, + {" Setup ", 654}, {"\ Can't chdir to '%s' \n\ - %s ", 653}, - {" You can not execute commands on non-local filesystems", 654}, + %s ", 655}, + {" You can not execute commands on non-local filesystems", 656}, {"\ \n\ \n\ \n\ refresh stack underflow!\n\ \n\ -\n", 655}, - {"&Unsorted", 656}, - {"&Name", 657}, - {"&Extension", 658}, - {"&Modify time", 659}, - {"&Access time", 660}, - {"&Change time", 661}, - {"&Size", 662}, - {"&Inode", 663}, - {"&Type", 664}, - {"&Links", 665}, - {"N&GID", 666}, - {"N&UID", 667}, - {"&Owner", 668}, - {"&Group", 669}, - {"File exists but can not be stat-ed: %s %s", 670}, - {"Unknown", 671}, +\n", 657}, + {"&Unsorted", 658}, + {"&Name", 659}, + {"&Extension", 660}, + {"&Modify time", 661}, + {"&Access time", 662}, + {"&Change time", 663}, + {"&Size", 664}, + {"&Inode", 665}, + {"&Type", 666}, + {"&Links", 667}, + {"N&GID", 668}, + {"N&UID", 669}, + {"&Owner", 670}, + {"&Group", 671}, + {"File exists but can not be stat-ed: %s %s", 672}, + {"Unknown", 673}, {"\ Can't create temporary command file \n\ - %s ", 672}, - {" Parameter ", 673}, - {" Can't execute commands on a Virtual File System directory ", 674}, - {" file error", 675}, - {"Format of the ", 676}, - {" file error ", 677}, - {"Format of the ~/", 678}, + %s ", 674}, + {" Parameter ", 675}, + {" Can't execute commands on a Virtual File System directory ", 676}, + {" file error", 677}, + {"Format of the ", 678}, + {" file error ", 679}, + {"Format of the ~/", 680}, {"\ file has changed\n\ with version 3.0. You may want either to\n\ -copy it from ", 679}, +copy it from ", 681}, {"\ mc.ext or use that\n\ -file as an example of how to write it.\n", 680}, - {"mc.ext will be used for this moment.", 681}, - {" Copy ", 682}, - {" Move ", 683}, - {" Delete ", 684}, - {" Invalid target mask ", 685}, - {" Could not make the hardlink ", 686}, +file as an example of how to write it.\n", 682}, + {"mc.ext will be used for this moment.", 683}, + {" Copy ", 684}, + {" Move ", 685}, + {" Delete ", 686}, + {" Invalid target mask ", 687}, + {" Could not make the hardlink ", 688}, {"\ Cannot read source link \"%s\" \n\ - %s ", 687}, + %s ", 689}, {"\ Cannot make stable symlinks across non-local filesystems: \n\ \n\ - Option Stable Symlinks will be disabled ", 688}, + Option Stable Symlinks will be disabled ", 690}, {"\ Cannot create target symlink \"%s\" \n\ - %s ", 689}, + %s ", 691}, {"\ Cannot overwrite directory \"%s\" \n\ - %s ", 690}, + %s ", 692}, {"\ Cannot stat source file \"%s\" \n\ - %s ", 691}, - {" `%s' and `%s' are the same file. ", 692}, + %s ", 693}, + {" `%s' and `%s' are the same file. ", 694}, {"\ Cannot create special file \"%s\" \n\ - %s ", 693}, + %s ", 695}, {"\ Cannot chown target file \"%s\" \n\ - %s ", 694}, + %s ", 696}, {"\ Cannot chmod target file \"%s\" \n\ - %s ", 695}, + %s ", 697}, {"\ Cannot open source file \"%s\" \n\ - %s ", 696}, - {" Reget failed, about to overwrite file ", 697}, + %s ", 698}, + {" Reget failed, about to overwrite file ", 699}, {"\ Cannot fstat source file \"%s\" \n\ - %s ", 698}, + %s ", 700}, {"\ Cannot create target file \"%s\" \n\ - %s ", 699}, + %s ", 701}, {"\ Cannot fstat target file \"%s\" \n\ - %s ", 700}, + %s ", 702}, {"\ Cannot read source file \"%s\" \n\ - %s ", 701}, + %s ", 703}, {"\ Cannot write target file \"%s\" \n\ - %s ", 702}, - {"(stalled)", 703}, + %s ", 704}, + {"(stalled)", 705}, {"\ Cannot close source file \"%s\" \n\ - %s ", 704}, + %s ", 706}, {"\ Cannot close target file \"%s\" \n\ - %s ", 705}, - {"Incomplete file was retrieved. Keep it?", 706}, - {"&Delete", 707}, - {"&Keep", 708}, + %s ", 707}, + {"Incomplete file was retrieved. Keep it?", 708}, + {"&Delete", 709}, + {"&Keep", 710}, {"\ Cannot stat source directory \"%s\" \n\ - %s ", 709}, + %s ", 711}, {"\ Source directory \"%s\" is not a directory \n\ - %s ", 710}, + %s ", 712}, {"\ Cannot copy cyclic symbolic link \n\ - `%s' ", 711}, + `%s' ", 713}, {"\ Cannot create target directory \"%s\" \n\ - %s ", 712}, + %s ", 714}, {"\ Cannot chown target directory \"%s\" \n\ - %s ", 713}, + %s ", 715}, {"\ Cannot stat file \"%s\" \n\ - %s ", 714}, - {" `%s' and `%s' are the same file ", 715}, - {" Cannot overwrite directory `%s' ", 716}, + %s ", 716}, + {" `%s' and `%s' are the same file ", 717}, + {" Cannot overwrite directory `%s' ", 718}, {"\ Cannot move file \"%s\" to \"%s\" \n\ - %s ", 717}, + %s ", 719}, {"\ Cannot remove file \"%s\" \n\ - %s ", 718}, - {" Cannot overwrite directory \"%s\" %s ", 719}, - {" Cannot overwrite file \"%s\" %s ", 720}, + %s ", 720}, + {" Cannot overwrite directory \"%s\" %s ", 721}, + {" Cannot overwrite file \"%s\" %s ", 722}, {"\ Cannot move directory \"%s\" to \"%s\" \n\ - %s ", 721}, + %s ", 723}, {"\ Cannot delete file \"%s\" \n\ - %s ", 722}, + %s ", 724}, {"\ Cannot remove directory \"%s\" \n\ - %s ", 723}, - {" Internal error: get_file \n", 724}, - {"1Copy", 725}, - {"1Move", 726}, - {"1Delete", 727}, - {"%o %f \"%s\"%m", 728}, - {"%o %d %f%m", 729}, - {"%o %f \"%s\"%e", 730}, - {"%o %d %f%e", 731}, - {"file", 732}, - {"files", 733}, - {"directory", 734}, - {"directories", 735}, - {"files/directories", 736}, - {" with source mask:", 737}, - {" Can't operate on \"..\"! ", 738}, - {"Yes", 739}, - {"No", 740}, - {" Sorry, I could not put the job in background ", 741}, - {" Internal failure ", 742}, - {" Unknown file operation ", 743}, + %s ", 725}, + {" Internal error: get_file \n", 726}, + {"1Copy", 727}, + {"1Move", 728}, + {"1Delete", 729}, + {"%o %f \"%s\"%m", 730}, + {"%o %d %f%m", 731}, + {"%o %f \"%s\"%e", 732}, + {"%o %d %f%e", 733}, + {"file", 734}, + {"files", 735}, + {"directory", 736}, + {"directories", 737}, + {"files/directories", 738}, + {" with source mask:", 739}, + {" Can't operate on \"..\"! ", 740}, + {"Yes", 741}, + {"No", 742}, + {" Sorry, I could not put the job in background ", 743}, + {" Internal failure ", 744}, + {" Unknown file operation ", 745}, {"\ Destination \"%s\" must be a directory \n\ - %s ", 744}, - {"&Retry", 745}, - {"&Abort", 746}, + %s ", 746}, + {"&Retry", 747}, + {"&Abort", 748}, {"\ \n\ Directory not empty. \n\ - Delete it recursively? ", 747}, + Delete it recursively? ", 749}, {"\ \n\ Background process: Directory not empty \n\ - Delete it recursively? ", 748}, - {"a&ll", 749}, - {"non&E", 750}, - {" Type 'yes' if you REALLY want to delete ", 751}, - {"all the directories ", 752}, - {" Recursive Delete ", 753}, - {" Background process: Recursive Delete ", 754}, - {"File", 755}, - {"Count", 756}, - {"Bytes", 757}, - {"Source", 758}, - {"Target", 759}, - {"Deleting", 760}, - {"Target file \"%s\" already exists!", 761}, - {"if &Size differs", 762}, - {"&Update", 763}, - {"Overwrite all targets?", 764}, - {"&Reget", 765}, - {"ap&Pend", 766}, - {"Overwrite this target?", 767}, - {"Target date: %s, size %d", 768}, - {"Source date: %s, size %d", 769}, - {" File exists ", 770}, - {" Background process: File exists ", 771}, - {"preserve &Attributes", 772}, - {"follow &Links", 773}, - {"to:", 774}, - {"&Using shell patterns", 775}, - {"&Background", 776}, - {"&Stable Symlinks", 777}, - {"&Dive into subdir if exists", 778}, + Delete it recursively? ", 750}, + {"a&ll", 751}, + {"non&E", 752}, + {" Type 'yes' if you REALLY want to delete ", 753}, + {"all the directories ", 754}, + {" Recursive Delete ", 755}, + {" Background process: Recursive Delete ", 756}, + {"File", 757}, + {"Count", 758}, + {"Bytes", 759}, + {"Source", 760}, + {"Target", 761}, + {"Deleting", 762}, + {"Target file \"%s\" already exists!", 763}, + {"if &Size differs", 764}, + {"&Update", 765}, + {"Overwrite all targets?", 766}, + {"&Reget", 767}, + {"ap&Pend", 768}, + {"Overwrite this target?", 769}, + {"Target date: %s, size %d", 770}, + {"Source date: %s, size %d", 771}, + {" File exists ", 772}, + {" Background process: File exists ", 773}, + {"preserve &Attributes", 774}, + {"follow &Links", 775}, + {"to:", 776}, + {"&Using shell patterns", 777}, + {"&Background", 778}, + {"&Stable Symlinks", 779}, + {"&Dive into subdir if exists", 780}, {"\ Invalid source pattern `%s' \n\ - %s ", 779}, - {"&Suspend", 780}, - {"Con&tinue", 781}, - {"&Chdir", 782}, - {"&Again", 783}, - {"&Quit", 784}, - {"Pane&lize", 785}, - {"&View - F3", 786}, - {"&Edit - F4", 787}, - {"Start at:", 788}, - {"Filename:", 789}, - {"Content: ", 790}, - {"&Tree", 791}, - {"Find File", 792}, - {"Grepping in %s", 793}, - {" Find/read ", 794}, - {" Problem reading from child ", 795}, - {"Finished", 796}, - {"Searching %s", 797}, - {"Suspend", 798}, - {"Restart", 799}, - {"Searching", 800}, - {"Find file", 801}, - {"Change to this directory", 802}, - {"Search again", 803}, - {"View this file", 804}, - {"Edit this file", 805}, - {"Send the results to a Panel", 806}, - {"Usage: fixhlp \n", 807}, - {"fixhlp: Cannot open toc for writing", 808}, + %s ", 781}, + {"&Suspend", 782}, + {"Con&tinue", 783}, + {"&Chdir", 784}, + {"&Again", 785}, + {"&Quit", 786}, + {"Pane&lize", 787}, + {"&View - F3", 788}, + {"&Edit - F4", 789}, + {"Start at:", 790}, + {"Filename:", 791}, + {"Content: ", 792}, + {"&Tree", 793}, + {"Find File", 794}, + {"Grepping in %s", 795}, + {" Find/read ", 796}, + {" Problem reading from child ", 797}, + {"Finished", 798}, + {"Searching %s", 799}, + {"Suspend", 800}, + {"Restart", 801}, + {"Searching", 802}, + {"Find file", 803}, + {"Change to this directory", 804}, + {"Search again", 805}, + {"View this file", 806}, + {"Edit this file", 807}, + {"Send the results to a Panel", 808}, + {"Usage: fixhlp \n", 809}, + {"fixhlp: Cannot open toc for writing", 810}, {"\ [Contents]\n\ Topics:\n\ -\n", 809}, +\n", 811}, {"\ Help file format error\n\ -", 810}, - {" Internal bug: Double start of link area ", 811}, - {" Can't find node [Contents] in help file ", 812}, - {" Help ", 813}, +", 812}, + {" Internal bug: Double start of link area ", 813}, + {" Can't find node [Contents] in help file ", 814}, + {" Help ", 815}, {"\ Can't open file %s \n\ - %s ", 814}, - {" Can't find node %s in help file ", 815}, - {"Index", 816}, - {"Prev", 817}, - {"&Move", 818}, - {"&Remove", 819}, - {"&Append", 820}, - {"&Insert", 821}, - {"New &Entry", 822}, - {"New &Group", 823}, - {"&Up", 824}, - {"&Add current", 825}, - {"Change &To", 826}, - {"Subgroup - press ENTER to see list", 827}, - {"Active VFS directories", 828}, - {"Directory hotlist", 829}, - {" Directory path ", 830}, - {" Directory label ", 831}, - {"Moving ", 832}, - {"New hotlist entry", 833}, - {"Directory label", 834}, - {"Directory path", 835}, - {" New hotlist group ", 836}, - {"Name of new group", 837}, - {"Label for \"%s\":", 838}, - {" Add to hotlist ", 839}, - {" Remove: ", 840}, + %s ", 816}, + {" Can't find node %s in help file ", 817}, + {"Index", 818}, + {"Prev", 819}, + {"&Move", 820}, + {"&Remove", 821}, + {"&Append", 822}, + {"&Insert", 823}, + {"New &Entry", 824}, + {"New &Group", 825}, + {"&Up", 826}, + {"&Add current", 827}, + {"Change &To", 828}, + {"Subgroup - press ENTER to see list", 829}, + {"Active VFS directories", 830}, + {"Directory hotlist", 831}, + {" Directory path ", 832}, + {" Directory label ", 833}, + {"Moving ", 834}, + {"New hotlist entry", 835}, + {"Directory label", 836}, + {"Directory path", 837}, + {" New hotlist group ", 838}, + {"Name of new group", 839}, + {"Label for \"%s\":", 840}, + {" Add to hotlist ", 841}, + {" Remove: ", 842}, {"\ \n\ Group not empty.\n\ - Remove it?", 841}, - {" Top level group ", 842}, - {"Hotlist is now kept in file ~/", 843}, - {"MC will load hotlist from ~/", 844}, - {"and then delete [Hotlist] section there", 845}, - {" Hotlist Load ", 846}, - {"MC was unable to write ~/", 847}, - {" file, your old hotlist entries were not deleted", 848}, - {"You have ~/", 849}, - {" file and [Hotlist] section in ~/", 850}, - {"Your ~/", 851}, - {" most probably was created\n", 852}, + Remove it?", 843}, + {" Top level group ", 844}, + {"Hotlist is now kept in file ~/", 845}, + {"MC will load hotlist from ~/", 846}, + {"and then delete [Hotlist] section there", 847}, + {" Hotlist Load ", 848}, + {"MC was unable to write ~/", 849}, + {" file, your old hotlist entries were not deleted", 850}, + {"You have ~/", 851}, + {" file and [Hotlist] section in ~/", 852}, + {"Your ~/", 853}, + {" most probably was created\n", 854}, {"\ by an earlier development version of MC\n\ -and is more actual than ~/", 853}, +and is more actual than ~/", 855}, {"\ entries\n\ -\n", 854}, +\n", 856}, {"\ You can choose between\n\ \n\ - Remove - remove old hotlist entries from ~/", 855}, + Remove - remove old hotlist entries from ~/", 857}, {"\ 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 ~/", 856}, - {"&Merge", 857}, - {" Entries from ~/", 858}, - {" file your old hotlist entries were not deleted", 859}, - {"Midnight Commander %s", 860}, - {"Free nodes %d (%d%%) of %d", 861}, - {"No node information", 862}, - {"Free space ", 863}, - {" (%d%%) of ", 864}, - {"No space information", 865}, - {"Type: %s ", 866}, - {"non-local vfs", 867}, - {"Device: %s", 868}, - {"Filesystem: %s", 869}, - {"Accessed: %s", 870}, - {"Modified: %s", 871}, - {"Created: %s", 872}, - {"Size: ", 873}, - {" (%d blocks)", 874}, - {"Owner: %s/%s", 875}, - {"Links: %d", 876}, - {"Mode: %s (%04o)", 877}, - {"Location: %Xh:%Xh", 878}, - {"File: %s", 879}, - {"File: None", 880}, - {"&Vertical", 881}, - {"&Horizontal", 882}, - {"&Xterm hintbar", 883}, - {"h&Intbar visible", 884}, - {"&Keybar visible", 885}, - {"command &Prompt", 886}, - {"show &Mini status", 887}, - {"menu&Bar visible", 888}, - {"&Equal split", 889}, - {"pe&Rmissions", 890}, - {"&File types", 891}, - {"&Save", 892}, - {" Layout ", 893}, - {" Panel split ", 894}, - {" Highlight... ", 895}, - {" Other options ", 896}, - {"output lines", 897}, - {"Layout", 898}, - {" Learn keys ", 899}, - {" Teach me a key ", 900}, + Merge - add old entries to hotlist as group \"Entries from ~/", 858}, + {"&Merge", 859}, + {" Entries from ~/", 860}, + {" file your old hotlist entries were not deleted", 861}, + {"Midnight Commander %s", 862}, + {"Free nodes %d (%d%%) of %d", 863}, + {"No node information", 864}, + {"Free space ", 865}, + {" (%d%%) of ", 866}, + {"No space information", 867}, + {"Type: %s ", 868}, + {"non-local vfs", 869}, + {"Device: %s", 870}, + {"Filesystem: %s", 871}, + {"Accessed: %s", 872}, + {"Modified: %s", 873}, + {"Created: %s", 874}, + {"Size: ", 875}, + {" (%d blocks)", 876}, + {"Owner: %s/%s", 877}, + {"Links: %d", 878}, + {"Mode: %s (%04o)", 879}, + {"Location: %Xh:%Xh", 880}, + {"File: %s", 881}, + {"File: None", 882}, + {"&Vertical", 883}, + {"&Horizontal", 884}, + {"&Xterm hintbar", 885}, + {"h&Intbar visible", 886}, + {"&Keybar visible", 887}, + {"command &Prompt", 888}, + {"show &Mini status", 889}, + {"menu&Bar visible", 890}, + {"&Equal split", 891}, + {"pe&Rmissions", 892}, + {"&File types", 893}, + {"&Save", 894}, + {" Layout ", 895}, + {" Panel split ", 896}, + {" Highlight... ", 897}, + {" Other options ", 898}, + {"output lines", 899}, + {"Layout", 900}, + {" Learn keys ", 901}, + {" Teach me a key ", 902}, {"\ Please press the %s\n\ and then wait until this message disappears.\n\ @@ -1065,318 +1067,320 @@ next to its button.\n\ \n\ If you want to escape, press a single Escape key\n\ -and wait as well.", 901}, - {" Cannot accept this key ", 902}, - {" You have entered \"%s\"", 903}, - {"OK", 904}, +and wait as well.", 903}, + {" Cannot accept this key ", 904}, + {" You have entered \"%s\"", 905}, + {"OK", 906}, {"\ It seems that all your keys already\n\ -work fine. That's great.", 905}, - {"&Discard", 906}, +work fine. That's great.", 907}, + {"&Discard", 908}, {"\ Great! You have a complete terminal database!\n\ -All your keys work well.", 907}, - {"Learn keys", 908}, - {"Press all the keys mentioned here. After you have done it, check", 909}, - {"which keys are not marked with OK. Press space on the missing", 910}, - {"key, or click with the mouse to define it. Move around with Tab.", 911}, +All your keys work well.", 909}, + {"Learn keys", 910}, + {"Press all the keys mentioned here. After you have done it, check", 911}, + {"which keys are not marked with OK. Press space on the missing", 912}, + {"key, or click with the mouse to define it. Move around with Tab.", 913}, {"\ 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? ", 912}, - {"Press any key to continue...", 913}, - {" The shell is already running a command ", 914}, - {"&Listing mode...", 915}, - {"&Quick view C-x q", 916}, - {"&Info C-x i", 917}, - {"&Sort order...", 918}, - {"&Filter...", 919}, - {"&Network link...", 920}, - {"FT&P link...", 921}, - {"&Drive... M-d", 922}, - {"&Rescan C-r", 923}, - {"&User menu F2", 924}, - {"&View F3", 925}, - {"Vie&w file... ", 926}, - {"&Filtered view M-!", 927}, - {"&Edit F4", 928}, - {"&Copy F5", 929}, - {"c&Hmod C-x c", 930}, - {"&Link C-x l", 931}, - {"&SymLink C-x s", 932}, - {"edit s&Ymlink C-x C-s", 933}, - {"ch&Own C-x o", 934}, - {"&Advanced chown ", 935}, - {"&Rename/Move F6", 936}, - {"&Mkdir F7", 937}, - {"&Delete F8", 938}, - {"&Quick cd M-c", 939}, - {"select &Group M-+", 940}, - {"u&Nselect group M-\\", 941}, - {"reverse selec&Tion M-*", 942}, - {"e&Xit F10", 943}, - {"&Directory tree", 944}, - {"&Find file M-?", 945}, - {"s&Wap panels C-u", 946}, - {"switch &Panels on/off C-o", 947}, - {"&Compare directories C-x d", 948}, - {"e&Xternal panelize C-x !", 949}, - {"show directory s&Izes", 950}, - {"command &History", 951}, - {"di&Rectory hotlist C-\\", 952}, - {"&Active VFS list C-x a", 953}, - {"&Background jobs C-x j", 954}, - {"&Undelete files (ext2fs only)", 955}, - {"&Listing format edit", 956}, - {"&Extension file edit", 957}, - {"&Menu file edit", 958}, - {"&Configuration...", 959}, - {"c&Onfirmation...", 960}, - {"&Display bits...", 961}, - {"learn &Keys...", 962}, - {"&Virtual FS...", 963}, - {"&Save setup", 964}, - {" &Left ", 965}, - {" &Above ", 966}, - {" &File ", 967}, - {" &Command ", 968}, - {" &Options ", 969}, - {" &Right ", 970}, - {" &Below ", 971}, - {" Information ", 972}, + extra access permissions with the \"su\" command? ", 914}, + {"Press any key to continue...", 915}, + {" The shell is already running a command ", 916}, + {"&Listing mode...", 917}, + {"&Quick view C-x q", 918}, + {"&Info C-x i", 919}, + {"&Sort order...", 920}, + {"&Filter...", 921}, + {"&Network link...", 922}, + {"FT&P link...", 923}, + {"&Drive... M-d", 924}, + {"&Rescan C-r", 925}, + {"&User menu F2", 926}, + {"&View F3", 927}, + {"Vie&w file... ", 928}, + {"&Filtered view M-!", 929}, + {"&Edit F4", 930}, + {"&Copy F5", 931}, + {"c&Hmod C-x c", 932}, + {"&Link C-x l", 933}, + {"&SymLink C-x s", 934}, + {"edit s&Ymlink C-x C-s", 935}, + {"ch&Own C-x o", 936}, + {"&Advanced chown ", 937}, + {"&Rename/Move F6", 938}, + {"&Mkdir F7", 939}, + {"&Delete F8", 940}, + {"&Quick cd M-c", 941}, + {"select &Group M-+", 942}, + {"u&Nselect group M-\\", 943}, + {"reverse selec&Tion M-*", 944}, + {"e&Xit F10", 945}, + {"&Directory tree", 946}, + {"&Find file M-?", 947}, + {"s&Wap panels C-u", 948}, + {"switch &Panels on/off C-o", 949}, + {"&Compare directories C-x d", 950}, + {"e&Xternal panelize C-x !", 951}, + {"show directory s&Izes", 952}, + {"command &History", 953}, + {"di&Rectory hotlist C-\\", 954}, + {"&Active VFS list C-x a", 955}, + {"&Background jobs C-x j", 956}, + {"&Undelete files (ext2fs only)", 957}, + {"&Listing format edit", 958}, + {"&Extension file edit", 959}, + {"&Menu file edit", 960}, + {"&Configuration...", 961}, + {"c&Onfirmation...", 962}, + {"&Display bits...", 963}, + {"learn &Keys...", 964}, + {"&Virtual FS...", 965}, + {"&Save setup", 966}, + {" &Left ", 967}, + {" &Above ", 968}, + {" &File ", 969}, + {" &Command ", 970}, + {" &Options ", 971}, + {" &Right ", 972}, + {" &Below ", 973}, + {" Information ", 974}, {"\ 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. ", 973}, - {"Menu", 974}, - {"Thank you for using GNU Midnight Commander", 975}, - {"with mouse support on xterm%s.\n", 976}, - {" and the Linux console", 977}, - {"The TERM environment variable is unset!\n", 978}, - {"Library directory for the Midnight Commander: %s\n", 979}, - {"\ -Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 980}, - {"Use to debug the background code", 981}, - {"Request to run in color mode", 982}, - {"Specifies a color configuration", 983}, - {"Edits one file", 984}, - {"Displays this help message", 985}, - {"Displays a help screen on how to change the color scheme", 986}, - {"Log ftp dialog to specified file", 987}, - {"Obsolete", 988}, - {"Requests to run in black and white", 989}, - {"Disable mouse support in text version", 990}, - {"Disables subshell support", 991}, - {"Prints working directory at program exit", 992}, - {"Resets soft keys on HP terminals", 993}, - {"To run on slow terminals", 994}, - {"Use stickchars to draw", 995}, - {"Enables subshell support (default)", 996}, - {"Tries to use termcap instead of terminfo", 997}, - {"Displays the current version", 998}, - {"Launches the file viewer on a file", 999}, - {"Forces xterm features", 1000}, - {"Geometry for the window", 1001}, - {"GEOMETRY", 1002}, - {"No windows opened at startup", 1003}, - {"Force activation even if a server is already running", 1004}, + the details. ", 975}, + {"Menu", 976}, + {"Thank you for using GNU Midnight Commander", 977}, + {"with mouse support on xterm%s.\n", 978}, + {" and the Linux console", 979}, + {"The TERM environment variable is unset!\n", 980}, + {"Library directory for the Midnight Commander: %s\n", 981}, + {"\ +Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 982}, + {"Use to debug the background code", 983}, + {"Request to run in color mode", 984}, + {"Specifies a color configuration", 985}, + {"Edits one file", 986}, + {"Displays this help message", 987}, + {"Displays a help screen on how to change the color scheme", 988}, + {"Log ftp dialog to specified file", 989}, + {"Obsolete", 990}, + {"Requests to run in black and white", 991}, + {"Disable mouse support in text version", 992}, + {"Disables subshell support", 993}, + {"Prints working directory at program exit", 994}, + {"Resets soft keys on HP terminals", 995}, + {"To run on slow terminals", 996}, + {"Use stickchars to draw", 997}, + {"Enables subshell support (default)", 998}, + {"Tries to use termcap instead of terminfo", 999}, + {"Displays the current version", 1000}, + {"Launches the file viewer on a file", 1001}, + {"Forces xterm features", 1002}, + {"Geometry for the window", 1003}, + {"GEOMETRY", 1004}, + {"No windows opened at startup", 1005}, + {"Force activation even if a server is already running", 1006}, {"\ 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", 1005}, - {" Notice ", 1006}, +On some systems you may want to run # `which mc`\n", 1007}, + {"\ +You are running the GNOME Midnight Commander as root. \n\ +\n\ +You will not be protected from severly damaging your system\n\ +if you continue.", 1008}, + {" Notice ", 1009}, {"\ The Midnight Commander configuration files \n\ are now stored in the ~/.mc directory, the \n\ - files have been moved now\n", 1007}, - {"safe de&Lete", 1008}, - {"cd follows lin&Ks", 1009}, - {"advanced cho&Wn", 1010}, - {"l&Ynx-like motion", 1011}, - {"Animation", 1012}, - {"rotatin&G dash", 1013}, - {"co&Mplete: show all", 1014}, - {"&Use internal view", 1015}, - {"use internal ed&It", 1016}, - {"auto m&Enus", 1017}, - {"&Auto save setup", 1018}, - {"shell &Patterns", 1019}, - {"Compute &Totals", 1020}, - {"&Verbose operation", 1021}, - {"&Fast dir reload", 1022}, - {"mi&X all files", 1023}, - {"&Drop down menus", 1024}, - {"ma&Rk moves down", 1025}, - {"show &Hidden files", 1026}, - {"show &Backup files", 1027}, - {"&Never", 1028}, - {"on dumb &Terminals", 1029}, - {"alwa&Ys", 1030}, - {" Configure options ", 1031}, - {" Panel options ", 1032}, - {" Pause after run... ", 1033}, - {"Configure options", 1034}, - {"&Add new", 1035}, - {" External panelize ", 1036}, - {"External panelize", 1037}, - {"Other command", 1038}, - {" Add to external panelize ", 1039}, - {" Enter command label: ", 1040}, - {" I can't run external panelize while logged on a non local directory ", 1041}, - {"Find *.orig after patching", 1042}, - {"Find SUID and SGID programs", 1043}, - {"Cannot invoke command.", 1044}, - {"Pipe close failed", 1045}, - {"Show this help message", 1046}, - {"Display brief usage message", 1047}, - {"MTime", 1048}, - {"ATime", 1049}, - {"CTime", 1050}, - {"Permission", 1051}, - {"Perm", 1052}, - {"Nl", 1053}, - {"Inode", 1054}, - {"UID", 1055}, - {"GID", 1056}, - {" %s bytes in %d file%s", 1057}, - {"Unknow tag on display format: ", 1058}, - {" Do you really want to execute? ", 1059}, - {" No action taken ", 1060}, - {"RenMov", 1061}, - {"Mkdir", 1062}, + files have been moved now\n", 1010}, + {"safe de&Lete", 1011}, + {"cd follows lin&Ks", 1012}, + {"advanced cho&Wn", 1013}, + {"l&Ynx-like motion", 1014}, + {"Animation", 1015}, + {"rotatin&G dash", 1016}, + {"co&Mplete: show all", 1017}, + {"&Use internal view", 1018}, + {"use internal ed&It", 1019}, + {"auto m&Enus", 1020}, + {"&Auto save setup", 1021}, + {"shell &Patterns", 1022}, + {"Compute &Totals", 1023}, + {"&Verbose operation", 1024}, + {"&Fast dir reload", 1025}, + {"mi&X all files", 1026}, + {"&Drop down menus", 1027}, + {"ma&Rk moves down", 1028}, + {"show &Hidden files", 1029}, + {"show &Backup files", 1030}, + {"&Never", 1031}, + {"on dumb &Terminals", 1032}, + {"alwa&Ys", 1033}, + {" Configure options ", 1034}, + {" Panel options ", 1035}, + {" Pause after run... ", 1036}, + {"Configure options", 1037}, + {"&Add new", 1038}, + {" External panelize ", 1039}, + {"External panelize", 1040}, + {"Other command", 1041}, + {" Add to external panelize ", 1042}, + {" Enter command label: ", 1043}, + {" I can't run external panelize while logged on a non local directory ", 1044}, + {"Find *.orig after patching", 1045}, + {"Find SUID and SGID programs", 1046}, + {"Cannot invoke command.", 1047}, + {"Pipe close failed", 1048}, + {"Show this help message", 1049}, + {"Display brief usage message", 1050}, + {"MTime", 1051}, + {"ATime", 1052}, + {"CTime", 1053}, + {"Permission", 1054}, + {"Perm", 1055}, + {"Nl", 1056}, + {"Inode", 1057}, + {"UID", 1058}, + {"GID", 1059}, + {" %s bytes in %d file%s", 1060}, + {"Unknow tag on display format: ", 1061}, + {" Do you really want to execute? ", 1062}, + {" No action taken ", 1063}, + {"RenMov", 1064}, + {"Mkdir", 1065}, {"\ Can't chdir to %s \n\ - %s ", 1063}, - {"Couldn't open named pipe %s\n", 1064}, - {" The shell is still active. Quit anyway? ", 1065}, - {" There are stopped jobs.", 1066}, - {" Quit anyway? ", 1067}, - {"Warning: Couldn't change to %s.\n", 1068}, + %s ", 1066}, + {"Couldn't open named pipe %s\n", 1067}, + {" The shell is still active. Quit anyway? ", 1068}, + {" There are stopped jobs.", 1069}, + {" Quit anyway? ", 1070}, + {"Warning: Couldn't change to %s.\n", 1071}, {"\ Can't open the %s file for writing:\n\ -%s\n", 1069}, - {"Copy \"%s\" directory to:", 1070}, - {"Move \"%s\" directory to:", 1071}, +%s\n", 1072}, + {"Copy \"%s\" directory to:", 1073}, + {"Move \"%s\" directory to:", 1074}, {"\ Can't stat the destination \n\ - %s ", 1072}, - {" The destination isn't a directory ", 1073}, - {" Delete %s? ", 1074}, - {"Static", 1075}, - {"Dynamc", 1076}, + %s ", 1075}, + {" The destination isn't a directory ", 1076}, + {" Delete %s? ", 1077}, + {"Static", 1078}, + {"Dynamc", 1079}, {"\ Can't chdir to \"%s\" \n\ - %s ", 1077}, - {"Forget", 1078}, - {"Rmdir", 1079}, + %s ", 1080}, + {"Forget", 1081}, + {"Rmdir", 1082}, {"\ Can't write to the %s file:\n\ -%s\n", 1080}, - {" Invalid shell pattern defination \"%c\". ", 1081}, - {" Debug ", 1082}, - {" ERROR: ", 1083}, - {" True: ", 1084}, - {" False: ", 1085}, - {" Warning -- ignoring file ", 1086}, +%s\n", 1083}, + {" Invalid shell pattern defination \"%c\". ", 1084}, + {" Debug ", 1085}, + {" ERROR: ", 1086}, + {" True: ", 1087}, + {" False: ", 1088}, + {" Warning -- ignoring file ", 1089}, {"\ File %s is not owned by root or you or is world writable.\n\ -Using it may compromise your security", 1087}, - {" I can't run programs while logged on a non local directory ", 1088}, - {" User menu ", 1089}, - {"name_trunc: too big", 1090}, - {" Pipe failed ", 1091}, - {" Dup failed ", 1092}, +Using it may compromise your security", 1090}, + {" I can't run programs while logged on a non local directory ", 1091}, + {" User menu ", 1092}, + {"name_trunc: too big", 1093}, + {" Pipe failed ", 1094}, + {" Dup failed ", 1095}, {"\ File: \n\ \n\ - ", 1093}, + ", 1096}, {"\ \n\ \n\ -has been modified, do you want to save the changes?\n", 1094}, - {" Save changes ", 1095}, - {" Can't spawn child program ", 1096}, - {" Empty output from child filter ", 1097}, - {" Could not open file ", 1098}, - {" Can't open file \"", 1099}, +has been modified, do you want to save the changes?\n", 1097}, + {" Save changes ", 1098}, + {" Can't spawn child program ", 1099}, + {" Empty output from child filter ", 1100}, + {" Could not open file ", 1101}, + {" Can't open file \"", 1102}, {"\ Can't stat file \n\ - ", 1100}, - {" Can't view: not a regular file ", 1101}, - {"File: %s", 1102}, - {" [grow]", 1103}, - {"Searching for `%s'", 1104}, - {" Search string not found ", 1105}, - {" Invalid regular expression ", 1106}, + ", 1103}, + {" Can't view: not a regular file ", 1104}, + {"File: %s", 1105}, + {" [grow]", 1106}, + {"Searching for `%s'", 1107}, + {" Search string not found ", 1108}, + {" Invalid regular expression ", 1109}, {"\ The current line number is %d.\n\ - Enter the new line number:", 1107}, - {" Enter regexp:", 1108}, - {"Ascii", 1109}, - {"Hex", 1110}, - {"Line", 1111}, - {"RxSrch", 1112}, - {"EdText", 1113}, - {"EdHex", 1114}, - {"UnWrap", 1115}, - {"Wrap", 1116}, - {"HxSrch", 1117}, - {"Raw", 1118}, - {"Parse", 1119}, - {"Unform", 1120}, - {"Format", 1121}, - {"Function key 1", 1122}, - {"Function key 2", 1123}, - {"Function key 3", 1124}, - {"Function key 4", 1125}, - {"Function key 5", 1126}, - {"Function key 6", 1127}, - {"Function key 7", 1128}, - {"Function key 8", 1129}, - {"Function key 9", 1130}, - {"Function key 10", 1131}, - {"Function key 11", 1132}, - {"Function key 12", 1133}, - {"Function key 13", 1134}, - {"Function key 14", 1135}, - {"Function key 15", 1136}, - {"Function key 16", 1137}, - {"Function key 17", 1138}, - {"Function key 18", 1139}, - {"Function key 19", 1140}, - {"Function key 20", 1141}, - {"Backspace key", 1142}, - {"End key", 1143}, - {"Up arrow key", 1144}, - {"Down arrow key", 1145}, - {"Left arrow key", 1146}, - {"Right arrow key", 1147}, - {"Home key", 1148}, - {"Page Down key", 1149}, - {"Page Up key", 1150}, - {"Insert key", 1151}, - {"Delete key", 1152}, - {"Completion/M-tab", 1153}, - {"+ on keypad", 1154}, - {"- on keypad", 1155}, - {"* on keypad", 1156}, - {"Left arrow keypad", 1157}, - {"Right arrow keypad", 1158}, - {"Up arrow keypad", 1159}, - {"Down arrow keypad", 1160}, - {"Home on keypad", 1161}, - {"End on keypad", 1162}, - {"Page Down keypad", 1163}, - {"Page Up keypad", 1164}, - {"Insert on keypad", 1165}, - {"Delete on keypad", 1166}, - {"Enter on keypad", 1167}, - {"Slash on keypad", 1168}, - {"NumLock on keypad", 1169}, - {"Password:", 1170}, - {"Password", 1171}, - {"Ok", 1172}, + Enter the new line number:", 1110}, + {" Enter regexp:", 1111}, + {"Ascii", 1112}, + {"Hex", 1113}, + {"Line", 1114}, + {"RxSrch", 1115}, + {"EdText", 1116}, + {"EdHex", 1117}, + {"UnWrap", 1118}, + {"Wrap", 1119}, + {"HxSrch", 1120}, + {"Raw", 1121}, + {"Parse", 1122}, + {"Unform", 1123}, + {"Format", 1124}, + {"Function key 1", 1125}, + {"Function key 2", 1126}, + {"Function key 3", 1127}, + {"Function key 4", 1128}, + {"Function key 5", 1129}, + {"Function key 6", 1130}, + {"Function key 7", 1131}, + {"Function key 8", 1132}, + {"Function key 9", 1133}, + {"Function key 10", 1134}, + {"Function key 11", 1135}, + {"Function key 12", 1136}, + {"Function key 13", 1137}, + {"Function key 14", 1138}, + {"Function key 15", 1139}, + {"Function key 16", 1140}, + {"Function key 17", 1141}, + {"Function key 18", 1142}, + {"Function key 19", 1143}, + {"Function key 20", 1144}, + {"Backspace key", 1145}, + {"End key", 1146}, + {"Up arrow key", 1147}, + {"Down arrow key", 1148}, + {"Left arrow key", 1149}, + {"Right arrow key", 1150}, + {"Home key", 1151}, + {"Page Down key", 1152}, + {"Page Up key", 1153}, + {"Insert key", 1154}, + {"Delete key", 1155}, + {"Completion/M-tab", 1156}, + {"+ on keypad", 1157}, + {"- on keypad", 1158}, + {"* on keypad", 1159}, + {"Left arrow keypad", 1160}, + {"Right arrow keypad", 1161}, + {"Up arrow keypad", 1162}, + {"Down arrow keypad", 1163}, + {"Home on keypad", 1164}, + {"End on keypad", 1165}, + {"Page Down keypad", 1166}, + {"Page Up keypad", 1167}, + {"Insert on keypad", 1168}, + {"Delete on keypad", 1169}, + {"Enter on keypad", 1170}, + {"Slash on keypad", 1171}, + {"NumLock on keypad", 1172}, {"\ Couldn't open %s archive\n\ %s", 1173}, diff -ruN old/mc-4.5.26/po/mc.pot new/mc-4.5.27/po/mc.pot --- old/mc-4.5.26/po/mc.pot Sun Mar 14 19:19:46 1999 +++ new/mc-4.5.27/po/mc.pot Thu Mar 18 20:42:36 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-03-14 18:17-0600\n" +"POT-Creation-Date: 1999-03-18 19:56-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,7 +47,7 @@ msgid "The GNOME edition of the Midnight Commander file manager." msgstr "" -#: gnome/gcmd.c:127 src/main.c:844 src/screen.c:2053 +#: gnome/gcmd.c:127 src/main.c:844 src/screen.c:2067 msgid " The Midnight Commander " msgstr "" @@ -55,16 +55,16 @@ msgid " Do you really want to quit the Midnight Commander? " msgstr "" -#: gnome/gcmd.c:129 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1860 -#: src/file.c:2232 src/filegui.c:602 src/hotlist.c:1035 src/main.c:846 -#: src/screen.c:2055 src/subshell.c:706 src/subshell.c:732 src/tree.c:755 +#: gnome/gcmd.c:129 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1859 +#: src/file.c:2231 src/filegui.c:602 src/hotlist.c:1035 src/main.c:846 +#: src/screen.c:2069 src/subshell.c:706 src/subshell.c:732 src/tree.c:755 #: src/view.c:404 msgid "&Yes" msgstr "" -#: gnome/gcmd.c:129 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1860 -#: src/file.c:2232 src/filegui.c:601 src/hotlist.c:1035 src/main.c:846 -#: src/screen.c:2055 src/subshell.c:706 src/subshell.c:732 src/tree.c:755 +#: gnome/gcmd.c:129 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1859 +#: src/file.c:2231 src/filegui.c:601 src/hotlist.c:1035 src/main.c:846 +#: src/screen.c:2069 src/subshell.c:706 src/subshell.c:732 src/tree.c:755 #: src/view.c:404 msgid "&No" msgstr "" @@ -153,7 +153,7 @@ msgstr "" #: gnome/gcmd.c:650 gnome/gcmd.c:691 gnome/gcmd.c:696 gnome/gcmd.c:700 -#: gnome/gscreen.c:2517 +#: gnome/gscreen.c:2516 msgid "Show all files" msgstr "" @@ -181,7 +181,7 @@ msgid "Enter extra arguments:" msgstr "" -#: gnome/gdesktop.c:420 gnome/gdesktop.c:2067 +#: gnome/gdesktop.c:420 gnome/gdesktop.c:2070 msgid "Warning" msgstr "" @@ -190,176 +190,176 @@ msgid "Could not open %s; will not have desktop icons" msgstr "" -#: gnome/gdesktop.c:1013 +#: gnome/gdesktop.c:1014 msgid "While running the mount/umount command" msgstr "" -#: gnome/gdesktop.c:1082 +#: gnome/gdesktop.c:1083 msgid "While running the eject command" msgstr "" -#: gnome/gdesktop.c:1135 gnome/gicon.c:154 gnome/gtools.c:52 +#: gnome/gdesktop.c:1136 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:2063 +#: gnome/gdesktop.c:2066 msgid "Home directory" msgstr "" -#: gnome/gdesktop.c:2068 +#: gnome/gdesktop.c:2071 #, c-format msgid "Could not symlink %s to %s; will not have initial desktop icons." msgstr "" -#: gnome/gdesktop.c:2397 gnome/glayout.c:355 +#: gnome/gdesktop.c:2400 gnome/glayout.c:355 msgid "_Terminal" msgstr "" -#: gnome/gdesktop.c:2397 gnome/glayout.c:355 +#: gnome/gdesktop.c:2400 gnome/glayout.c:355 msgid "Launch a new terminal in the current directory" msgstr "" #. If this ever changes, make sure you update create_new_menu accordingly. -#: gnome/gdesktop.c:2399 gnome/glayout.c:357 +#: gnome/gdesktop.c:2402 gnome/glayout.c:357 msgid "_Directory..." msgstr "" -#: gnome/gdesktop.c:2399 gnome/glayout.c:357 +#: gnome/gdesktop.c:2402 gnome/glayout.c:357 msgid "Creates a new directory" msgstr "" -#: gnome/gdesktop.c:2407 gnome/glayout.c:440 +#: gnome/gdesktop.c:2410 gnome/glayout.c:440 msgid "Arrange Icons" msgstr "" -#: gnome/gdesktop.c:2408 +#: gnome/gdesktop.c:2411 msgid "Create New Window" msgstr "" -#: gnome/gdesktop.c:2410 +#: gnome/gdesktop.c:2413 msgid "Rescan Mountable Devices" msgstr "" -#: gnome/gdesktop.c:2411 gnome/glayout.c:443 +#: gnome/gdesktop.c:2414 gnome/glayout.c:443 msgid "Rescan Desktop" msgstr "" -#: gnome/gdialogs.c:58 +#: gnome/gdialogs.c:59 msgid "To: " msgstr "" -#: gnome/gdialogs.c:59 +#: gnome/gdialogs.c:60 msgid "Copying from: " msgstr "" -#: gnome/gdialogs.c:60 +#: gnome/gdialogs.c:61 msgid "Deleting file: " msgstr "" -#: gnome/gdialogs.c:361 +#: gnome/gdialogs.c:368 msgid "Files Exist" msgstr "" -#: gnome/gdialogs.c:376 +#: gnome/gdialogs.c:383 msgid "" "Some of the files you are trying to copy already exist in the destination " "folder. Please select the action to be performed." msgstr "" -#: gnome/gdialogs.c:389 +#: gnome/gdialogs.c:396 msgid "Prompt me before overwriting any file." msgstr "" -#: gnome/gdialogs.c:396 +#: gnome/gdialogs.c:403 msgid "Don't overwrite any files." msgstr "" -#: gnome/gdialogs.c:412 +#: gnome/gdialogs.c:419 msgid "Overwrite:" msgstr "" -#: gnome/gdialogs.c:419 +#: gnome/gdialogs.c:426 msgid "Older files." msgstr "" -#: gnome/gdialogs.c:425 +#: gnome/gdialogs.c:432 msgid "Files only if size differs." msgstr "" -#: gnome/gdialogs.c:431 +#: gnome/gdialogs.c:438 msgid "All files." msgstr "" -#: gnome/gdialogs.c:471 +#: gnome/gdialogs.c:478 msgid "File Exists" msgstr "" -#: gnome/gdialogs.c:477 +#: gnome/gdialogs.c:484 #, c-format msgid "The target file already exists: %s" msgstr "" -#: gnome/gdialogs.c:484 +#: gnome/gdialogs.c:491 msgid "Replace it?" msgstr "" -#: gnome/gdialogs.c:558 gtkedit/editwidget.c:1067 src/file.c:803 -#: src/screen.c:2294 src/screen.c:2324 src/tree.c:1024 +#: gnome/gdialogs.c:565 gtkedit/editwidget.c:1067 src/file.c:802 +#: src/screen.c:2308 src/screen.c:2338 src/tree.c:1024 msgid "Copy" msgstr "" -#: gnome/gdialogs.c:561 gtkedit/editwidget.c:1068 +#: gnome/gdialogs.c:568 gtkedit/editwidget.c:1068 msgid "Move" msgstr "" -#: gnome/gdialogs.c:578 +#: gnome/gdialogs.c:585 msgid "Destination" msgstr "" -#: gnome/gdialogs.c:582 +#: gnome/gdialogs.c:589 msgid "Find Destination Folder" msgstr "" -#: gnome/gdialogs.c:587 +#: gnome/gdialogs.c:594 msgid "Copy as a background process" msgstr "" -#: gnome/gdialogs.c:607 +#: gnome/gdialogs.c:614 msgid "Advanced Options" msgstr "" -#: gnome/gdialogs.c:611 +#: gnome/gdialogs.c:618 msgid "Preserve symlinks" msgstr "" -#: gnome/gdialogs.c:621 +#: gnome/gdialogs.c:628 msgid "Follow links." msgstr "" -#: gnome/gdialogs.c:627 +#: gnome/gdialogs.c:634 msgid "" "Selecting this will copy the files that symlinks point to instead of just " "copying the link." msgstr "" -#: gnome/gdialogs.c:632 +#: gnome/gdialogs.c:639 msgid "Preserve file attributes." msgstr "" -#: gnome/gdialogs.c:637 +#: gnome/gdialogs.c:644 msgid "Preserves the permissions and the UID/GID if possible" msgstr "" -#: gnome/gdialogs.c:643 +#: gnome/gdialogs.c:650 msgid "Recursively copy subdirectories." msgstr "" -#: gnome/gdialogs.c:648 +#: gnome/gdialogs.c:655 msgid "If set, this will copy the directories recursively" msgstr "" -#: gnome/gdialogs.c:752 +#: gnome/gdialogs.c:759 #, c-format msgid "" "%s\n" @@ -367,38 +367,59 @@ "Directory not empty. Delete it recursively?" msgstr "" -#: gnome/gdialogs.c:761 src/file.c:2227 +#: gnome/gdialogs.c:768 src/file.c:2226 msgid " Delete: " msgstr "" -#: gnome/gdialogs.c:765 +#: gnome/gdialogs.c:772 msgid "Do the same for the rest" msgstr "" -#: gnome/gdialogs.c:834 +#: gnome/gdialogs.c:841 msgid "Move Progress" msgstr "" -#: gnome/gdialogs.c:837 +#: gnome/gdialogs.c:844 msgid "Copy Progress" msgstr "" -#: gnome/gdialogs.c:840 +#: gnome/gdialogs.c:847 msgid "Delete Progress" msgstr "" -#: gnome/gdialogs.c:885 +#: gnome/gdialogs.c:892 msgid "File " msgstr "" -#: gnome/gdialogs.c:889 +#: gnome/gdialogs.c:896 msgid " is " msgstr "" -#: gnome/gdialogs.c:892 +#: gnome/gdialogs.c:899 msgid " Done." msgstr "" +#: gnome/gdialogs.c:959 src/wtools.c:585 vfs/vfs.c:1762 +msgid "Password:" +msgstr "" + +#: gnome/gdialogs.c:959 src/wtools.c:585 +msgid "Password" +msgstr "" + +#. Create the dialog +#: gnome/gdialogs.c:991 +msgid "Symbolic Link" +msgstr "" + +#: gnome/gdialogs.c:1007 src/boxes.c:803 +msgid "Existing filename (filename symlink will point to):" +msgstr "" + +#: gnome/gdialogs.c:1021 src/boxes.c:801 +msgid "Symbolic link filename:" +msgstr "" + #: gnome/gdnd.c:51 msgid "_Move here" msgstr "" @@ -648,7 +669,7 @@ msgstr "" #: gnome/gpopup.c:253 gnome/gpopup.c:254 gtkedit/editwidget.c:1070 -#: src/screen.c:2297 src/screen.c:2327 +#: src/screen.c:2311 src/screen.c:2341 msgid "Delete" msgstr "" @@ -672,7 +693,7 @@ msgid "Open with" msgstr "" -#: gnome/gpopup.c:263 src/screen.c:2292 src/screen.c:2322 +#: gnome/gpopup.c:263 src/screen.c:2306 src/screen.c:2336 msgid "View" msgstr "" @@ -680,7 +701,7 @@ msgid "View unfiltered" msgstr "" -#: gnome/gpopup.c:265 src/screen.c:2293 src/screen.c:2323 src/view.c:1991 +#: gnome/gpopup.c:265 src/screen.c:2307 src/screen.c:2337 src/view.c:1991 msgid "Edit" msgstr "" @@ -885,154 +906,154 @@ msgid "Select icon" msgstr "" -#: gnome/gscreen.c:1469 +#: gnome/gscreen.c:1468 msgid "Rescan Directory" msgstr "" -#: gnome/gscreen.c:1469 +#: gnome/gscreen.c:1468 msgid "Reloads the current directory" msgstr "" -#: gnome/gscreen.c:1471 +#: gnome/gscreen.c:1470 msgid "New folder" msgstr "" -#: gnome/gscreen.c:1471 +#: gnome/gscreen.c:1470 msgid "Creates a new folder here" msgstr "" -#: gnome/gscreen.c:1649 +#: gnome/gscreen.c:1648 msgid "All files" msgstr "" -#: gnome/gscreen.c:1651 +#: gnome/gscreen.c:1650 msgid "Archives and compressed files" msgstr "" -#: gnome/gscreen.c:1653 +#: gnome/gscreen.c:1652 msgid "RPM/DEB files" msgstr "" -#: gnome/gscreen.c:1655 +#: gnome/gscreen.c:1654 msgid "Text/Document files" msgstr "" -#: gnome/gscreen.c:1657 +#: gnome/gscreen.c:1656 msgid "HTML and SGML files" msgstr "" -#: gnome/gscreen.c:1659 +#: gnome/gscreen.c:1658 msgid "Postscript and PDF files" msgstr "" -#: gnome/gscreen.c:1661 +#: gnome/gscreen.c:1660 msgid "Spreadsheet files" msgstr "" -#: gnome/gscreen.c:1663 +#: gnome/gscreen.c:1662 msgid "Image files" msgstr "" -#: gnome/gscreen.c:1666 +#: gnome/gscreen.c:1665 msgid "Video/animation files" msgstr "" -#: gnome/gscreen.c:1668 +#: gnome/gscreen.c:1667 msgid "Audio files" msgstr "" -#: gnome/gscreen.c:1670 +#: gnome/gscreen.c:1669 msgid "C program files" msgstr "" -#: gnome/gscreen.c:1672 +#: gnome/gscreen.c:1671 msgid "C++ program files" msgstr "" -#: gnome/gscreen.c:1674 +#: gnome/gscreen.c:1673 msgid "Objective-C program files" msgstr "" -#: gnome/gscreen.c:1676 +#: gnome/gscreen.c:1675 msgid "Scheme program files" msgstr "" -#: gnome/gscreen.c:1678 +#: gnome/gscreen.c:1677 msgid "Assembler program files" msgstr "" -#: gnome/gscreen.c:1680 +#: gnome/gscreen.c:1679 msgid "Misc. program files" msgstr "" -#: gnome/gscreen.c:1682 +#: gnome/gscreen.c:1681 msgid "Font files" msgstr "" -#: gnome/gscreen.c:1809 +#: gnome/gscreen.c:1808 #, c-format msgid "Search: %s" msgstr "" -#: gnome/gscreen.c:1819 +#: gnome/gscreen.c:1818 #, c-format msgid "%s bytes in %d file" msgstr "" -#: gnome/gscreen.c:1819 +#: gnome/gscreen.c:1818 #, c-format msgid "%s bytes in %d files" msgstr "" -#: gnome/gscreen.c:1845 src/screen.c:677 +#: gnome/gscreen.c:1844 src/screen.c:677 msgid "" msgstr "" -#: gnome/gscreen.c:1899 +#: gnome/gscreen.c:1898 msgid "Filter" msgstr "" -#: gnome/gscreen.c:2339 +#: gnome/gscreen.c:2338 msgid "Back" msgstr "" -#: gnome/gscreen.c:2339 +#: gnome/gscreen.c:2338 msgid "Go to the previously visited directory" msgstr "" -#: gnome/gscreen.c:2341 +#: gnome/gscreen.c:2340 msgid "Up" msgstr "" -#: gnome/gscreen.c:2341 +#: gnome/gscreen.c:2340 msgid "Go up a level in the directory heirarchy" msgstr "" -#: gnome/gscreen.c:2343 +#: gnome/gscreen.c:2342 msgid "Forward" msgstr "" -#: gnome/gscreen.c:2343 +#: gnome/gscreen.c:2342 msgid "Go to the next directory" msgstr "" -#: gnome/gscreen.c:2346 src/tree.c:1020 +#: gnome/gscreen.c:2345 src/tree.c:1020 msgid "Rescan" msgstr "" -#: gnome/gscreen.c:2346 +#: gnome/gscreen.c:2345 msgid "Rescan the current directory" msgstr "" -#: gnome/gscreen.c:2349 +#: gnome/gscreen.c:2348 msgid "Home" msgstr "" -#: gnome/gscreen.c:2349 +#: gnome/gscreen.c:2348 msgid "Go to your home directory" msgstr "" -#: gnome/gscreen.c:2495 +#: gnome/gscreen.c:2494 msgid "Location:" msgstr "" @@ -1040,9 +1061,9 @@ #: gnome/gtools.c:110 gtkedit/editcmd.c:342 gtkedit/editcmd.c:1185 #: gtkedit/editcmd.c:1270 gtkedit/editcmd.c:2847 gtkedit/editoptions.c:69 #: 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:897 +#: src/boxes.c:646 src/boxes.c:728 src/boxes.c:783 src/boxes.c:898 #: src/filegui.c:838 src/find.c:171 src/layout.c:369 src/option.c:144 -#: src/wtools.c:289 src/wtools.c:561 +#: src/wtools.c:289 src/wtools.c:563 msgid "&Ok" msgstr "" @@ -1122,11 +1143,11 @@ msgid "help" msgstr "" -#: gnome/gwidget.c:96 src/file.c:2251 +#: gnome/gwidget.c:96 src/file.c:2250 msgid "yes" msgstr "" -#: gnome/gwidget.c:98 src/file.c:2249 +#: gnome/gwidget.c:98 src/file.c:2248 msgid "no" msgstr "" @@ -1142,7 +1163,7 @@ #: 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:1945 gtkedit/editwidget.c:950 src/dir.c:386 -#: src/screen.c:2312 src/tree.c:692 src/tree.c:698 src/wtools.c:222 +#: src/screen.c:2326 src/tree.c:692 src/tree.c:698 src/wtools.c:222 #: vfs/fish.c:224 msgid " Error " msgstr "" @@ -1193,8 +1214,7 @@ #: src/chmod.c:114 src/chown.c:79 src/cmd.c:856 src/filegui.c:821 #: 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 +#: src/view.c:404 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 msgid "&Cancel" msgstr "" @@ -1213,9 +1233,9 @@ #. Warning message with a query to continue or cancel the operation #: gtkedit/editcmd.c:491 gtkedit/editcmd.c:810 gtkedit/editcmd.c:840 -#: gtkedit/editcmd.c:987 gtkedit/editcmd.c:1084 src/ext.c:301 src/file.c:620 -#: src/help.c:318 src/main.c:691 src/screen.c:2069 src/subshell.c:705 -#: src/subshell.c:731 src/utilunix.c:388 src/utilunix.c:392 src/utilunix.c:458 +#: gtkedit/editcmd.c:987 gtkedit/editcmd.c:1084 src/ext.c:301 src/file.c:619 +#: src/help.c:318 src/main.c:691 src/screen.c:2083 src/subshell.c:705 +#: src/subshell.c:731 src/utilunix.c:388 src/utilunix.c:392 src/utilunix.c:463 #: vfs/mcfs.c:170 msgid " Warning " msgstr "" @@ -1312,6 +1332,7 @@ msgstr "" #: gtkedit/editcmd.c:810 gtkedit/editcmd.c:840 gtkedit/editcmd.c:987 +#: src/main.c:3067 msgid "Continue" msgstr "" @@ -1340,7 +1361,7 @@ msgid "al&L" msgstr "" -#: gtkedit/editcmd.c:1141 src/file.c:2173 src/filegui.c:266 +#: gtkedit/editcmd.c:1141 src/file.c:2172 src/filegui.c:266 msgid "&Skip" msgstr "" @@ -1729,8 +1750,8 @@ msgid "Error initialising editor.\n" msgstr "" -#: gtkedit/editwidget.c:1063 src/help.c:806 src/main.c:1688 src/screen.c:2290 -#: src/screen.c:2320 src/tree.c:1018 src/view.c:1982 +#: gtkedit/editwidget.c:1063 src/help.c:806 src/main.c:1688 src/screen.c:2304 +#: src/screen.c:2334 src/tree.c:1018 src/view.c:1982 msgid "Help" msgstr "" @@ -2233,7 +2254,7 @@ msgid "Background process:" msgstr "" -#: src/background.c:287 src/file.c:2172 +#: src/background.c:287 src/file.c:2171 msgid " Background process error " msgstr "" @@ -2376,35 +2397,27 @@ msgid "Symbolic link" msgstr "" -#: src/boxes.c:801 -msgid "Symbolic link filename:" -msgstr "" - -#: src/boxes.c:803 -msgid "Existing filename (filename symlink will point to):" -msgstr "" - -#: src/boxes.c:832 +#: src/boxes.c:833 msgid "Running " msgstr "" -#: src/boxes.c:833 src/find.c:716 src/find.c:957 +#: src/boxes.c:834 src/find.c:716 src/find.c:957 msgid "Stopped" msgstr "" -#: src/boxes.c:894 +#: src/boxes.c:895 msgid "&Stop" msgstr "" -#: src/boxes.c:895 +#: src/boxes.c:896 msgid "&Resume" msgstr "" -#: src/boxes.c:896 +#: src/boxes.c:897 msgid "&Kill" msgstr "" -#: src/boxes.c:935 +#: src/boxes.c:936 msgid "Background Jobs" msgstr "" @@ -2707,7 +2720,7 @@ msgid " Link " msgstr "" -#: src/cmd.c:1032 src/cmd.c:1168 src/file.c:1686 +#: src/cmd.c:1032 src/cmd.c:1171 src/file.c:1685 msgid " to:" msgstr "" @@ -2721,89 +2734,86 @@ msgid " symlink: %s " msgstr "" -#: src/cmd.c:1117 -msgid " Symlink " -msgstr "" - -#: src/cmd.c:1117 -msgid " points to:" +#: src/cmd.c:1130 +#, c-format +msgid " Symlink `%s' points to: " msgstr "" -#: src/cmd.c:1132 +#: src/cmd.c:1135 msgid " Edit symlink " msgstr "" -#: src/cmd.c:1137 +#: src/cmd.c:1140 #, c-format msgid " edit symlink, unable to remove %s: %s " msgstr "" -#: src/cmd.c:1141 +#: src/cmd.c:1144 #, c-format msgid " edit symlink: %s " msgstr "" -#: src/cmd.c:1168 +#: src/cmd.c:1171 msgid " Link symbolically " msgstr "" -#: src/cmd.c:1169 +#: src/cmd.c:1172 msgid " Relative symlink " msgstr "" -#: src/cmd.c:1180 +#: src/cmd.c:1183 #, c-format msgid " relative symlink: %s " msgstr "" -#: src/cmd.c:1283 +#: src/cmd.c:1286 msgid " Enter machine name (F1 for details): " msgstr "" -#: src/cmd.c:1307 +#: src/cmd.c:1310 #, c-format msgid " Could not chdir to %s " msgstr "" -#: src/cmd.c:1314 +#: src/cmd.c:1317 msgid " Link to a remote machine " msgstr "" -#: src/cmd.c:1320 +#: src/cmd.c:1323 msgid " FTP to machine " msgstr "" -#: src/cmd.c:1330 +#: src/cmd.c:1333 msgid " Socket source routing setup " msgstr "" -#: src/cmd.c:1331 +#: src/cmd.c:1334 msgid " Enter host name to use as a source routing hop: " msgstr "" -#: src/cmd.c:1338 +#: src/cmd.c:1341 msgid " Host name " msgstr "" -#: src/cmd.c:1338 +#: src/cmd.c:1341 msgid " Error while looking up IP address " msgstr "" -#: src/cmd.c:1349 +#: src/cmd.c:1352 msgid " Undelete files on an ext2 file system " msgstr "" -#: src/cmd.c:1350 +#: src/cmd.c:1353 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" msgstr "" -#: src/cmd.c:1400 +#: src/cmd.c:1403 msgid " Setup saved to ~/" msgstr "" -#: src/cmd.c:1405 +#: src/cmd.c:1408 msgid " Setup " msgstr "" @@ -2983,130 +2993,130 @@ " %s " msgstr "" -#: src/file.c:510 +#: src/file.c:509 #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" " %s " msgstr "" -#: src/file.c:519 +#: src/file.c:518 #, c-format msgid "" " Cannot stat source file \"%s\" \n" " %s " msgstr "" -#: src/file.c:532 +#: src/file.c:531 #, c-format msgid " `%s' and `%s' are the same file. " msgstr "" -#: src/file.c:575 +#: src/file.c:574 #, c-format msgid "" " Cannot create special file \"%s\" \n" " %s " msgstr "" -#: src/file.c:584 src/file.c:813 +#: src/file.c:583 src/file.c:812 #, c-format msgid "" " Cannot chown target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:593 src/file.c:832 +#: src/file.c:592 src/file.c:831 #, c-format msgid "" " Cannot chmod target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:610 +#: src/file.c:609 #, c-format msgid "" " Cannot open source file \"%s\" \n" " %s " msgstr "" -#: src/file.c:620 +#: src/file.c:619 msgid " Reget failed, about to overwrite file " msgstr "" -#: src/file.c:626 +#: src/file.c:625 #, c-format msgid "" " Cannot fstat source file \"%s\" \n" " %s " msgstr "" -#: src/file.c:652 +#: src/file.c:651 #, c-format msgid "" " Cannot create target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:666 +#: src/file.c:665 #, c-format msgid "" " Cannot fstat target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:697 +#: src/file.c:696 #, c-format msgid "" " Cannot read source file \"%s\" \n" " %s " msgstr "" -#: src/file.c:727 +#: src/file.c:726 #, c-format msgid "" " Cannot write target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:746 +#: src/file.c:745 msgid "(stalled)" msgstr "" -#: src/file.c:784 +#: src/file.c:783 #, c-format msgid "" " Cannot close source file \"%s\" \n" " %s " msgstr "" -#: src/file.c:793 +#: src/file.c:792 #, c-format msgid "" " Cannot close target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:803 +#: src/file.c:802 msgid "Incomplete file was retrieved. Keep it?" msgstr "" -#: src/file.c:804 +#: src/file.c:803 msgid "&Delete" msgstr "" -#: src/file.c:804 src/hotlist.c:1443 +#: src/file.c:803 src/hotlist.c:1443 msgid "&Keep" msgstr "" -#: src/file.c:877 +#: src/file.c:876 #, c-format msgid "" " Cannot stat source directory \"%s\" \n" " %s " msgstr "" -#: src/file.c:900 +#: src/file.c:899 #, c-format msgid "" " Source directory \"%s\" is not a directory \n" @@ -3114,21 +3124,21 @@ msgstr "" #. we found a cyclic symbolic link -#: src/file.c:908 +#: src/file.c:907 #, c-format msgid "" " Cannot copy cyclic symbolic link \n" " `%s' " msgstr "" -#: src/file.c:965 +#: src/file.c:964 #, c-format msgid "" " Cannot create target directory \"%s\" \n" " %s " msgstr "" -#: src/file.c:988 +#: src/file.c:987 #, c-format msgid "" " Cannot chown target directory \"%s\" \n" @@ -3136,69 +3146,69 @@ msgstr "" #. Source doesn't exist -#: src/file.c:1101 +#: src/file.c:1100 #, c-format msgid "" " Cannot stat file \"%s\" \n" " %s " msgstr "" -#: src/file.c:1123 +#: src/file.c:1122 #, c-format msgid " `%s' and `%s' are the same file " msgstr "" -#: src/file.c:1130 +#: src/file.c:1129 #, c-format msgid " Cannot overwrite directory `%s' " msgstr "" -#: src/file.c:1173 +#: src/file.c:1172 #, c-format msgid "" " Cannot move file \"%s\" to \"%s\" \n" " %s " msgstr "" -#: src/file.c:1193 +#: src/file.c:1192 #, c-format msgid "" " Cannot remove file \"%s\" \n" " %s " msgstr "" -#: src/file.c:1247 +#: src/file.c:1246 #, c-format msgid " Cannot overwrite directory \"%s\" %s " msgstr "" -#: src/file.c:1249 +#: src/file.c:1248 #, c-format msgid " Cannot overwrite file \"%s\" %s " msgstr "" -#: src/file.c:1276 +#: src/file.c:1275 #, c-format msgid "" " Cannot move directory \"%s\" to \"%s\" \n" " %s " msgstr "" -#: src/file.c:1339 +#: src/file.c:1338 #, c-format msgid "" " Cannot delete file \"%s\" \n" " %s " msgstr "" -#: src/file.c:1400 src/file.c:1470 src/file.c:1502 +#: src/file.c:1399 src/file.c:1469 src/file.c:1501 #, c-format msgid "" " Cannot remove directory \"%s\" \n" " %s " msgstr "" -#: src/file.c:1541 +#: src/file.c:1540 msgid " Internal error: get_file \n" msgstr "" @@ -3211,136 +3221,136 @@ #. * (I don't use spaces around the words, because someday they could be #. * dropped, when widgets get smarter) #. -#: src/file.c:1662 +#: src/file.c:1661 msgid "1Copy" msgstr "" -#: src/file.c:1662 +#: src/file.c:1661 msgid "1Move" msgstr "" -#: src/file.c:1662 +#: src/file.c:1661 msgid "1Delete" msgstr "" -#: src/file.c:1677 +#: src/file.c:1676 #, c-format msgid "%o %f \"%s\"%m" msgstr "" -#: src/file.c:1678 +#: src/file.c:1677 #, c-format msgid "%o %d %f%m" msgstr "" -#: src/file.c:1680 +#: src/file.c:1679 #, c-format msgid "%o %f \"%s\"%e" msgstr "" -#: src/file.c:1681 +#: src/file.c:1680 #, c-format msgid "%o %d %f%e" msgstr "" -#: src/file.c:1685 +#: src/file.c:1684 msgid "file" msgstr "" -#: src/file.c:1685 +#: src/file.c:1684 msgid "files" msgstr "" -#: src/file.c:1685 +#: src/file.c:1684 msgid "directory" msgstr "" -#: src/file.c:1685 +#: src/file.c:1684 msgid "directories" msgstr "" -#: src/file.c:1686 +#: src/file.c:1685 msgid "files/directories" msgstr "" -#: src/file.c:1686 +#: src/file.c:1685 msgid " with source mask:" msgstr "" -#: src/file.c:1838 +#: src/file.c:1837 msgid " Can't operate on \"..\"! " msgstr "" -#: src/file.c:1857 +#: src/file.c:1856 msgid "Yes" msgstr "" -#: src/file.c:1857 +#: src/file.c:1856 msgid "No" msgstr "" -#: src/file.c:1910 +#: src/file.c:1909 msgid " Sorry, I could not put the job in background " msgstr "" -#: src/file.c:1997 src/file.c:2081 +#: src/file.c:1996 src/file.c:2080 msgid " Internal failure " msgstr "" -#: src/file.c:1997 src/file.c:2081 +#: src/file.c:1996 src/file.c:2080 msgid " Unknown file operation " msgstr "" -#: src/file.c:2012 +#: src/file.c:2011 #, c-format msgid "" " Destination \"%s\" must be a directory \n" " %s " msgstr "" -#: src/file.c:2173 +#: src/file.c:2172 msgid "&Retry" msgstr "" -#: src/file.c:2173 src/file.c:2234 src/filegui.c:263 src/filegui.c:591 +#: src/file.c:2172 src/file.c:2233 src/filegui.c:263 src/filegui.c:591 msgid "&Abort" msgstr "" -#: src/file.c:2225 +#: src/file.c:2224 msgid "" "\n" " Directory not empty. \n" " Delete it recursively? " msgstr "" -#: src/file.c:2226 +#: src/file.c:2225 msgid "" "\n" " Background process: Directory not empty \n" " Delete it recursively? " msgstr "" -#: src/file.c:2233 +#: src/file.c:2232 msgid "a&ll" msgstr "" -#: src/file.c:2233 src/filegui.c:594 +#: src/file.c:2232 src/filegui.c:594 msgid "non&E" msgstr "" -#: src/file.c:2243 +#: src/file.c:2242 msgid " Type 'yes' if you REALLY want to delete " msgstr "" -#: src/file.c:2245 +#: src/file.c:2244 msgid "all the directories " msgstr "" -#: src/file.c:2247 +#: src/file.c:2246 msgid " Recursive Delete " msgstr "" -#: src/file.c:2248 +#: src/file.c:2247 msgid " Background process: Recursive Delete " msgstr "" @@ -4293,7 +4303,7 @@ " the details. " msgstr "" -#: src/main.c:1689 src/screen.c:2291 src/screen.c:2321 +#: src/main.c:1689 src/screen.c:2305 src/screen.c:2335 msgid "Menu" msgstr "" @@ -4426,11 +4436,19 @@ "On some systems you may want to run # `which mc`\n" msgstr "" -#: src/main.c:3061 +#: src/main.c:3063 +msgid "" +"You are running the GNOME Midnight Commander as root. \n" +"\n" +"You will not be protected from severly damaging your system\n" +"if you continue." +msgstr "" + +#: src/main.c:3073 msgid " Notice " msgstr "" -#: src/main.c:3062 +#: src/main.c:3074 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -4639,27 +4657,27 @@ msgid " %s bytes in %d file%s" msgstr "" -#: src/screen.c:1292 +#: src/screen.c:1306 msgid "Unknow tag on display format: " msgstr "" -#: src/screen.c:2054 +#: src/screen.c:2068 msgid " Do you really want to execute? " msgstr "" -#: src/screen.c:2069 +#: src/screen.c:2083 msgid " No action taken " msgstr "" -#: src/screen.c:2295 src/screen.c:2325 src/tree.c:1026 +#: src/screen.c:2309 src/screen.c:2339 src/tree.c:1026 msgid "RenMov" msgstr "" -#: src/screen.c:2296 src/screen.c:2326 src/tree.c:1030 +#: src/screen.c:2310 src/screen.c:2340 src/tree.c:1030 msgid "Mkdir" msgstr "" -#: src/screen.c:2312 +#: src/screen.c:2326 #, c-format msgid "" " Can't chdir to %s \n" @@ -4792,7 +4810,7 @@ msgid " User menu " msgstr "" -#: src/util.c:222 +#: src/util.c:228 msgid "name_trunc: too big" msgstr "" @@ -5126,18 +5144,6 @@ #: src/win.c:272 msgid "NumLock on keypad" -msgstr "" - -#: src/wtools.c:587 vfs/vfs.c:1762 -msgid "Password:" -msgstr "" - -#: src/wtools.c:587 -msgid "Password" -msgstr "" - -#: src/wtools.c:642 -msgid "Ok" msgstr "" #: vfs/extfs.c:266 diff -ruN old/mc-4.5.26/src/ChangeLog new/mc-4.5.27/src/ChangeLog --- old/mc-4.5.26/src/ChangeLog Sun Mar 14 19:19:36 1999 +++ new/mc-4.5.27/src/ChangeLog Thu Mar 18 20:42:30 1999 @@ -1,3 +1,37 @@ +1999-03-18 Miguel de Icaza + + * utilunix.c (close_error_pipe): Inform parent of the return value + of any command here. This allows the desktop to launch a terminal + only if it succeeded in mounting the directory. + +Thu Mar 18 16:09:09 1999 Timur Bakeyev + + * panel.h, screen.c: Add an ability to center justify fields in + panel, in addition to left and right justificatin. Just for fun. + Try =name in user format. + + * util.c (name_quote): Quote "~@^|;:". Hope, that's all :) + +1999-03-17 Jonathan Blandford + + * main.c (main): Put in a warning when run as root. + +1999-03-15 Federico Mena Quintero + + * boxes.c (symlink_dialog): Put this inside an "#ifndef + HAVE_GNOME" since we now provide a nicer version of the dialog. + + * wtools.c (real_input_dialog_help): Removed un-needed #ifdef. + + * cmd.c (edit_symlink_cmd): Generate the title of the dialog after + we have computed the source filename. + (edit_symlink_cmd): Use g_strdup_printf() instead of g_strconcat() + for better internationalization. + + * wtools.c: Removed unused function input_dialog_help_2(). + (real_input_dialog_help): Put this inside an "#ifndef HAVE_GNOME", + because now the Gnome version implements its own pretty dialog. + 1999-03-14 Miguel de Icaza * dlg.c (dlg_select_nth_widget): Handle the case where h->current diff -ruN old/mc-4.5.26/src/boxes.c new/mc-4.5.27/src/boxes.c --- old/mc-4.5.26/src/boxes.c Sun Mar 14 19:19:31 1999 +++ new/mc-4.5.27/src/boxes.c Thu Mar 18 20:42:30 1999 @@ -769,14 +769,14 @@ return 0; } +#ifndef HAVE_GNOME void -symlink_dialog (char *existing, char *new, char **ret_existing, - char **ret_new) +symlink_dialog (char *existing, char *new, char **ret_existing, char **ret_new) { QuickDialog Quick_input; QuickWidget quick_widgets [] = { #undef INPUT_INDEX -#if defined(HAVE_TK) || defined(HAVE_GNOME) +#if defined(HAVE_TK) #define INPUT_INDEX 2 { quick_button, 0, 1, 0, 1, _("&Cancel"), 0, B_CANCEL, 0, 0, XV_WLAY_DONTCARE, "cancel" }, @@ -811,6 +811,7 @@ *ret_existing = NULL; } } +#endif #ifdef WITH_BACKGROUND #define B_STOP B_USER+1 diff -ruN old/mc-4.5.26/src/cmd.c new/mc-4.5.27/src/cmd.c --- old/mc-4.5.26/src/cmd.c Sun Mar 14 19:19:32 1999 +++ new/mc-4.5.27/src/cmd.c Thu Mar 18 20:42:30 1999 @@ -168,13 +168,13 @@ return move_dir; } if (internal){ - char view_entry [BUF_TINY]; - #ifdef HAVE_GNOME if (!gmc_view (filename, start_line)){ view (0, filename, &move_dir, start_line); } #else + char view_entry [BUF_TINY]; + if (start_line != 0) g_snprintf (view_entry, sizeof (view_entry), "View:%d", start_line); else @@ -1114,7 +1114,7 @@ char buffer [MC_MAXPATHLEN]; char *p = NULL; int i; - char *dest, *q = g_strconcat (_(" Symlink "), name_trunc (p, 32), _(" points to:"), NULL); + char *dest, *q; if (is_a_desktop_panel (cpanel)) { gint i; @@ -1126,6 +1126,9 @@ } else { p = selection (cpanel)->fname; } + + q = g_strdup_printf (_(" Symlink `%s\' points to: "), name_trunc (p, 32)); + i = readlink (p, buffer, MC_MAXPATHLEN); if (i > 0) { buffer [i] = 0; diff -ruN old/mc-4.5.26/src/file.c new/mc-4.5.27/src/file.c --- old/mc-4.5.26/src/file.c Sun Mar 14 19:19:31 1999 +++ new/mc-4.5.27/src/file.c Thu Mar 18 20:42:29 1999 @@ -107,7 +107,7 @@ /* }}} */ -/* rcsid [] = "$Id: file.c,v 1.53 1999/03/13 01:02:36 unammx Exp $" */ +/* rcsid [] = "$Id: file.c,v 1.56 1999/03/16 00:11:41 unammx Exp $" */ int verbose = 1; @@ -461,10 +461,8 @@ /* Apply some heuristic here to not call the update stuff very often */ ret = file_progress_show_count (ctx, *progress_count, ctx->progress_count); - if (ret != FILE_CONT) return ret; - ret = file_progress_show_bytes (ctx, *progress_bytes, ctx->progress_bytes); return ret; @@ -502,6 +500,7 @@ if (file_progress_show_source (ctx, src_path) == FILE_ABORT || file_progress_show_target (ctx, dst_path) == FILE_ABORT) return FILE_ABORT; + mc_refresh (); retry_dst_stat: @@ -1821,7 +1820,7 @@ int i, value; FileOpContext *ctx; - long count = 0; + long count = 0; double bytes = 0; int dst_result; diff -ruN old/mc-4.5.26/src/main.c new/mc-4.5.27/src/main.c --- old/mc-4.5.26/src/main.c Sun Mar 14 19:19:30 1999 +++ new/mc-4.5.27/src/main.c Thu Mar 18 20:42:29 1999 @@ -139,7 +139,7 @@ #include "popt.h" -/* "$Id: main.c,v 1.84 1999/03/11 02:00:33 unammx Exp $" */ +/* "$Id: main.c,v 1.86 1999/03/18 18:44:02 unammx Exp $" */ /* When the modes are active, left_panel, right_panel and tree_panel */ /* Point to a proper data structure. You should check with the functions */ @@ -2751,7 +2751,7 @@ gtk_widget_push_visual (gdk_imlib_get_visual ()); gtk_widget_push_colormap (gdk_imlib_get_colormap ()); - poptResetContext (ctx); +/* poptResetContext (ctx); */ #else ctx = poptGetContext ("mc", argc, argv, argument_table, 0); #endif @@ -3056,7 +3056,19 @@ if (alternate_plus_minus) application_keypad_mode (); # endif - +/* INSERT ROOT DIALOG HERE */ +#ifdef HAVE_GNOME + if (geteuid () == 0) { + GtkWidget *warning_dlg; + warning_dlg = gnome_message_box_new (_("You are running the GNOME Midnight Commander as root. \n\n" + "You will not be protected from severly damaging your system\n" + "if you continue."), + GNOME_MESSAGE_BOX_WARNING, + _("Continue"), GNOME_STOCK_BUTTON_CANCEL, NULL); + if (gnome_dialog_run (GNOME_DIALOG (warning_dlg)) != 0) + exit (0); + } +#endif if (show_change_notice){ message (1, _(" Notice "), _(" The Midnight Commander configuration files \n" diff -ruN old/mc-4.5.26/src/panel.h new/mc-4.5.27/src/panel.h --- old/mc-4.5.26/src/panel.h Sun Mar 14 19:19:29 1999 +++ new/mc-4.5.27/src/panel.h Thu Mar 18 20:42:28 1999 @@ -37,6 +37,7 @@ #define J_CENTER 3 #define IS_FIT(x) ((x) & 0x0004) +#define MAKE_FIT(x) ((x) | 0x0004) #define HIDE_FIT(x) ((x) & 0x0003) #define J_LEFT_FIT 5 diff -ruN old/mc-4.5.26/src/screen.c new/mc-4.5.27/src/screen.c --- old/mc-4.5.26/src/screen.c Sun Mar 14 19:19:30 1999 +++ new/mc-4.5.27/src/screen.c Thu Mar 18 20:42:29 1999 @@ -1221,9 +1221,21 @@ format = skip_separators (format); - if (*format == '<' || *format == '>'){ + if (strchr ("<=>", *format)){ set_justify = 1; - justify = *format == '<' ? J_LEFT : J_RIGHT; + switch (*format) + { + case '<': + justify = J_LEFT; + break; + case '=': + justify = J_CENTER; + break; + case '>': + default: + justify = J_RIGHT; + break; + } format = skip_separators (format+1); } else set_justify = 0; @@ -1248,12 +1260,14 @@ darr->title = ""; darr->id = formats [i].id; darr->expand = formats [i].expands; + darr->just_mode = formats [i].default_just; if (set_justify) - darr->just_mode = justify; - else - darr->just_mode = formats [i].default_just; - + if (IS_FIT(darr->just_mode)) + darr->just_mode = MAKE_FIT(justify); + else + darr->just_mode = justify; + found = 1; format = skip_separators (format); diff -ruN old/mc-4.5.26/src/subshell.c new/mc-4.5.27/src/subshell.c --- old/mc-4.5.26/src/subshell.c Sun Mar 14 19:19:31 1999 +++ new/mc-4.5.27/src/subshell.c Thu Mar 18 20:42:30 1999 @@ -1119,7 +1119,7 @@ return -1; } -#if !defined(__osf__) +#if !defined(__osf__) && !defined(linux) && !defined(__linux__) #if defined (I_FIND) && defined (I_PUSH) if (!ioctl (pty_slave, I_FIND, "ptem")) if (ioctl (pty_slave, I_PUSH, "ptem") == -1) @@ -1147,7 +1147,7 @@ } #endif /* sgi || __sgi */ #endif /* I_FIND && I_PUSH */ -#endif /* __osf__ */ +#endif /* __osf__ || linux || __linux__ */ return pty_slave; } diff -ruN old/mc-4.5.26/src/util.c new/mc-4.5.27/src/util.c --- old/mc-4.5.26/src/util.c Sun Mar 14 19:19:30 1999 +++ new/mc-4.5.27/src/util.c Thu Mar 18 20:42:29 1999 @@ -76,7 +76,7 @@ #include "user.h" /* expand_format */ #include "../vfs/vfs.h" -/* "$Id: util.c,v 1.21 1999/03/10 21:56:21 norbert Exp $" */ +/* "$Id: util.c,v 1.22 1999/03/18 13:40:26 timur Exp $" */ char app_text [] = "Midnight-Commander"; @@ -174,23 +174,29 @@ case '\r': case '\n': case '\t': - case '$': + case '"': + case ':': + case ';': + case ' ': case '?': - case '*': - case '(': - case ')': + case '|': case '[': case ']': case '{': case '}': case '<': case '>': - case '"': + case '`': + case '~': case '!': - case '&': + case '@': case '#': - case '`': - case ' ': + case '$': + case '^': + case '&': + case '*': + case '(': + case ')': *d++ = '\\'; } *d = *s; diff -ruN old/mc-4.5.26/src/util.h new/mc-4.5.27/src/util.h --- old/mc-4.5.26/src/util.h Sun Mar 14 19:19:29 1999 +++ new/mc-4.5.27/src/util.h Thu Mar 18 20:42:28 1999 @@ -102,7 +102,7 @@ /* Error pipes */ void open_error_pipe (void); void check_error_pipe (void); -void close_error_pipe (int error, char *text); +int close_error_pipe (int error, char *text); /* Process spawning */ void my_putenv (char*, char*); diff -ruN old/mc-4.5.26/src/utilunix.c new/mc-4.5.27/src/utilunix.c --- old/mc-4.5.26/src/utilunix.c Sun Mar 14 19:19:32 1999 +++ new/mc-4.5.27/src/utilunix.c Thu Mar 18 20:42:30 1999 @@ -396,7 +396,11 @@ close (error_pipe[1]); } -void close_error_pipe (int error, char *text) +/* + * Returns true if an error was displayed + */ +int +close_error_pipe (int error, char *text) { char *title; char msg[MAX_PIPE_SIZE]; @@ -417,9 +421,9 @@ close (error_pipe[0]); } if (error < 0) - return; /* Just ignore error message */ + return 0; /* Just ignore error message */ if (text == NULL){ - if (len == 0) return; /* Nothing to show */ + if (len == 0) return 0; /* Nothing to show */ /* Show message from pipe */ message (error, title, msg); @@ -427,6 +431,7 @@ /* Show given text and possible message from pipe */ message (error, title, " %s \n %s ", text, msg); } + return 1; } /* Checks for messages in the error pipe, diff -ruN old/mc-4.5.26/src/wtools.c new/mc-4.5.27/src/wtools.c --- old/mc-4.5.26/src/wtools.c Sun Mar 14 19:19:31 1999 +++ new/mc-4.5.27/src/wtools.c Thu Mar 18 20:42:30 1999 @@ -28,7 +28,7 @@ /* }}} */ -/* [] = "$Id: wtools.c,v 1.14 1999/01/27 01:09:43 timur Exp $" */ +/* [] = "$Id: wtools.c,v 1.16 1999/03/16 20:46:57 unammx Exp $" */ #include #include @@ -551,6 +551,8 @@ /* }}} */ /* {{{ Input routines */ + +#ifndef HAVE_GNOME #define INPUT_INDEX 2 char *real_input_dialog_help (char *header, char *text, char *help, char *def_text) { @@ -573,11 +575,7 @@ /* we need a unique name for tkname because widget.c:history_tool() needs a unique name for each dialog - using the header is ideal */ -#ifdef HAVE_GNOME - strncpy (tk_name + 4, header, 59); -#else strncpy (tk_name + 3, header, 60); -#endif tk_name[63] = '\0'; quick_widgets[2].tkname = tk_name; @@ -626,70 +624,11 @@ } else return 0; } +#endif char *input_dialog (char *header, char *text, char *def_text) { return input_dialog_help (header, text, "[Input Line Keys]", def_text); -} - -static int -input_dialog_help_2 (char *header, char *text1, char *text2, char *help, char **r1, char **r2) -{ - QuickDialog Quick_input; - QuickWidget quick_widgets [] = { - { quick_button, 6, 10, 4, 0, N_("&Cancel"), 0, B_CANCEL, 0, 0, - XV_WLAY_DONTCARE, "button-cancel" }, - { quick_button, 3, 10, 4, 0, N_("Ok") -, 0, B_ENTER, 0, 0, - XV_WLAY_DONTCARE, "button-ok" }, - { quick_input, 4, 80, 4, 0, "", 58, 0, 0, 0, XV_WLAY_BELOWCLOSE, "input-pth" }, - { quick_label, 3, 80, 3, 0, "", 0, 0, 0, 0, XV_WLAY_DONTCARE, "label-pth" }, - { quick_input, 4, 80, 3, 0, "", 58, 0, 0, 0, XV_WLAY_BELOWCLOSE, "input-lbl" }, - { quick_label, 3, 80, 2, 0, "", 0, 0, 0, 0, XV_WLAY_DONTCARE, "label-lbl" }, - { 0 } }; - - int len; - int i; - int lines1, lines2; - char *my_str1, *my_str2; - - len = max (strlen (header), msglen (text1, &lines1)); - len = max (len, msglen (text2, &lines2)) + 4; - len = max (len, 64); - - Quick_input.xlen = len; - Quick_input.xpos = -1; - Quick_input.title = header; - Quick_input.help = help; - Quick_input.class = "quick_input_2"; - Quick_input.i18n = 0; - quick_widgets [5].text = text1; - quick_widgets [3].text = text2; - - for (i = 0; i < 6; i++) - quick_widgets [i].y_divisions = lines1+lines2+7; - Quick_input.ylen = lines1 + lines2 + 7; - - quick_widgets [0].relative_y += (lines1 + lines2); - quick_widgets [1].relative_y += (lines1 + lines2); - quick_widgets [2].relative_y += (lines1); - quick_widgets [3].relative_y += (lines1); - - quick_widgets [4].str_result = &my_str1; - quick_widgets [2].str_result = &my_str2; - - Quick_input.widgets = quick_widgets; - if (quick_dialog (&Quick_input) != B_CANCEL){ - *r1 = *(quick_widgets [4].str_result); - *r2 = *(quick_widgets [2].str_result); - return 1; - } else - return 0; -} - -int input_dialog_2 (char *header, char *text1, char *text2, char **r1, char **r2) -{ - return input_dialog_help_2 (header, text1, text2, "[Input Line Keys]", r1, r2); } char *input_expand_dialog (char *header, char *text, char *def_text) diff -ruN old/mc-4.5.26/src/wtools.h new/mc-4.5.27/src/wtools.h --- old/mc-4.5.26/src/wtools.h Sun Mar 14 19:19:29 1999 +++ new/mc-4.5.27/src/wtools.h Thu Mar 18 20:42:29 1999 @@ -79,7 +79,6 @@ /* The input dialogs */ char *input_dialog (char *header, char *text, char *def_text); -int input_dialog_2 (char *header, char *text1, char *text2, char **r1, char **r2); char *input_dialog_help (char *header, char *text, char *help, char *def_text); char *input_expand_dialog (char *header, char *text, char *def_text); char *real_input_dialog (char *header, char *text, char *def_text);