diff -ruN old/mc-4.5.18/Make.common.in new/mc-4.5.19/Make.common.in --- old/mc-4.5.18/Make.common.in Tue Feb 23 21:41:22 1999 +++ new/mc-4.5.19/Make.common.in Thu Feb 25 00:13:12 1999 @@ -25,6 +25,7 @@ gnewdir = $(prefix)/share/mc/templates tidir = $(libdir)/term extfsdir = $(libdir)/extfs +confdir = $(prefix)/etc datadir = @datadir@ icondir = $(datadir)/pixmaps/mc gnomeicondir = @gnomeicondir@ @@ -59,7 +60,7 @@ # No way, to make make happy (except GNU), we cannot use := to append # something to these, so that's why there is a leading _ XCFLAGS = @CFLAGS@ -XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" +XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" -DCONFDIR=\""$(confdir)/"\" XLDFLAGS = @LDFLAGS@ XDEFS = @DEFS@ XLIBS = @LIBS@ diff -ruN old/mc-4.5.18/Specfile new/mc-4.5.19/Specfile --- old/mc-4.5.18/Specfile Tue Feb 23 21:41:22 1999 +++ new/mc-4.5.19/Specfile Thu Feb 25 00:13:12 1999 @@ -1,5 +1,5 @@ # Note that this is NOT a relocatable package -%define ver 4.5.18 +%define ver 4.5.19 %define prefix /usr Summary: Midnight Commander visual shell diff -ruN old/mc-4.5.18/VERSION new/mc-4.5.19/VERSION --- old/mc-4.5.18/VERSION Tue Feb 23 21:41:22 1999 +++ new/mc-4.5.19/VERSION Thu Feb 25 00:13:12 1999 @@ -1 +1 @@ -#define VERSION "4.5.18" +#define VERSION "4.5.19" diff -ruN old/mc-4.5.18/configure new/mc-4.5.19/configure --- old/mc-4.5.18/configure Tue Feb 23 21:41:22 1999 +++ new/mc-4.5.19/configure Thu Feb 25 00:13:12 1999 @@ -586,7 +586,7 @@ PACKAGE=mc -VERSION=4.5.18 +VERSION=4.5.19 cat >> confdefs.h < + + * gmount.c (desktop_cleanup_devices): Export this routine now and + call it from gdeskop instead of overloading gmount_setup_devices. + + * gprint.c: Sample file, it uses an externally provided program + (not in 1.0 so far) to setup printer devices. + + * gmount.c (gmount_setup_devices): No longer cleans up here. + + * gicon.c (gicon_get_filename_for_icon): Return const char *, this + tells the user of this routine "you better not touch or free this + you dofus". + + * gnome-file-property-dialog.c (apply_metadata_change): Always set + the name of the icon to the new value, as the entry will always + match the imlib image anyways (due to the fixes I did to const + correctness). + (generate_icon_sel): Do not free the value. We do not own this + return value. + + * gdesktop.c (is_mountable): NULL terminate string returned from + readlink. Yes guys, readlink does not NULL terminate things. + (do_mount_umount): ditto. + + * gnome-file-property-dialog.c (init_metadata): ditto + Tue Feb 23 17:41:45 1999 George Lebl * gmain.c: set the restart property of the gnome client to diff -ruN old/mc-4.5.18/gnome/Makefile.in new/mc-4.5.19/gnome/Makefile.in --- old/mc-4.5.18/gnome/Makefile.in Tue Feb 23 21:41:27 1999 +++ new/mc-4.5.19/gnome/Makefile.in Thu Feb 25 00:13:17 1999 @@ -51,6 +51,7 @@ gpopup.c \ gpopup2.c \ gprefs.c \ + gprint.c \ gprop.c \ gnome-file-property-dialog.c \ gscreen.c \ @@ -151,6 +152,7 @@ gpopup.o \ gpopup2.o \ gprefs.o \ + gprint.o \ gprop.o \ gnome-file-property-dialog.o \ gscreen.o \ diff -ruN old/mc-4.5.18/gnome/gdesktop.c new/mc-4.5.19/gnome/gdesktop.c --- old/mc-4.5.18/gnome/gdesktop.c Tue Feb 23 21:41:27 1999 +++ new/mc-4.5.19/gnome/gdesktop.c Thu Feb 25 00:13:19 1999 @@ -914,7 +914,8 @@ char buffer [128], *p; umode_t mode; struct stat s; - + int len; + if (point) *point = NULL; @@ -928,9 +929,11 @@ if (!S_ISBLK (mode)) return FALSE; - if (readlink (filename, buffer, sizeof (buffer)) == -1) + len = readlink (filename, buffer, sizeof (buffer)); + if (len == -1) return FALSE; - + buffer [len] = 0; + p = is_block_device_mountable (buffer); if (!p) return FALSE; @@ -952,7 +955,8 @@ static char *umount_command; char *op; char buffer [128]; - + int count; + if (is_mount){ if (!mount_command) mount_command = find_command (mount_known_locations); @@ -963,8 +967,10 @@ op = umount_command; } - if (readlink (filename, buffer, sizeof (buffer)) == -1) + count = readlink (filename, buffer, sizeof (buffer)); + if (count == -1) return FALSE; + buffer [count] = 0; if (op){ char *command; @@ -1814,7 +1820,7 @@ } g_free (home_link_name); - gmount_setup_devices (FALSE); + gmount_setup_devices (); } } @@ -2117,7 +2123,9 @@ void desktop_rescan_devices (void) { - gmount_setup_devices (TRUE); + desktop_cleanup_devices (); + gmount_setup_devices (); + gprint_setup_devices (); desktop_reload_icons (FALSE, 0, 0); } diff -ruN old/mc-4.5.18/gnome/gicon.c new/mc-4.5.19/gnome/gicon.c --- old/mc-4.5.18/gnome/gicon.c Tue Feb 23 21:41:27 1999 +++ new/mc-4.5.19/gnome/gicon.c Thu Feb 25 00:13:19 1999 @@ -130,7 +130,7 @@ if (iset) return iset; - im = gdk_imlib_load_image (filename); + im = gdk_imlib_load_image ((char *) filename); if (!im) return NULL; @@ -141,7 +141,7 @@ /* Insert the icon information into the hash tables */ - g_hash_table_insert (name_hash, filename, iset); + g_hash_table_insert (name_hash, (char *) filename, iset); g_hash_table_insert (image_hash, iset->plain, iset); return iset; @@ -436,7 +436,7 @@ * * Return value: The filename that contains the icon for the specified image. **/ -char * +const char * gicon_get_filename_for_icon (GdkImlibImage *image) { IconSet *iset; diff -ruN old/mc-4.5.18/gnome/gicon.h new/mc-4.5.19/gnome/gicon.h --- old/mc-4.5.18/gnome/gicon.h Tue Feb 23 21:41:27 1999 +++ new/mc-4.5.19/gnome/gicon.h Thu Feb 25 00:13:19 1999 @@ -17,7 +17,7 @@ void gicon_init (void); GdkImlibImage *gicon_get_icon_for_file (char *directory, file_entry *fe, gboolean do_quick); -char *gicon_get_filename_for_icon (GdkImlibImage *image); +const char *gicon_get_filename_for_icon (GdkImlibImage *image); #endif diff -ruN old/mc-4.5.18/gnome/glayout.c new/mc-4.5.19/gnome/glayout.c --- old/mc-4.5.18/gnome/glayout.c Tue Feb 23 21:41:27 1999 +++ new/mc-4.5.19/gnome/glayout.c Thu Feb 25 00:13:19 1999 @@ -409,7 +409,7 @@ GnomeUIInfo gnome_panel_desktop_menu [] = { GNOMEUIINFO_ITEM_NONE (N_("Arrange Icons"), NULL, desktop_arrange_icons), GNOMEUIINFO_SEPARATOR, - GNOMEUIINFO_ITEM_NONE (N_("Rescan Mountable Devices"), NULL, desktop_rescan_devices), + GNOMEUIINFO_ITEM_NONE (N_("Rescan System Devices"), NULL, desktop_rescan_devices), GNOMEUIINFO_ITEM_NONE (N_("Rescan Desktop"), NULL, do_desktop_rescan_devices), GNOMEUIINFO_END }; diff -ruN old/mc-4.5.18/gnome/gmount.c new/mc-4.5.19/gnome/gmount.c --- old/mc-4.5.18/gnome/gmount.c Tue Feb 23 21:41:27 1999 +++ new/mc-4.5.19/gnome/gmount.c Thu Feb 25 00:13:19 1999 @@ -64,6 +64,7 @@ #endif #ifdef MOUNTED_VMOUNT /* AIX. */ +#include #include #include #endif @@ -202,9 +203,13 @@ #endif -/* Cleans up the desktop directory from device files */ -static void -cleanup_devices (void) +/* + * Cleans up the desktop directory from device files + * + * Includes block devices and printers. + */ +void +desktop_cleanup_devices (void) { DIR *dir; struct dirent *dent; @@ -215,6 +220,7 @@ return; } + gnome_metadata_lock (); while ((dent = mc_readdir (dir)) != NULL) { char *full_name; char *buf; @@ -228,7 +234,8 @@ } g_free (full_name); } - + gnome_metadata_unlock (); + mc_closedir (dir); } @@ -237,6 +244,7 @@ create_device_link (char *dev_name, char *short_dev_name, char *caption, char *icon) { char *full_name; + char type = 'D'; full_name = g_concat_dir_and_file (desktop_directory, short_dev_name); if (mc_symlink (dev_name, full_name) != 0) { @@ -250,7 +258,7 @@ gnome_metadata_set (full_name, "icon-filename", strlen (icon) + 1, icon); gnome_metadata_set (full_name, "icon-caption", strlen (caption) + 1, caption); - gnome_metadata_set (full_name, "is-desktop-device", 1, full_name); /* hack a boolean value */ + gnome_metadata_set (full_name, "is-desktop-device", 1, &type); /* hack a boolean value */ g_free (full_name); } @@ -308,10 +316,8 @@ } void -gmount_setup_devices (int cleanup) +gmount_setup_devices (void) { - if (cleanup) - cleanup_devices (); - setup_devices (); } + diff -ruN old/mc-4.5.18/gnome/gmount.h new/mc-4.5.19/gnome/gmount.h --- old/mc-4.5.18/gnome/gmount.h Tue Feb 23 21:41:27 1999 +++ new/mc-4.5.19/gnome/gmount.h Thu Feb 25 00:13:19 1999 @@ -11,7 +11,8 @@ #include -void gmount_setup_devices (int cleanup); +void gmount_setup_devices (void); +void desktop_cleanup_devices (void); char *is_block_device_mountable (char *devname); gboolean is_block_device_mounted (char *devname); diff -ruN old/mc-4.5.18/gnome/gnome-file-property-dialog.c new/mc-4.5.19/gnome/gnome-file-property-dialog.c --- old/mc-4.5.18/gnome/gnome-file-property-dialog.c Tue Feb 23 21:41:27 1999 +++ new/mc-4.5.19/gnome/gnome-file-property-dialog.c Thu Feb 25 00:13:19 1999 @@ -211,6 +211,7 @@ if (n < 0) label = gtk_label_new (_("Target Name: INVALID LINK")); else { + buf [n] = 0; gen_string = g_strconcat (_("Target Name: "), buf, NULL); label = gtk_label_new (gen_string); g_free (gen_string); @@ -433,7 +434,7 @@ generate_icon_sel (GnomeFilePropertyDialog *fp_dlg) { GtkWidget *retval; - gchar *icon; + const gchar *icon; retval = gnome_icon_entry_new ("gmc_file_icon", "Select an Icon"); icon = gicon_get_filename_for_icon (fp_dlg->im); @@ -441,11 +442,9 @@ return retval; if (!icon[0]){ - g_free (icon); return retval; } gnome_icon_entry_set_icon (GNOME_ICON_ENTRY (retval), icon); - g_free (icon); return retval; } @@ -962,8 +961,10 @@ file_name = fp_dlg->file_name; if (S_ISLNK (fp_dlg->st.st_mode)) { n = mc_readlink (fp_dlg->file_name, link_name, MC_MAXPATHLEN); - if (n > 0) + if (n > 0){ + link_name [n] = 0; file_name = link_name; + } } if (gnome_metadata_get (fp_dlg->file_name, "desktop-url", &size, &desktop_url) == 0) @@ -1281,22 +1282,9 @@ /* And finally, we set the metadata on the icon filename */ text = gnome_icon_entry_get_filename (GNOME_ICON_ENTRY (fpd->button)); /*gtk_entry_get_text (GTK_ENTRY (gnome_icon_entry_gtk_entry (GNOME_ICON_ENTRY (fpd->button))));*/ - - icon_name = gicon_get_filename_for_icon (fpd->im); + if (text) { - if (strcmp (text, icon_name)) - /* FIXME: We make a big assumption here. If the file doesn't exist, it will - * default to the basic icon. We prolly should check that this is a valid - * file here, but I'm too tired to do it now -- jrb */ - gnome_metadata_set (fpd->file_name, "icon-filename", strlen (text) + 1, text); - else { - /* If text is equal to icon_name it means the user did not - * touch it, not that he did remove it - */ - /* - gnome_metadata_remove (fpd->file_name, "icon-filename"); - */ - } + gnome_metadata_set (fpd->file_name, "icon-filename", strlen (text) + 1, text); g_free (text); } /* I suppose we should only do this if we know there's been a change -- I'll try to figure it diff -ruN old/mc-4.5.18/gnome/gpageprop.c new/mc-4.5.19/gnome/gpageprop.c --- old/mc-4.5.18/gnome/gpageprop.c Tue Feb 23 21:41:27 1999 +++ new/mc-4.5.19/gnome/gpageprop.c Thu Feb 25 00:13:19 1999 @@ -94,6 +94,7 @@ file_entry *fe; char *dirname; char *p; + const char *ifile; p = strrchr (fname, PATH_SEP); g_assert (p != NULL); @@ -103,9 +104,11 @@ icon = gicon_get_icon_for_file (dirname, fe, FALSE); g_free (dirname); file_entry_free (fe); - icon_filename = gicon_get_filename_for_icon (icon); - if (icon_filename == NULL) + ifile = gicon_get_filename_for_icon (icon); + if (ifile == NULL) icon_filename = g_strdup (ICONDIR "i-regular.png"); + else + icon_filename = g_strdup (ifile); gene = gprop_general_new (fname, icon_filename); diff -ruN old/mc-4.5.18/gnome/gprint.c new/mc-4.5.19/gnome/gprint.c --- old/mc-4.5.18/gnome/gprint.c Wed Dec 31 19:00:00 1969 +++ new/mc-4.5.19/gnome/gprint.c Thu Feb 25 00:13:19 1999 @@ -0,0 +1,35 @@ +/* + * + * Copyright (C) 1998-1999 The Free Software Foundation + * + * Authors: Miguel de Icaza + */ + +#include +#include "main.h" +#include "util.h" +#include +#include "gdesktop.h" + +void +gprint_setup_devices (void) +{ + static char *gprint_path; + char *desktop_quoted; + char *command; + + if (!gprint_path) + gprint_path = gnome_is_program_in_path ("g-print"); + + if (!gprint_path) + return; + + desktop_quoted = name_quote (desktop_directory, 0); + command = g_strconcat (gprint_path, " --create-printers ", desktop_quoted, NULL); + g_free (desktop_quoted); + + my_system (EXECUTE_WAIT | EXECUTE_AS_SHELL, shell, command); + g_free (command); +} + + diff -ruN old/mc-4.5.18/gnome/gprop.c new/mc-4.5.19/gnome/gprop.c --- old/mc-4.5.18/gnome/gprop.c Tue Feb 23 21:41:27 1999 +++ new/mc-4.5.19/gnome/gprop.c Thu Feb 25 00:13:19 1999 @@ -37,7 +37,7 @@ /***** Filename *****/ GpropFilename * -gprop_filename_new (char *complete_filename, char *filename) +gprop_filename_new (const char *complete_filename, const char *filename) { GpropFilename *gp; GtkWidget *frame; @@ -475,7 +475,7 @@ } GpropGeneral * -gprop_general_new (char *title, char *icon_filename) +gprop_general_new (const char *title, const char *icon_filename) { GpropGeneral *gp; GtkWidget *frame; diff -ruN old/mc-4.5.18/gnome/gprop.h new/mc-4.5.19/gnome/gprop.h --- old/mc-4.5.18/gnome/gprop.h Tue Feb 23 21:41:27 1999 +++ new/mc-4.5.19/gnome/gprop.h Thu Feb 25 00:13:19 1999 @@ -22,7 +22,7 @@ GtkWidget *filename; } GpropFilename; -GpropFilename *gprop_filename_new (char *complete_filename, char *filename); +GpropFilename *gprop_filename_new (const char *complete_filename, const char *filename); void gprop_filename_get_data (GpropFilename *gp, char **filename); /***** Permissions *****/ @@ -54,7 +54,7 @@ GtkWidget *icon_pixmap; } GpropGeneral; -GpropGeneral *gprop_general_new (char *title, char *icon_filename); +GpropGeneral *gprop_general_new (const char *title, const char *icon_filename); void gprop_general_get_data (GpropGeneral *gp, char **title, char **icon_filename); typedef struct { diff -ruN old/mc-4.5.18/gnome/mc.keys.in.in new/mc-4.5.19/gnome/mc.keys.in.in --- old/mc-4.5.18/gnome/mc.keys.in.in Tue Feb 23 21:41:27 1999 +++ new/mc-4.5.19/gnome/mc.keys.in.in Thu Feb 25 00:13:18 1999 @@ -115,7 +115,7 @@ fm-view=%view{ascii} cat %f | cpio -ictv audio/*: - icon-filename=@icondir@/sound.xpm + icon-filename=@icondir@/gnome-audio.png open.x11amp.Use x11amp to play this=x11amp %f open.mpeg.Play with mpeg_play=mpeg_play %f open.mpg123.Open with mpg123=mpg123 %f @@ -161,6 +161,12 @@ image/x-bmp: icon-filename=@icondir@/gnome-image-bmp.png +image/x-xcf: + icon-filename=@icondir@/gnome-image-xcf.png + +image/x-compressed-xcf: + icon-filename=@icondir@/gnome-image-xcf.png + image/gif: icon-filename=@icondir@/gnome-image-gif.png @@ -220,4 +226,5 @@ icon-filename=@icondir@/gnome-image-generic.png text/*: - icon-filename=@icondir@/gnome-textfile.png \ No newline at end of file + icon-filename=@icondir@/gnome-textfile.png + open=gnome-edit %f \ No newline at end of file diff -ruN old/mc-4.5.18/lib/Makefile.in new/mc-4.5.19/lib/Makefile.in --- old/mc-4.5.18/lib/Makefile.in Tue Feb 23 21:41:23 1999 +++ new/mc-4.5.19/lib/Makefile.in Thu Feb 25 00:13:13 1999 @@ -18,9 +18,12 @@ TIFILES = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap DISTLIB = $(LIBFILES_IN) $(LIBFILES_CONST) $(TIFILES) \ Makefile.in tdiff xnc.hlp ncurses.h mc.sh mc.csh mcserv.init \ - mcserv.pamd tkmc.wmconfig mc.ext.in.qnx.diff + mcserv.pamd tkmc.wmconfig mc.ext.in.qnx.diff mc.global -all: +all: Makefile + +Makefile.in: ../config.status + (cd ..; CONFIG_FILES=lib/Makefile CONFIG_HEADERS= ./config.status) check: @echo no tests are supplied. @@ -44,6 +47,7 @@ do $(INSTALL_DATA) $(builddir)/lib/$$I $(DESTDIR)$(libdir)/$$I; done for I in $(TIFILES); \ do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(tidir)/$$I; done + $(INSTALL_DATA) $(srcdir)/mc.global $(DESTDIR)$(confdir) uninstall: for I in $(LIBFILES_OUT) $(LIBFILES_CONST); \ diff -ruN old/mc-4.5.18/lib/mc.global new/mc-4.5.19/lib/mc.global --- old/mc-4.5.18/lib/mc.global Wed Dec 31 19:00:00 1969 +++ new/mc-4.5.19/lib/mc.global Thu Feb 25 00:13:14 1999 @@ -0,0 +1,2 @@ +[Special dirs] +list=/afs,/coda,/:,/...,/net diff -ruN old/mc-4.5.18/new_icons/Makefile.in new/mc-4.5.19/new_icons/Makefile.in --- old/mc-4.5.18/new_icons/Makefile.in Tue Feb 23 21:41:28 1999 +++ new/mc-4.5.19/new_icons/Makefile.in Thu Feb 25 00:13:19 1999 @@ -50,7 +50,9 @@ gnome-manpage.png \ gnome-objectfile.png \ gnome-textfile.png \ - gnome-tex.png + gnome-tex.png \ + gnome-audio.png \ + gnome-image-xcf.png all: Binary files old/mc-4.5.18/new_icons/gnome-audio.png and new/mc-4.5.19/new_icons/gnome-audio.png differ Binary files old/mc-4.5.18/new_icons/gnome-image-xcf.png and new/mc-4.5.19/new_icons/gnome-image-xcf.png differ diff -ruN old/mc-4.5.18/po/cat-id-tbl.c new/mc-4.5.19/po/cat-id-tbl.c --- old/mc-4.5.18/po/cat-id-tbl.c Tue Feb 23 21:41:40 1999 +++ new/mc-4.5.19/po/cat-id-tbl.c Thu Feb 25 00:13:27 1999 @@ -159,244 +159,245 @@ {"List of background operations", 130}, {"Exit", 131}, {"Terminates the file manager and the desktop", 132}, - {"_Layout", 133}, - {"_Commands", 134}, - {"_Desktop", 135}, - {"_Help", 136}, - {"File/New/Directory...", 137}, - {"Properties", 138}, - {"Mount device", 139}, - {"Unmount device", 140}, - {"Eject device", 141}, - {"Open", 142}, - {"Open with", 143}, - {"View", 144}, - {"View unfiltered", 145}, - {"Edit", 146}, - {"Link...", 147}, - {"Symlink...", 148}, - {"Edit symlink...", 149}, - {"Move/rename...", 150}, - {"Copy...", 151}, - {"Delete", 152}, - {"Show backup files", 153}, - {"Show hidden files", 154}, - {"Mix files and directories", 155}, - {"Use shell patterns instead of regular expressions", 156}, - {"Confirm when deleting file", 157}, - {"Confirm when overwriting files", 158}, - {"Confirm when executing files", 159}, - {"Show progress while operations are being performed", 160}, - {"VFS Timeout:", 161}, - {"Seconds", 162}, - {"Anonymous FTP password:", 163}, - {"Always use FTP proxy", 164}, - {"Fast directory reload", 165}, - {"Compute totals before copying files", 166}, - {"FTP directory cache timeout :", 167}, - {"Allow customization of icons in icon view", 168}, - {"File display", 169}, - {"Confirmation", 170}, - {"VFS", 171}, - {"Caching", 172}, - {"Preferences", 173}, - {"Filename", 174}, - {"Full name: ", 175}, - {"Command", 176}, - {"Command:", 177}, - {"Use terminal", 178}, - {"File mode (permissions)", 179}, - {"Current mode: ", 180}, - {"Read", 181}, - {"Write", 182}, - {"Exec", 183}, - {"Special", 184}, - {"User", 185}, - {"Group", 186}, - {"Other", 187}, - {"Set UID", 188}, - {"Set GID", 189}, - {"Sticky", 190}, - {"", 191}, - {"Owner", 192}, - {"General", 193}, - {"Title", 194}, - {"Icon", 195}, - {"Select icon", 196}, - {"Rescan Directory", 197}, - {"Reloads the current directory", 198}, - {"All files", 199}, - {"Archives and compressed files", 200}, - {"RPM/DEB files", 201}, - {"Text/Document files", 202}, - {"HTML and SGML files", 203}, - {"Postscript and PDF files", 204}, - {"Spreadsheet files", 205}, - {"Image files", 206}, - {"Video/animation files", 207}, - {"Audio files", 208}, - {"C program files", 209}, - {"C++ program files", 210}, - {"Objective-C program files", 211}, - {"Scheme program files", 212}, - {"Assembler program files", 213}, - {"Misc. program files", 214}, - {"Font files", 215}, - {"Search: %s", 216}, - {"%s bytes in %d file", 217}, - {"%s bytes in %d files", 218}, - {"", 219}, - {"Filter", 220}, - {"Switch view to an Icon view", 221}, - {"Brief", 222}, - {"Switch view to show just file name and type", 223}, - {"Detailed", 224}, - {"Switch view to show detailed file statistics", 225}, - {"Custom", 226}, - {"Switch view to show custom determined statistics.", 227}, - {"Back", 228}, - {"Go to the previously visited directory", 229}, - {"Up", 230}, - {"Go up a level in the directory heirarchy", 231}, - {"Forward", 232}, - {"Go to the next directory", 233}, - {"Rescan", 234}, - {"Rescan the current directory", 235}, - {"Home", 236}, - {"Go to your home directory", 237}, - {"Location:", 238}, - {"&Ok", 239}, - {"Offset 0x%08x", 240}, - {"Col %d", 241}, - {"%s bytes", 242}, - {"_Goto line", 243}, - {"Jump to a specified line number", 244}, - {"_Monitor file", 245}, - {"Monitor file growing", 246}, - {"Regexp search", 247}, - {"Regular expression search", 248}, - {"_Wrap", 249}, - {"Wrap the text", 250}, - {"_Parsed view", 251}, - {"_Formatted", 252}, - {"_Hex", 253}, - {"_Search", 254}, - {"ok", 255}, - {"cancel", 256}, - {"help", 257}, - {"yes", 258}, - {"no", 259}, - {"exit", 260}, - {"abort", 261}, - {" Error ", 262}, - {" Failed trying to open file for reading: ", 263}, - {" Cannot get size/permissions info on file: ", 264}, - {" Not an ordinary file: ", 265}, - {" File is too large: ", 266}, + {"Rescan System Devices", 133}, + {"_Layout", 134}, + {"_Commands", 135}, + {"_Desktop", 136}, + {"_Help", 137}, + {"File/New/Directory...", 138}, + {"Properties", 139}, + {"Mount device", 140}, + {"Unmount device", 141}, + {"Eject device", 142}, + {"Open", 143}, + {"Open with", 144}, + {"View", 145}, + {"View unfiltered", 146}, + {"Edit", 147}, + {"Link...", 148}, + {"Symlink...", 149}, + {"Edit symlink...", 150}, + {"Move/rename...", 151}, + {"Copy...", 152}, + {"Delete", 153}, + {"Show backup files", 154}, + {"Show hidden files", 155}, + {"Mix files and directories", 156}, + {"Use shell patterns instead of regular expressions", 157}, + {"Confirm when deleting file", 158}, + {"Confirm when overwriting files", 159}, + {"Confirm when executing files", 160}, + {"Show progress while operations are being performed", 161}, + {"VFS Timeout:", 162}, + {"Seconds", 163}, + {"Anonymous FTP password:", 164}, + {"Always use FTP proxy", 165}, + {"Fast directory reload", 166}, + {"Compute totals before copying files", 167}, + {"FTP directory cache timeout :", 168}, + {"Allow customization of icons in icon view", 169}, + {"File display", 170}, + {"Confirmation", 171}, + {"VFS", 172}, + {"Caching", 173}, + {"Preferences", 174}, + {"Filename", 175}, + {"Full name: ", 176}, + {"Command", 177}, + {"Command:", 178}, + {"Use terminal", 179}, + {"File mode (permissions)", 180}, + {"Current mode: ", 181}, + {"Read", 182}, + {"Write", 183}, + {"Exec", 184}, + {"Special", 185}, + {"User", 186}, + {"Group", 187}, + {"Other", 188}, + {"Set UID", 189}, + {"Set GID", 190}, + {"Sticky", 191}, + {"", 192}, + {"Owner", 193}, + {"General", 194}, + {"Title", 195}, + {"Icon", 196}, + {"Select icon", 197}, + {"Rescan Directory", 198}, + {"Reloads the current directory", 199}, + {"All files", 200}, + {"Archives and compressed files", 201}, + {"RPM/DEB files", 202}, + {"Text/Document files", 203}, + {"HTML and SGML files", 204}, + {"Postscript and PDF files", 205}, + {"Spreadsheet files", 206}, + {"Image files", 207}, + {"Video/animation files", 208}, + {"Audio files", 209}, + {"C program files", 210}, + {"C++ program files", 211}, + {"Objective-C program files", 212}, + {"Scheme program files", 213}, + {"Assembler program files", 214}, + {"Misc. program files", 215}, + {"Font files", 216}, + {"Search: %s", 217}, + {"%s bytes in %d file", 218}, + {"%s bytes in %d files", 219}, + {"", 220}, + {"Filter", 221}, + {"Switch view to an Icon view", 222}, + {"Brief", 223}, + {"Switch view to show just file name and type", 224}, + {"Detailed", 225}, + {"Switch view to show detailed file statistics", 226}, + {"Custom", 227}, + {"Switch view to show custom determined statistics.", 228}, + {"Back", 229}, + {"Go to the previously visited directory", 230}, + {"Up", 231}, + {"Go up a level in the directory heirarchy", 232}, + {"Forward", 233}, + {"Go to the next directory", 234}, + {"Rescan", 235}, + {"Rescan the current directory", 236}, + {"Home", 237}, + {"Go to your home directory", 238}, + {"Location:", 239}, + {"&Ok", 240}, + {"Offset 0x%08x", 241}, + {"Col %d", 242}, + {"%s bytes", 243}, + {"_Goto line", 244}, + {"Jump to a specified line number", 245}, + {"_Monitor file", 246}, + {"Monitor file growing", 247}, + {"Regexp search", 248}, + {"Regular expression search", 249}, + {"_Wrap", 250}, + {"Wrap the text", 251}, + {"_Parsed view", 252}, + {"_Formatted", 253}, + {"_Hex", 254}, + {"_Search", 255}, + {"ok", 256}, + {"cancel", 257}, + {"help", 258}, + {"yes", 259}, + {"no", 260}, + {"exit", 261}, + {"abort", 262}, + {" Error ", 263}, + {" Failed trying to open file for reading: ", 264}, + {" Cannot get size/permissions info on file: ", 265}, + {" Not an ordinary file: ", 266}, + {" File is too large: ", 267}, {"\ \n\ - Increase edit.h:MAXBUF and recompile the editor. ", 267}, - {" Error allocating memory ", 268}, - {" Save As ", 269}, - {" Warning ", 270}, - {" A file already exists with this name. ", 271}, - {"Overwrite", 272}, - {"Cancel", 273}, - {" Save as ", 274}, - {" Error trying to save file. ", 275}, - {" Delete macro ", 276}, - {" Error trying to open temp file ", 277}, - {" Error trying to open macro file ", 278}, - {"key '%d 0': ", 279}, - {" Error trying to overwrite macro file ", 280}, - {" Macro ", 281}, - {" Press the macro's new hotkey: ", 282}, - {" Save macro ", 283}, - {" Delete Macro ", 284}, - {" Load macro ", 285}, - {" Confirm save file? : ", 286}, - {" Save file ", 287}, - {"Save", 288}, + Increase edit.h:MAXBUF and recompile the editor. ", 268}, + {" Error allocating memory ", 269}, + {" Save As ", 270}, + {" Warning ", 271}, + {" A file already exists with this name. ", 272}, + {"Overwrite", 273}, + {"Cancel", 274}, + {" Save as ", 275}, + {" Error trying to save file. ", 276}, + {" Delete macro ", 277}, + {" Error trying to open temp file ", 278}, + {" Error trying to open macro file ", 279}, + {"key '%d 0': ", 280}, + {" Error trying to overwrite macro file ", 281}, + {" Macro ", 282}, + {" Press the macro's new hotkey: ", 283}, + {" Save macro ", 284}, + {" Delete Macro ", 285}, + {" Load macro ", 286}, + {" Confirm save file? : ", 287}, + {" Save file ", 288}, + {"Save", 289}, {"\ Current text was modified without a file save. \n\ - Continue discards these changes. ", 289}, - {"Continue", 290}, - {" Load ", 291}, - {" Error trying to open file for reading ", 292}, - {" Block is large, you may not be able to undo this action. ", 293}, - {" Continue ", 294}, - {" Cancel ", 295}, - {" Replace with: ", 296}, - {" Replace ", 297}, - {" Search ", 298}, - {" Enter search text : ", 299}, - {" Enter replace text : ", 300}, - {" Enter argument order : ", 301}, - {"Enter the order of replacement of your scanf format specifiers", 302}, - {" Whole words only ", 303}, - {" Case sensitive ", 304}, - {" Regular expression ", 305}, - {"See the regex man page for how to compose a regular expression", 306}, - {" Backwards ", 307}, - {"Warning: Searching backward can be slow", 308}, - {" Prompt on replace ", 309}, - {"Ask before making each replacement", 310}, - {" Replace all ", 311}, - {" Scanf expression ", 312}, - {"Allows entering of a C format string, see the scanf man page", 313}, - {"Begin search, Enter", 314}, - {"Abort this dialog, Esc", 315}, - {"Replace", 316}, - {"Skip", 317}, - {"Replace all", 318}, - {"\ - Invalid regular expression, or scanf expression with to many conversions ", 319}, - {" Error in replacement format string. ", 320}, - {" %ld replacements made. ", 321}, - {" Search string not found. ", 322}, - {" Quit ", 323}, + Continue discards these changes. ", 290}, + {"Continue", 291}, + {" Load ", 292}, + {" Error trying to open file for reading ", 293}, + {" Block is large, you may not be able to undo this action. ", 294}, + {" Continue ", 295}, + {" Cancel ", 296}, + {" Replace with: ", 297}, + {" Replace ", 298}, + {" Search ", 299}, + {" Enter search text : ", 300}, + {" Enter replace text : ", 301}, + {" Enter argument order : ", 302}, + {"Enter the order of replacement of your scanf format specifiers", 303}, + {" Whole words only ", 304}, + {" Case sensitive ", 305}, + {" Regular expression ", 306}, + {"See the regex man page for how to compose a regular expression", 307}, + {" Backwards ", 308}, + {"Warning: Searching backward can be slow", 309}, + {" Prompt on replace ", 310}, + {"Ask before making each replacement", 311}, + {" Replace all ", 312}, + {" Scanf expression ", 313}, + {"Allows entering of a C format string, see the scanf man page", 314}, + {"Begin search, Enter", 315}, + {"Abort this dialog, Esc", 316}, + {"Replace", 317}, + {"Skip", 318}, + {"Replace all", 319}, + {"\ + Invalid regular expression, or scanf expression with to many conversions ", 320}, + {" Error in replacement format string. ", 321}, + {" %ld replacements made. ", 322}, + {" Search string not found. ", 323}, + {" Quit ", 324}, {"\ Current text was modified without a file save. \n\ - Save with exit? ", 324}, - {" File was modified, Save with exit? ", 325}, - {"Cancel quit", 326}, - {" &Cancel quit ", 327}, - {" &Yes ", 328}, - {" &No ", 329}, - {" Copy to clipboard ", 330}, - {" Unable to save to file. ", 331}, - {" Cut to clipboard ", 332}, - {" Goto line ", 333}, - {" Enter line: ", 334}, - {" Save Block ", 335}, - {" Insert File ", 336}, - {" Insert file ", 337}, - {" Error trying to insert file. ", 338}, - {" Sort block ", 339}, - {" You must first highlight a block of text. ", 340}, - {" Run Sort ", 341}, - {" Enter sort options (see manpage) separated by whitespace: ", 342}, - {" Sort ", 343}, - {" Error trying to execute sort command ", 344}, - {" Sort returned non-zero: ", 345}, - {" Process block ", 346}, - {" Error trying to stat file ", 347}, - {" Mail ", 348}, - {"None", 349}, - {"Dynamic paragraphing", 350}, - {"Type writer wrap", 351}, - {"Wrap mode", 352}, - {"Key emulation", 353}, - {"Error initialising editor.\n", 354}, - {"Help", 355}, - {"Mark", 356}, - {"Replac", 357}, - {"Search", 358}, - {"PullDn", 359}, - {"Quit", 360}, - {" Word wrap ", 361}, - {" Enter line length, 0 for off: ", 362}, - {" About ", 363}, + Save with exit? ", 325}, + {" File was modified, Save with exit? ", 326}, + {"Cancel quit", 327}, + {" &Cancel quit ", 328}, + {" &Yes ", 329}, + {" &No ", 330}, + {" Copy to clipboard ", 331}, + {" Unable to save to file. ", 332}, + {" Cut to clipboard ", 333}, + {" Goto line ", 334}, + {" Enter line: ", 335}, + {" Save Block ", 336}, + {" Insert File ", 337}, + {" Insert file ", 338}, + {" Error trying to insert file. ", 339}, + {" Sort block ", 340}, + {" You must first highlight a block of text. ", 341}, + {" Run Sort ", 342}, + {" Enter sort options (see manpage) separated by whitespace: ", 343}, + {" Sort ", 344}, + {" Error trying to execute sort command ", 345}, + {" Sort returned non-zero: ", 346}, + {" Process block ", 347}, + {" Error trying to stat file ", 348}, + {" Mail ", 349}, + {"None", 350}, + {"Dynamic paragraphing", 351}, + {"Type writer wrap", 352}, + {"Wrap mode", 353}, + {"Key emulation", 354}, + {"Error initialising editor.\n", 355}, + {"Help", 356}, + {"Mark", 357}, + {"Replac", 358}, + {"Search", 359}, + {"PullDn", 360}, + {"Quit", 361}, + {" Word wrap ", 362}, + {" Enter line length, 0 for off: ", 363}, + {" About ", 364}, {"\ \n\ Cooledit v2.1\n\ @@ -404,619 +405,619 @@ Copyright (C) 1996 the Free Software Foundation\n\ \n\ A user friendly text editor written\n\ - for the Midnight Commander.\n", 364}, - {"&Open/load... C-o", 365}, - {"&New C-n", 366}, - {"&Save F2", 367}, - {"save &As... F12", 368}, - {"&Insert file... F15", 369}, - {"copy to &File... C-f", 370}, - {"a&Bout... ", 371}, - {"&Quit F10", 372}, - {"&New C-x k", 373}, - {"copy to &File... ", 374}, - {"&Toggle Mark F3", 375}, - {"&Mark Columns S-F3", 376}, - {"toggle &Ins/overw Ins", 377}, - {"&Copy F5", 378}, - {"&Move F6", 379}, - {"&Delete F8", 380}, - {"&Undo C-u", 381}, - {"&Beginning C-PgUp", 382}, - {"&End C-PgDn", 383}, - {"&Search... F7", 384}, - {"search &Again F17", 385}, - {"&Replace... F4", 386}, - {"&Goto line... M-l", 387}, - {"insert &Literal... C-q", 388}, - {"&Refresh screen C-l", 389}, - {"&Start record macro C-r", 390}, - {"&Finish record macro... C-r", 391}, - {"&Execute macro... C-a, KEY", 392}, - {"delete macr&O... ", 393}, - {"insert &Date/time ", 394}, - {"format p&Aragraph M-p", 395}, - {"'ispell' s&Pell check C-p", 396}, - {"sor&T... M-t", 397}, - {"'indent' &C Formatter F19", 398}, - {"&Mail... ", 399}, - {"&Execute macro... C-x e, KEY", 400}, - {"'ispell' s&Pell check M-$", 401}, - {"&General... ", 402}, - {"&Save mode...", 403}, - {"&Layout...", 404}, - {" File ", 405}, - {" Edit ", 406}, - {" Sear/Repl ", 407}, - {" Command ", 408}, - {" Options ", 409}, - {"Open...\tC-o", 410}, - {"New\tC-n", 411}, - {"Save\tF2", 412}, - {"Save as...\tF12", 413}, - {"Insert file...\tF15", 414}, - {"Copy to file...\tC-f", 415}, - {"Disk operations", 416}, - {"Toggle mark\tF3", 417}, - {"Toggle mark columns\tC-b", 418}, - {"Toggle insert/overwrite\tIns", 419}, - {"Copy block to cursor\tF5", 420}, - {"Move block to cursor\tF6", 421}, - {"Delete block\tF8/C-Del", 422}, - {"Copy block to clipbrd\tC-Ins", 423}, - {"Cut block to clipbrd\tS-Del", 424}, - {"Paste block from clipbrd\tS-Ins", 425}, - {"Selection history\tM-Ins", 426}, - {"Undo\tC-BackSpace", 427}, - {"Manipulating blocks of text", 428}, - {" Srch/Replce ", 429}, - {"Search...\tF7", 430}, - {"Search again\tF17", 431}, - {"Replace...\tF4", 432}, - {"Replace again\tF14", 433}, - {"Search for and replace text", 434}, - {"Goto line...\tM-l", 435}, - {"Start record macro\tC-r", 436}, - {"Finish record macro...\tC-r", 437}, - {"Execute macro...\tC-a, KEY", 438}, - {"Delete macro...\t", 439}, - {"Insert date/time\tC-d", 440}, - {"Format paragraph\tM-p", 441}, - {"Refresh display\tC-l", 442}, - {"Macros and internal commands", 443}, - {"&Dismiss", 444}, - {" Enter file name: ", 445}, - {"The Quick Brown Fox Jumps Over The Lazy Dog", 446}, - {"\ -gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n", 447}, - {"Clear the edit buffer", 448}, - {"Insert File", 449}, - {"Insert text from a file", 450}, - {"Copy to file", 451}, - {"copy a block to a file", 452}, - {"Search/Replace", 453}, - {" Load syntax file ", 454}, - {" File access error ", 455}, - {" Syntax error in file %s on line %d ", 456}, - {"&Cancel", 457}, - {"&Set", 458}, - {"S&kip", 459}, - {"Set &all", 460}, - {"owner", 461}, - {"group", 462}, - {"other", 463}, - {"On", 464}, - {"Flag", 465}, - {"Mode", 466}, - {"%6d of %d", 467}, - {" Chown advanced command ", 468}, + for the Midnight Commander.\n", 365}, + {"&Open/load... C-o", 366}, + {"&New C-n", 367}, + {"&Save F2", 368}, + {"save &As... F12", 369}, + {"&Insert file... F15", 370}, + {"copy to &File... C-f", 371}, + {"a&Bout... ", 372}, + {"&Quit F10", 373}, + {"&New C-x k", 374}, + {"copy to &File... ", 375}, + {"&Toggle Mark F3", 376}, + {"&Mark Columns S-F3", 377}, + {"toggle &Ins/overw Ins", 378}, + {"&Copy F5", 379}, + {"&Move F6", 380}, + {"&Delete F8", 381}, + {"&Undo C-u", 382}, + {"&Beginning C-PgUp", 383}, + {"&End C-PgDn", 384}, + {"&Search... F7", 385}, + {"search &Again F17", 386}, + {"&Replace... F4", 387}, + {"&Goto line... M-l", 388}, + {"insert &Literal... C-q", 389}, + {"&Refresh screen C-l", 390}, + {"&Start record macro C-r", 391}, + {"&Finish record macro... C-r", 392}, + {"&Execute macro... C-a, KEY", 393}, + {"delete macr&O... ", 394}, + {"insert &Date/time ", 395}, + {"format p&Aragraph M-p", 396}, + {"'ispell' s&Pell check C-p", 397}, + {"sor&T... M-t", 398}, + {"'indent' &C Formatter F19", 399}, + {"&Mail... ", 400}, + {"&Execute macro... C-x e, KEY", 401}, + {"'ispell' s&Pell check M-$", 402}, + {"&General... ", 403}, + {"&Save mode...", 404}, + {"&Layout...", 405}, + {" File ", 406}, + {" Edit ", 407}, + {" Sear/Repl ", 408}, + {" Command ", 409}, + {" Options ", 410}, + {"Open...\tC-o", 411}, + {"New\tC-n", 412}, + {"Save\tF2", 413}, + {"Save as...\tF12", 414}, + {"Insert file...\tF15", 415}, + {"Copy to file...\tC-f", 416}, + {"Disk operations", 417}, + {"Toggle mark\tF3", 418}, + {"Toggle mark columns\tC-b", 419}, + {"Toggle insert/overwrite\tIns", 420}, + {"Copy block to cursor\tF5", 421}, + {"Move block to cursor\tF6", 422}, + {"Delete block\tF8/C-Del", 423}, + {"Copy block to clipbrd\tC-Ins", 424}, + {"Cut block to clipbrd\tS-Del", 425}, + {"Paste block from clipbrd\tS-Ins", 426}, + {"Selection history\tM-Ins", 427}, + {"Undo\tC-BackSpace", 428}, + {"Manipulating blocks of text", 429}, + {" Srch/Replce ", 430}, + {"Search...\tF7", 431}, + {"Search again\tF17", 432}, + {"Replace...\tF4", 433}, + {"Replace again\tF14", 434}, + {"Search for and replace text", 435}, + {"Goto line...\tM-l", 436}, + {"Start record macro\tC-r", 437}, + {"Finish record macro...\tC-r", 438}, + {"Execute macro...\tC-a, KEY", 439}, + {"Delete macro...\t", 440}, + {"Insert date/time\tC-d", 441}, + {"Format paragraph\tM-p", 442}, + {"Refresh display\tC-l", 443}, + {"Macros and internal commands", 444}, + {"&Dismiss", 445}, + {" Enter file name: ", 446}, + {"The Quick Brown Fox Jumps Over The Lazy Dog", 447}, + {"\ +gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n", 448}, + {"Clear the edit buffer", 449}, + {"Insert File", 450}, + {"Insert text from a file", 451}, + {"Copy to file", 452}, + {"copy a block to a file", 453}, + {"Search/Replace", 454}, + {" Load syntax file ", 455}, + {" File access error ", 456}, + {" Syntax error in file %s on line %d ", 457}, + {"&Cancel", 458}, + {"&Set", 459}, + {"S&kip", 460}, + {"Set &all", 461}, + {"owner", 462}, + {"group", 463}, + {"other", 464}, + {"On", 465}, + {"Flag", 466}, + {"Mode", 467}, + {"%6d of %d", 468}, + {" Chown advanced command ", 469}, {"\ Couldn't chmod \"%s\" \n\ - %s ", 469}, + %s ", 470}, {"\ Couldn't chown \"%s\" \n\ - %s ", 470}, - {" Oops... ", 471}, - {" I can't run the Advanced Chown command on an extfs ", 472}, - {" I can't run the Advanced Chown command on a tarfs ", 473}, - {"Background process:", 474}, - {" Background process error ", 475}, - {" Child died unexpectedly ", 476}, - {" Unknown error in child ", 477}, - {" Background protocol error ", 478}, + %s ", 471}, + {" Oops... ", 472}, + {" I can't run the Advanced Chown command on an extfs ", 473}, + {" I can't run the Advanced Chown command on a tarfs ", 474}, + {"Background process:", 475}, + {" Background process error ", 476}, + {" Child died unexpectedly ", 477}, + {" Unknown error in child ", 478}, + {" Background protocol error ", 479}, {"\ Background process sent us a request for more arguments \n\ - than we can handle. \n", 479}, - {" Listing mode ", 480}, - {"&Full file list", 481}, - {"&Brief file list", 482}, - {"&Long file list", 483}, - {"&User defined:", 484}, - {"&Icon view", 485}, - {"user &Mini status", 486}, - {"Listing mode", 487}, - {"&Reverse", 488}, - {"case sensi&tive", 489}, - {"Sort order", 490}, - {" confirm &Exit ", 491}, - {" confirm e&Xecute ", 492}, - {" confirm o&Verwrite ", 493}, - {" confirm &Delete ", 494}, - {" Confirmation ", 495}, - {"Full 8 bits output", 496}, - {"ISO 8859-1", 497}, - {"7 bits", 498}, - {"F&ull 8 bits input", 499}, - {" Display bits ", 500}, - {"&Always use ftp proxy", 501}, - {"sec", 502}, - {"ftpfs directory cache timeout:", 503}, - {"ftp anonymous password:", 504}, - {"Timeout for freeing VFSs:", 505}, - {" Virtual File System Setting ", 506}, - {"Quick cd", 507}, - {"cd", 508}, - {"Symbolic link", 509}, - {"Symbolic link filename:", 510}, - {"Existing filename (filename symlink will point to):", 511}, - {"Running ", 512}, - {"Stopped", 513}, - {"&Stop", 514}, - {"&Resume", 515}, - {"&Kill", 516}, - {"Background Jobs", 517}, - {"execute/search by others", 518}, - {"write by others", 519}, - {"read by others", 520}, - {"execute/search by group", 521}, - {"write by group", 522}, - {"read by group", 523}, - {"execute/search by owner", 524}, - {"write by owner", 525}, - {"read by owner", 526}, - {"sticky bit", 527}, - {"set group ID on execution", 528}, - {"set user ID on execution", 529}, - {"C&lear marked", 530}, - {"S&et marked", 531}, - {"&Marked all", 532}, - {"Permissions (Octal)", 533}, - {"Owner name", 534}, - {"Group name", 535}, - {" Chmod command ", 536}, - {" Permission ", 537}, - {"Use SPACE to change", 538}, - {"an option, ARROW KEYS", 539}, - {"to move between options", 540}, - {"and T or INS to mark", 541}, - {"Chmod command", 542}, - {" I can't run the Chmod command on an extfs ", 543}, - {"Set &users", 544}, - {"Set &groups", 545}, - {" Name ", 546}, - {" Owner name ", 547}, - {" Group name ", 548}, - {" Size ", 549}, - {" Chown command ", 550}, - {" User name ", 551}, - {"", 552}, - {"", 553}, - {" I can't run the Chown command on an extfs ", 554}, - {" I can't run the Chown command on a tarfs ", 555}, - {" Can not fetch a local copy of %s ", 556}, - {" CD ", 557}, - {"Files tagged, want to cd?", 558}, - {"Could not change directory", 559}, - {" View file ", 560}, - {" Filename:", 561}, - {" Filtered view ", 562}, - {" Filter command and arguments:", 563}, - {"Create a new Directory", 564}, - {" Enter directory name:", 565}, - {" Filter ", 566}, - {" Set expression for filtering filenames", 567}, - {" Select ", 568}, - {" Malformed regular expression ", 569}, - {" Unselect ", 570}, - {"Extension file edit", 571}, - {" Which extension file you want to edit? ", 572}, - {"&User", 573}, - {"&System Wide", 574}, - {"Menu file edit", 575}, - {" Which menu file will you edit? ", 576}, - {"&Local", 577}, - {"&Home", 578}, - {" Compare directories ", 579}, - {" Select compare method: ", 580}, - {"&Quick", 581}, - {"&Size only", 582}, - {"&Thorough", 583}, - {" Both panels should be on the listing view mode to use this command ", 584}, - {" The command history is empty ", 585}, - {" Command history ", 586}, + than we can handle. \n", 480}, + {" Listing mode ", 481}, + {"&Full file list", 482}, + {"&Brief file list", 483}, + {"&Long file list", 484}, + {"&User defined:", 485}, + {"&Icon view", 486}, + {"user &Mini status", 487}, + {"Listing mode", 488}, + {"&Reverse", 489}, + {"case sensi&tive", 490}, + {"Sort order", 491}, + {" confirm &Exit ", 492}, + {" confirm e&Xecute ", 493}, + {" confirm o&Verwrite ", 494}, + {" confirm &Delete ", 495}, + {" Confirmation ", 496}, + {"Full 8 bits output", 497}, + {"ISO 8859-1", 498}, + {"7 bits", 499}, + {"F&ull 8 bits input", 500}, + {" Display bits ", 501}, + {"&Always use ftp proxy", 502}, + {"sec", 503}, + {"ftpfs directory cache timeout:", 504}, + {"ftp anonymous password:", 505}, + {"Timeout for freeing VFSs:", 506}, + {" Virtual File System Setting ", 507}, + {"Quick cd", 508}, + {"cd", 509}, + {"Symbolic link", 510}, + {"Symbolic link filename:", 511}, + {"Existing filename (filename symlink will point to):", 512}, + {"Running ", 513}, + {"Stopped", 514}, + {"&Stop", 515}, + {"&Resume", 516}, + {"&Kill", 517}, + {"Background Jobs", 518}, + {"execute/search by others", 519}, + {"write by others", 520}, + {"read by others", 521}, + {"execute/search by group", 522}, + {"write by group", 523}, + {"read by group", 524}, + {"execute/search by owner", 525}, + {"write by owner", 526}, + {"read by owner", 527}, + {"sticky bit", 528}, + {"set group ID on execution", 529}, + {"set user ID on execution", 530}, + {"C&lear marked", 531}, + {"S&et marked", 532}, + {"&Marked all", 533}, + {"Permissions (Octal)", 534}, + {"Owner name", 535}, + {"Group name", 536}, + {" Chmod command ", 537}, + {" Permission ", 538}, + {"Use SPACE to change", 539}, + {"an option, ARROW KEYS", 540}, + {"to move between options", 541}, + {"and T or INS to mark", 542}, + {"Chmod command", 543}, + {" I can't run the Chmod command on an extfs ", 544}, + {"Set &users", 545}, + {"Set &groups", 546}, + {" Name ", 547}, + {" Owner name ", 548}, + {" Group name ", 549}, + {" Size ", 550}, + {" Chown command ", 551}, + {" User name ", 552}, + {"", 553}, + {"", 554}, + {" I can't run the Chown command on an extfs ", 555}, + {" I can't run the Chown command on a tarfs ", 556}, + {" Can not fetch a local copy of %s ", 557}, + {" CD ", 558}, + {"Files tagged, want to cd?", 559}, + {"Could not change directory", 560}, + {" View file ", 561}, + {" Filename:", 562}, + {" Filtered view ", 563}, + {" Filter command and arguments:", 564}, + {"Create a new Directory", 565}, + {" Enter directory name:", 566}, + {" Filter ", 567}, + {" Set expression for filtering filenames", 568}, + {" Select ", 569}, + {" Malformed regular expression ", 570}, + {" Unselect ", 571}, + {"Extension file edit", 572}, + {" Which extension file you want to edit? ", 573}, + {"&User", 574}, + {"&System Wide", 575}, + {"Menu file edit", 576}, + {" Which menu file will you edit? ", 577}, + {"&Local", 578}, + {"&Home", 579}, + {" Compare directories ", 580}, + {" Select compare method: ", 581}, + {"&Quick", 582}, + {"&Size only", 583}, + {"&Thorough", 584}, + {" Both panels should be on the listing view mode to use this command ", 585}, + {" The command history is empty ", 586}, + {" Command history ", 587}, {"\ Not an xterm or Linux console; \n\ - the panels cannot be toggled. ", 587}, - {"Type `exit' to return to the Midnight Commander", 588}, + the panels cannot be toggled. ", 588}, + {"Type `exit' to return to the Midnight Commander", 589}, {"\ Couldn't stat %s \n\ - %s ", 589}, - {" Link ", 590}, - {" to:", 591}, - {" link: %s ", 592}, - {" symlink: %s ", 593}, - {" Symlink ", 594}, - {" points to:", 595}, - {" Edit symlink ", 596}, - {" edit symlink: %s ", 597}, - {" Link symbolically ", 598}, - {" Relative symlink ", 599}, - {" relative symlink: %s ", 600}, - {" Enter machine name (F1 for details): ", 601}, - {" Could not chdir to %s ", 602}, - {" Link to a remote machine ", 603}, - {" FTP to machine ", 604}, - {" Socket source routing setup ", 605}, - {" Enter host name to use as a source routing hop: ", 606}, - {" Host name ", 607}, - {" Error while looking up IP address ", 608}, - {" Undelete files on an ext2 file system ", 609}, + %s ", 590}, + {" Link ", 591}, + {" to:", 592}, + {" link: %s ", 593}, + {" symlink: %s ", 594}, + {" Symlink ", 595}, + {" points to:", 596}, + {" Edit symlink ", 597}, + {" edit symlink: %s ", 598}, + {" Link symbolically ", 599}, + {" Relative symlink ", 600}, + {" relative symlink: %s ", 601}, + {" Enter machine name (F1 for details): ", 602}, + {" Could not chdir to %s ", 603}, + {" Link to a remote machine ", 604}, + {" FTP to machine ", 605}, + {" Socket source routing setup ", 606}, + {" Enter host name to use as a source routing hop: ", 607}, + {" Host name ", 608}, + {" Error while looking up IP address ", 609}, + {" Undelete files on an ext2 file system ", 610}, {"\ Enter device (without /dev/) to undelete\n\ - files on: (F1 for details)", 610}, - {" Setup saved to ~/", 611}, - {" Setup ", 612}, + files on: (F1 for details)", 611}, + {" Setup saved to ~/", 612}, + {" Setup ", 613}, {"\ Can't chdir to '%s' \n\ - %s ", 613}, - {" You can not execute commands on non-local filesystems", 614}, + %s ", 614}, + {" You can not execute commands on non-local filesystems", 615}, {"\ \n\ \n\ \n\ refresh stack underflow!\n\ \n\ -\n", 615}, - {"&Unsorted", 616}, - {"&Name", 617}, - {"&Extension", 618}, - {"&Modify time", 619}, - {"&Access time", 620}, - {"&Change time", 621}, - {"&Size", 622}, - {"&Inode", 623}, - {"&Type", 624}, - {"&Links", 625}, - {"N&GID", 626}, - {"N&UID", 627}, - {"&Owner", 628}, - {"&Group", 629}, - {"File exists but can not be stat-ed: %s %s", 630}, - {"Unknown", 631}, +\n", 616}, + {"&Unsorted", 617}, + {"&Name", 618}, + {"&Extension", 619}, + {"&Modify time", 620}, + {"&Access time", 621}, + {"&Change time", 622}, + {"&Size", 623}, + {"&Inode", 624}, + {"&Type", 625}, + {"&Links", 626}, + {"N&GID", 627}, + {"N&UID", 628}, + {"&Owner", 629}, + {"&Group", 630}, + {"File exists but can not be stat-ed: %s %s", 631}, + {"Unknown", 632}, {"\ Can't create temporary command file \n\ - %s ", 632}, - {" Parameter ", 633}, - {" Can't execute commands on a Virtual File System directory ", 634}, - {" file error", 635}, - {"Format of the ", 636}, - {" file error ", 637}, - {"Format of the ~/", 638}, + %s ", 633}, + {" Parameter ", 634}, + {" Can't execute commands on a Virtual File System directory ", 635}, + {" file error", 636}, + {"Format of the ", 637}, + {" file error ", 638}, + {"Format of the ~/", 639}, {"\ file has changed\n\ with version 3.0. You may want either to\n\ -copy it from ", 639}, +copy it from ", 640}, {"\ mc.ext or use that\n\ -file as an example of how to write it.\n", 640}, - {"mc.ext will be used for this moment.", 641}, - {" Copy ", 642}, - {" Move ", 643}, - {" Delete ", 644}, - {" Invalid target mask ", 645}, - {" Could not make the hardlink ", 646}, +file as an example of how to write it.\n", 641}, + {"mc.ext will be used for this moment.", 642}, + {" Copy ", 643}, + {" Move ", 644}, + {" Delete ", 645}, + {" Invalid target mask ", 646}, + {" Could not make the hardlink ", 647}, {"\ Cannot read source link \"%s\" \n\ - %s ", 647}, + %s ", 648}, {"\ Cannot make stable symlinks across non-local filesystems: \n\ \n\ - Option Stable Symlinks will be disabled ", 648}, + Option Stable Symlinks will be disabled ", 649}, {"\ Cannot create target symlink \"%s\" \n\ - %s ", 649}, + %s ", 650}, {"\ Cannot overwrite directory \"%s\" \n\ - %s ", 650}, + %s ", 651}, {"\ Cannot stat source file \"%s\" \n\ - %s ", 651}, - {" `%s' and `%s' are the same file. ", 652}, + %s ", 652}, + {" `%s' and `%s' are the same file. ", 653}, {"\ Cannot create special file \"%s\" \n\ - %s ", 653}, + %s ", 654}, {"\ Cannot chown target file \"%s\" \n\ - %s ", 654}, + %s ", 655}, {"\ Cannot chmod target file \"%s\" \n\ - %s ", 655}, + %s ", 656}, {"\ Cannot open source file \"%s\" \n\ - %s ", 656}, - {" Reget failed, about to overwrite file ", 657}, + %s ", 657}, + {" Reget failed, about to overwrite file ", 658}, {"\ Cannot fstat source file \"%s\" \n\ - %s ", 658}, + %s ", 659}, {"\ Cannot create target file \"%s\" \n\ - %s ", 659}, + %s ", 660}, {"\ Cannot fstat target file \"%s\" \n\ - %s ", 660}, + %s ", 661}, {"\ Cannot read source file \"%s\" \n\ - %s ", 661}, + %s ", 662}, {"\ Cannot write target file \"%s\" \n\ - %s ", 662}, - {"(stalled)", 663}, + %s ", 663}, + {"(stalled)", 664}, {"\ Cannot close source file \"%s\" \n\ - %s ", 664}, + %s ", 665}, {"\ Cannot close target file \"%s\" \n\ - %s ", 665}, - {"Incomplete file was retrieved. Keep it?", 666}, - {"&Delete", 667}, - {"&Keep", 668}, + %s ", 666}, + {"Incomplete file was retrieved. Keep it?", 667}, + {"&Delete", 668}, + {"&Keep", 669}, {"\ Cannot stat source directory \"%s\" \n\ - %s ", 669}, + %s ", 670}, {"\ Source directory \"%s\" is not a directory \n\ - %s ", 670}, + %s ", 671}, {"\ Cannot copy cyclic symbolic link \n\ - `%s' ", 671}, + `%s' ", 672}, {"\ Cannot create target directory \"%s\" \n\ - %s ", 672}, + %s ", 673}, {"\ Cannot chown target directory \"%s\" \n\ - %s ", 673}, + %s ", 674}, {"\ Cannot stat file \"%s\" \n\ - %s ", 674}, - {" `%s' and `%s' are the same file ", 675}, - {" Cannot overwrite directory `%s' ", 676}, + %s ", 675}, + {" `%s' and `%s' are the same file ", 676}, + {" Cannot overwrite directory `%s' ", 677}, {"\ Cannot move file \"%s\" to \"%s\" \n\ - %s ", 677}, + %s ", 678}, {"\ Cannot remove file \"%s\" \n\ - %s ", 678}, - {" Cannot overwrite directory \"%s\" %s ", 679}, - {" Cannot overwrite file \"%s\" %s ", 680}, + %s ", 679}, + {" Cannot overwrite directory \"%s\" %s ", 680}, + {" Cannot overwrite file \"%s\" %s ", 681}, {"\ Cannot move directory \"%s\" to \"%s\" \n\ - %s ", 681}, + %s ", 682}, {"\ Cannot delete file \"%s\" \n\ - %s ", 682}, + %s ", 683}, {"\ Cannot remove directory \"%s\" \n\ - %s ", 683}, - {" Internal error: get_file \n", 684}, - {"1Copy", 685}, - {"1Move", 686}, - {"1Delete", 687}, - {"%o %f \"%s\"%m", 688}, - {"%o %d %f%m", 689}, - {"%o %f \"%s\"%e", 690}, - {"%o %d %f%e", 691}, - {"file", 692}, - {"files", 693}, - {"directory", 694}, - {"directories", 695}, - {"files/directories", 696}, - {" with source mask:", 697}, - {" Can't operate on \"..\"! ", 698}, - {"Yes", 699}, - {"No", 700}, - {" Sorry, I could not put the job in background ", 701}, - {" Internal failure ", 702}, - {" Unknown file operation ", 703}, + %s ", 684}, + {" Internal error: get_file \n", 685}, + {"1Copy", 686}, + {"1Move", 687}, + {"1Delete", 688}, + {"%o %f \"%s\"%m", 689}, + {"%o %d %f%m", 690}, + {"%o %f \"%s\"%e", 691}, + {"%o %d %f%e", 692}, + {"file", 693}, + {"files", 694}, + {"directory", 695}, + {"directories", 696}, + {"files/directories", 697}, + {" with source mask:", 698}, + {" Can't operate on \"..\"! ", 699}, + {"Yes", 700}, + {"No", 701}, + {" Sorry, I could not put the job in background ", 702}, + {" Internal failure ", 703}, + {" Unknown file operation ", 704}, {"\ Destination \"%s\" must be a directory \n\ - %s ", 704}, - {"&Skip", 705}, - {"&Retry", 706}, - {"&Abort", 707}, + %s ", 705}, + {"&Skip", 706}, + {"&Retry", 707}, + {"&Abort", 708}, {"\ \n\ Directory not empty. \n\ - Delete it recursively? ", 708}, + Delete it recursively? ", 709}, {"\ \n\ Background process: Directory not empty \n\ - Delete it recursively? ", 709}, - {" Delete: ", 710}, - {"a&ll", 711}, - {"non&E", 712}, - {" Type 'yes' if you REALLY want to delete ", 713}, - {"all the directories ", 714}, - {" Recursive Delete ", 715}, - {" Background process: Recursive Delete ", 716}, - {"File", 717}, - {"Count", 718}, - {"Bytes", 719}, - {"Source", 720}, - {"Target", 721}, - {"Deleting", 722}, - {"Target file \"%s\" already exists!", 723}, - {"if &Size differs", 724}, - {"&Update", 725}, - {"al&L", 726}, - {"Overwrite all targets?", 727}, - {"&Reget", 728}, - {"ap&Pend", 729}, - {"Overwrite this target?", 730}, - {"Target date: %s, size %d", 731}, - {"Source date: %s, size %d", 732}, - {" File exists ", 733}, - {" Background process: File exists ", 734}, - {"preserve &Attributes", 735}, - {"follow &Links", 736}, - {"to:", 737}, - {"&Using shell patterns", 738}, - {"&Background", 739}, - {"&Stable Symlinks", 740}, - {"&Dive into subdir if exists", 741}, + Delete it recursively? ", 710}, + {" Delete: ", 711}, + {"a&ll", 712}, + {"non&E", 713}, + {" Type 'yes' if you REALLY want to delete ", 714}, + {"all the directories ", 715}, + {" Recursive Delete ", 716}, + {" Background process: Recursive Delete ", 717}, + {"File", 718}, + {"Count", 719}, + {"Bytes", 720}, + {"Source", 721}, + {"Target", 722}, + {"Deleting", 723}, + {"Target file \"%s\" already exists!", 724}, + {"if &Size differs", 725}, + {"&Update", 726}, + {"al&L", 727}, + {"Overwrite all targets?", 728}, + {"&Reget", 729}, + {"ap&Pend", 730}, + {"Overwrite this target?", 731}, + {"Target date: %s, size %d", 732}, + {"Source date: %s, size %d", 733}, + {" File exists ", 734}, + {" Background process: File exists ", 735}, + {"preserve &Attributes", 736}, + {"follow &Links", 737}, + {"to:", 738}, + {"&Using shell patterns", 739}, + {"&Background", 740}, + {"&Stable Symlinks", 741}, + {"&Dive into subdir if exists", 742}, {"\ Invalid source pattern `%s' \n\ - %s ", 742}, - {"&Suspend", 743}, - {"Con&tinue", 744}, - {"&Chdir", 745}, - {"&Again", 746}, - {"&Quit", 747}, - {"Pane&lize", 748}, - {"&View - F3", 749}, - {"&Edit - F4", 750}, - {"Start at:", 751}, - {"Filename:", 752}, - {"Content: ", 753}, - {"&Tree", 754}, - {"Find File", 755}, - {"Grepping in %s", 756}, - {" Find/read ", 757}, - {" Problem reading from child ", 758}, - {"Finished", 759}, - {"Searching %s", 760}, - {"Suspend", 761}, - {"Restart", 762}, - {"Searching", 763}, - {"Find file", 764}, - {"Change to this directory", 765}, - {"Search again", 766}, - {"View this file", 767}, - {"Edit this file", 768}, - {"Send the results to a Panel", 769}, - {"Usage: fixhlp \n", 770}, - {"fixhlp: Cannot open toc for writing", 771}, + %s ", 743}, + {"&Suspend", 744}, + {"Con&tinue", 745}, + {"&Chdir", 746}, + {"&Again", 747}, + {"&Quit", 748}, + {"Pane&lize", 749}, + {"&View - F3", 750}, + {"&Edit - F4", 751}, + {"Start at:", 752}, + {"Filename:", 753}, + {"Content: ", 754}, + {"&Tree", 755}, + {"Find File", 756}, + {"Grepping in %s", 757}, + {" Find/read ", 758}, + {" Problem reading from child ", 759}, + {"Finished", 760}, + {"Searching %s", 761}, + {"Suspend", 762}, + {"Restart", 763}, + {"Searching", 764}, + {"Find file", 765}, + {"Change to this directory", 766}, + {"Search again", 767}, + {"View this file", 768}, + {"Edit this file", 769}, + {"Send the results to a Panel", 770}, + {"Usage: fixhlp \n", 771}, + {"fixhlp: Cannot open toc for writing", 772}, {"\ [Contents]\n\ Topics:\n\ -\n", 772}, +\n", 773}, {"\ Help file format error\n\ -", 773}, - {" Internal bug: Double start of link area ", 774}, - {" Can't find node [Contents] in help file ", 775}, - {" Help ", 776}, +", 774}, + {" Internal bug: Double start of link area ", 775}, + {" Can't find node [Contents] in help file ", 776}, + {" Help ", 777}, {"\ Can't open file %s \n\ - %s ", 777}, - {" Can't find node %s in help file ", 778}, - {"Index", 779}, - {"Prev", 780}, - {"&Move", 781}, - {"&Remove", 782}, - {"&Append", 783}, - {"&Insert", 784}, - {"New &Entry", 785}, - {"New &Group", 786}, - {"&Up", 787}, - {"&Add current", 788}, - {"Change &To", 789}, - {"Subgroup - press ENTER to see list", 790}, - {"Active VFS directories", 791}, - {"Directory hotlist", 792}, - {" Directory path ", 793}, - {" Directory label ", 794}, - {"Moving ", 795}, - {"New hotlist entry", 796}, - {"Directory label", 797}, - {"Directory path", 798}, - {" New hotlist group ", 799}, - {"Name of new group", 800}, - {"Label for \"%s\":", 801}, - {" Add to hotlist ", 802}, - {" Remove: ", 803}, + %s ", 778}, + {" Can't find node %s in help file ", 779}, + {"Index", 780}, + {"Prev", 781}, + {"&Move", 782}, + {"&Remove", 783}, + {"&Append", 784}, + {"&Insert", 785}, + {"New &Entry", 786}, + {"New &Group", 787}, + {"&Up", 788}, + {"&Add current", 789}, + {"Change &To", 790}, + {"Subgroup - press ENTER to see list", 791}, + {"Active VFS directories", 792}, + {"Directory hotlist", 793}, + {" Directory path ", 794}, + {" Directory label ", 795}, + {"Moving ", 796}, + {"New hotlist entry", 797}, + {"Directory label", 798}, + {"Directory path", 799}, + {" New hotlist group ", 800}, + {"Name of new group", 801}, + {"Label for \"%s\":", 802}, + {" Add to hotlist ", 803}, + {" Remove: ", 804}, {"\ \n\ Group not empty.\n\ - Remove it?", 804}, - {" Top level group ", 805}, - {"Hotlist is now kept in file ~/", 806}, - {"MC will load hotlist from ~/", 807}, - {"and then delete [Hotlist] section there", 808}, - {" Hotlist Load ", 809}, - {"MC was unable to write ~/", 810}, - {" file, your old hotlist entries were not deleted", 811}, - {"You have ~/", 812}, - {" file and [Hotlist] section in ~/", 813}, - {"Your ~/", 814}, - {" most probably was created\n", 815}, + Remove it?", 805}, + {" Top level group ", 806}, + {"Hotlist is now kept in file ~/", 807}, + {"MC will load hotlist from ~/", 808}, + {"and then delete [Hotlist] section there", 809}, + {" Hotlist Load ", 810}, + {"MC was unable to write ~/", 811}, + {" file, your old hotlist entries were not deleted", 812}, + {"You have ~/", 813}, + {" file and [Hotlist] section in ~/", 814}, + {"Your ~/", 815}, + {" most probably was created\n", 816}, {"\ by an earlier development version of MC\n\ -and is more actual than ~/", 816}, +and is more actual than ~/", 817}, {"\ entries\n\ -\n", 817}, +\n", 818}, {"\ You can choose between\n\ \n\ - Remove - remove old hotlist entries from ~/", 818}, + Remove - remove old hotlist entries from ~/", 819}, {"\ 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 ~/", 819}, - {"&Merge", 820}, - {" Entries from ~/", 821}, - {" file your old hotlist entries were not deleted", 822}, - {"Midnight Commander %s", 823}, - {"Free nodes %d (%d%%) of %d", 824}, - {"No node information", 825}, - {"Free space ", 826}, - {" (%d%%) of ", 827}, - {"No space information", 828}, - {"Type: %s ", 829}, - {"non-local vfs", 830}, - {"Device: %s", 831}, - {"Filesystem: %s", 832}, - {"Accessed: %s", 833}, - {"Modified: %s", 834}, - {"Created: %s", 835}, - {"Size: ", 836}, - {" (%d blocks)", 837}, - {"Owner: %s/%s", 838}, - {"Links: %d", 839}, - {"Mode: %s (%04o)", 840}, - {"Location: %Xh:%Xh", 841}, - {"File: %s", 842}, - {"File: None", 843}, - {"&Vertical", 844}, - {"&Horizontal", 845}, - {"&Xterm hintbar", 846}, - {"h&Intbar visible", 847}, - {"&Keybar visible", 848}, - {"command &Prompt", 849}, - {"show &Mini status", 850}, - {"menu&Bar visible", 851}, - {"&Equal split", 852}, - {"pe&Rmissions", 853}, - {"&File types", 854}, - {"&Save", 855}, - {" Layout ", 856}, - {" Panel split ", 857}, - {" Highlight... ", 858}, - {" Other options ", 859}, - {"output lines", 860}, - {"Layout", 861}, - {" Learn keys ", 862}, - {" Teach me a key ", 863}, + Merge - add old entries to hotlist as group \"Entries from ~/", 820}, + {"&Merge", 821}, + {" Entries from ~/", 822}, + {" file your old hotlist entries were not deleted", 823}, + {"Midnight Commander %s", 824}, + {"Free nodes %d (%d%%) of %d", 825}, + {"No node information", 826}, + {"Free space ", 827}, + {" (%d%%) of ", 828}, + {"No space information", 829}, + {"Type: %s ", 830}, + {"non-local vfs", 831}, + {"Device: %s", 832}, + {"Filesystem: %s", 833}, + {"Accessed: %s", 834}, + {"Modified: %s", 835}, + {"Created: %s", 836}, + {"Size: ", 837}, + {" (%d blocks)", 838}, + {"Owner: %s/%s", 839}, + {"Links: %d", 840}, + {"Mode: %s (%04o)", 841}, + {"Location: %Xh:%Xh", 842}, + {"File: %s", 843}, + {"File: None", 844}, + {"&Vertical", 845}, + {"&Horizontal", 846}, + {"&Xterm hintbar", 847}, + {"h&Intbar visible", 848}, + {"&Keybar visible", 849}, + {"command &Prompt", 850}, + {"show &Mini status", 851}, + {"menu&Bar visible", 852}, + {"&Equal split", 853}, + {"pe&Rmissions", 854}, + {"&File types", 855}, + {"&Save", 856}, + {" Layout ", 857}, + {" Panel split ", 858}, + {" Highlight... ", 859}, + {" Other options ", 860}, + {"output lines", 861}, + {"Layout", 862}, + {" Learn keys ", 863}, + {" Teach me a key ", 864}, {"\ Please press the %s\n\ and then wait until this message disappears.\n\ @@ -1025,329 +1026,329 @@ next to its button.\n\ \n\ If you want to escape, press a single Escape key\n\ -and wait as well.", 864}, - {" Cannot accept this key ", 865}, - {" You have entered \"%s\"", 866}, - {"OK", 867}, +and wait as well.", 865}, + {" Cannot accept this key ", 866}, + {" You have entered \"%s\"", 867}, + {"OK", 868}, {"\ It seems that all your keys already\n\ -work fine. That's great.", 868}, - {"&Discard", 869}, +work fine. That's great.", 869}, + {"&Discard", 870}, {"\ Great! You have a complete terminal database!\n\ -All your keys work well.", 870}, - {"Learn keys", 871}, - {"Press all the keys mentioned here. After you have done it, check", 872}, - {"which keys are not marked with OK. Press space on the missing", 873}, - {"key, or click with the mouse to define it. Move around with Tab.", 874}, +All your keys work well.", 871}, + {"Learn keys", 872}, + {"Press all the keys mentioned here. After you have done it, check", 873}, + {"which keys are not marked with OK. Press space on the missing", 874}, + {"key, or click with the mouse to define it. Move around with Tab.", 875}, {"\ 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? ", 875}, - {"Press any key to continue...", 876}, - {" The shell is already running a command ", 877}, - {"&Listing mode...", 878}, - {"&Quick view C-x q", 879}, - {"&Info C-x i", 880}, - {"&Sort order...", 881}, - {"&Filter...", 882}, - {"&Network link...", 883}, - {"FT&P link...", 884}, - {"&Drive... M-d", 885}, - {"&Rescan C-r", 886}, - {"&User menu F2", 887}, - {"&View F3", 888}, - {"Vie&w file... ", 889}, - {"&Filtered view M-!", 890}, - {"&Edit F4", 891}, - {"&Copy F5", 892}, - {"c&Hmod C-x c", 893}, - {"&Link C-x l", 894}, - {"&SymLink C-x s", 895}, - {"edit s&Ymlink C-x C-s", 896}, - {"ch&Own C-x o", 897}, - {"&Advanced chown ", 898}, - {"&Rename/Move F6", 899}, - {"&Mkdir F7", 900}, - {"&Delete F8", 901}, - {"&Quick cd M-c", 902}, - {"select &Group M-+", 903}, - {"u&Nselect group M-\\", 904}, - {"reverse selec&Tion M-*", 905}, - {"e&Xit F10", 906}, - {"&Directory tree", 907}, - {"&Find file M-?", 908}, - {"s&Wap panels C-u", 909}, - {"switch &Panels on/off C-o", 910}, - {"&Compare directories C-x d", 911}, - {"e&Xternal panelize C-x !", 912}, - {"show directory s&Izes", 913}, - {"command &History", 914}, - {"di&Rectory hotlist C-\\", 915}, - {"&Active VFS list C-x a", 916}, - {"&Background jobs C-x j", 917}, - {"&Undelete files (ext2fs only)", 918}, - {"&Listing format edit", 919}, - {"&Extension file edit", 920}, - {"&Menu file edit", 921}, - {"&Configuration...", 922}, - {"c&Onfirmation...", 923}, - {"&Display bits...", 924}, - {"learn &Keys...", 925}, - {"&Virtual FS...", 926}, - {"&Save setup", 927}, - {" &Left ", 928}, - {" &Above ", 929}, - {" &File ", 930}, - {" &Command ", 931}, - {" &Options ", 932}, - {" &Right ", 933}, - {" &Below ", 934}, - {" Information ", 935}, + extra access permissions with the \"su\" command? ", 876}, + {"Press any key to continue...", 877}, + {" The shell is already running a command ", 878}, + {"&Listing mode...", 879}, + {"&Quick view C-x q", 880}, + {"&Info C-x i", 881}, + {"&Sort order...", 882}, + {"&Filter...", 883}, + {"&Network link...", 884}, + {"FT&P link...", 885}, + {"&Drive... M-d", 886}, + {"&Rescan C-r", 887}, + {"&User menu F2", 888}, + {"&View F3", 889}, + {"Vie&w file... ", 890}, + {"&Filtered view M-!", 891}, + {"&Edit F4", 892}, + {"&Copy F5", 893}, + {"c&Hmod C-x c", 894}, + {"&Link C-x l", 895}, + {"&SymLink C-x s", 896}, + {"edit s&Ymlink C-x C-s", 897}, + {"ch&Own C-x o", 898}, + {"&Advanced chown ", 899}, + {"&Rename/Move F6", 900}, + {"&Mkdir F7", 901}, + {"&Delete F8", 902}, + {"&Quick cd M-c", 903}, + {"select &Group M-+", 904}, + {"u&Nselect group M-\\", 905}, + {"reverse selec&Tion M-*", 906}, + {"e&Xit F10", 907}, + {"&Directory tree", 908}, + {"&Find file M-?", 909}, + {"s&Wap panels C-u", 910}, + {"switch &Panels on/off C-o", 911}, + {"&Compare directories C-x d", 912}, + {"e&Xternal panelize C-x !", 913}, + {"show directory s&Izes", 914}, + {"command &History", 915}, + {"di&Rectory hotlist C-\\", 916}, + {"&Active VFS list C-x a", 917}, + {"&Background jobs C-x j", 918}, + {"&Undelete files (ext2fs only)", 919}, + {"&Listing format edit", 920}, + {"&Extension file edit", 921}, + {"&Menu file edit", 922}, + {"&Configuration...", 923}, + {"c&Onfirmation...", 924}, + {"&Display bits...", 925}, + {"learn &Keys...", 926}, + {"&Virtual FS...", 927}, + {"&Save setup", 928}, + {" &Left ", 929}, + {" &Above ", 930}, + {" &File ", 931}, + {" &Command ", 932}, + {" &Options ", 933}, + {" &Right ", 934}, + {" &Below ", 935}, + {" Information ", 936}, {"\ 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. ", 936}, - {"Menu", 937}, - {"Thank you for using GNU Midnight Commander", 938}, - {"with mouse support on xterm%s.\n", 939}, - {" and the Linux console", 940}, - {"The TERM environment variable is unset!\n", 941}, - {"Library directory for the Midnight Commander: %s\n", 942}, - {"\ -Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 943}, - {"Geometry for the window", 944}, - {"GEOMETRY", 945}, - {"No windows opened at startup", 946}, - {"Force activation even if a server is already running", 947}, + the details. ", 937}, + {"Menu", 938}, + {"Thank you for using GNU Midnight Commander", 939}, + {"with mouse support on xterm%s.\n", 940}, + {" and the Linux console", 941}, + {"The TERM environment variable is unset!\n", 942}, + {"Library directory for the Midnight Commander: %s\n", 943}, + {"\ +Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 944}, + {"Geometry for the window", 945}, + {"GEOMETRY", 946}, + {"No windows opened at startup", 947}, + {"Force activation even if a server is already running", 948}, {"\ 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", 948}, - {" Notice ", 949}, +On some systems you may want to run # `which mc`\n", 949}, + {" Notice ", 950}, {"\ The Midnight Commander configuration files \n\ are now stored in the ~/.mc directory, the \n\ - files have been moved now\n", 950}, - {"safe de&Lete", 951}, - {"cd follows lin&Ks", 952}, - {"advanced cho&Wn", 953}, - {"l&Ynx-like motion", 954}, - {"Animation", 955}, - {"rotatin&G dash", 956}, - {"co&Mplete: show all", 957}, - {"&Use internal view", 958}, - {"use internal ed&It", 959}, - {"auto m&Enus", 960}, - {"&Auto save setup", 961}, - {"shell &Patterns", 962}, - {"Compute &Totals", 963}, - {"&Verbose operation", 964}, - {"&Fast dir reload", 965}, - {"mi&X all files", 966}, - {"&Drop down menus", 967}, - {"ma&Rk moves down", 968}, - {"show &Hidden files", 969}, - {"show &Backup files", 970}, - {"&Never", 971}, - {"on dumb &Terminals", 972}, - {"alwa&Ys", 973}, - {" Configure options ", 974}, - {" Panel options ", 975}, - {" Pause after run... ", 976}, - {"Configure options", 977}, - {"&Add new", 978}, - {" External panelize ", 979}, - {"External panelize", 980}, - {"Other command", 981}, - {" Add to external panelize ", 982}, - {" Enter command label: ", 983}, - {" I can't run external panelize while logged on a non local directory ", 984}, - {"Find *.orig after patching", 985}, - {"Find SUID and SGID programs", 986}, - {"Cannot invoke command.", 987}, - {"Pipe close failed", 988}, - {"Show this help message", 989}, - {"Display brief usage message", 990}, - {"MTime", 991}, - {"ATime", 992}, - {"CTime", 993}, - {"Permission", 994}, - {"Perm", 995}, - {"Nl", 996}, - {"Inode", 997}, - {"UID", 998}, - {"GID", 999}, - {" %s bytes in %d file%s", 1000}, - {"Unknow tag on display format: ", 1001}, - {" Do you really want to execute? ", 1002}, - {" No action taken ", 1003}, - {"RenMov", 1004}, - {"Mkdir", 1005}, + files have been moved now\n", 951}, + {"safe de&Lete", 952}, + {"cd follows lin&Ks", 953}, + {"advanced cho&Wn", 954}, + {"l&Ynx-like motion", 955}, + {"Animation", 956}, + {"rotatin&G dash", 957}, + {"co&Mplete: show all", 958}, + {"&Use internal view", 959}, + {"use internal ed&It", 960}, + {"auto m&Enus", 961}, + {"&Auto save setup", 962}, + {"shell &Patterns", 963}, + {"Compute &Totals", 964}, + {"&Verbose operation", 965}, + {"&Fast dir reload", 966}, + {"mi&X all files", 967}, + {"&Drop down menus", 968}, + {"ma&Rk moves down", 969}, + {"show &Hidden files", 970}, + {"show &Backup files", 971}, + {"&Never", 972}, + {"on dumb &Terminals", 973}, + {"alwa&Ys", 974}, + {" Configure options ", 975}, + {" Panel options ", 976}, + {" Pause after run... ", 977}, + {"Configure options", 978}, + {"&Add new", 979}, + {" External panelize ", 980}, + {"External panelize", 981}, + {"Other command", 982}, + {" Add to external panelize ", 983}, + {" Enter command label: ", 984}, + {" I can't run external panelize while logged on a non local directory ", 985}, + {"Find *.orig after patching", 986}, + {"Find SUID and SGID programs", 987}, + {"Cannot invoke command.", 988}, + {"Pipe close failed", 989}, + {"Show this help message", 990}, + {"Display brief usage message", 991}, + {"MTime", 992}, + {"ATime", 993}, + {"CTime", 994}, + {"Permission", 995}, + {"Perm", 996}, + {"Nl", 997}, + {"Inode", 998}, + {"UID", 999}, + {"GID", 1000}, + {" %s bytes in %d file%s", 1001}, + {"Unknow tag on display format: ", 1002}, + {" Do you really want to execute? ", 1003}, + {" No action taken ", 1004}, + {"RenMov", 1005}, + {"Mkdir", 1006}, {"\ Can't chdir to %s \n\ - %s ", 1006}, - {"Couldn't open named pipe %s\n", 1007}, - {" The shell is still active. Quit anyway? ", 1008}, - {" There are stopped jobs.", 1009}, - {" Quit anyway? ", 1010}, - {"Warning: Couldn't change to %s.\n", 1011}, + %s ", 1007}, + {"Couldn't open named pipe %s\n", 1008}, + {" The shell is still active. Quit anyway? ", 1009}, + {" There are stopped jobs.", 1010}, + {" Quit anyway? ", 1011}, + {"Warning: Couldn't change to %s.\n", 1012}, {"\ Can't open the %s file for writing:\n\ -%s\n", 1012}, - {"Copy \"%s\" directory to:", 1013}, - {"Move \"%s\" directory to:", 1014}, +%s\n", 1013}, + {"Copy \"%s\" directory to:", 1014}, + {"Move \"%s\" directory to:", 1015}, {"\ Can't stat the destination \n\ - %s ", 1015}, - {" The destination isn't a directory ", 1016}, - {" Delete %s? ", 1017}, - {"Static", 1018}, - {"Dynamc", 1019}, + %s ", 1016}, + {" The destination isn't a directory ", 1017}, + {" Delete %s? ", 1018}, + {"Static", 1019}, + {"Dynamc", 1020}, {"\ Can't chdir to \"%s\" \n\ - %s ", 1020}, - {"Forget", 1021}, - {"Rmdir", 1022}, + %s ", 1021}, + {"Forget", 1022}, + {"Rmdir", 1023}, {"\ Can't write to the %s file:\n\ -%s\n", 1023}, - {" Invalid shell pattern defination \"%c\". ", 1024}, - {" Debug ", 1025}, - {" ERROR: ", 1026}, - {" True: ", 1027}, - {" False: ", 1028}, - {" Warning -- ignoring file ", 1029}, +%s\n", 1024}, + {" Invalid shell pattern defination \"%c\". ", 1025}, + {" Debug ", 1026}, + {" ERROR: ", 1027}, + {" True: ", 1028}, + {" False: ", 1029}, + {" Warning -- ignoring file ", 1030}, {"\ File %s is not owned by root or you or is world writable.\n\ -Using it may compromise your security", 1030}, - {" I can't run programs while logged on a non local directory ", 1031}, - {" User menu ", 1032}, - {"name_trunc: too big", 1033}, - {" Pipe failed ", 1034}, - {" Dup failed ", 1035}, +Using it may compromise your security", 1031}, + {" I can't run programs while logged on a non local directory ", 1032}, + {" User menu ", 1033}, + {"name_trunc: too big", 1034}, + {" Pipe failed ", 1035}, + {" Dup failed ", 1036}, {"\ File: \n\ \n\ - ", 1036}, + ", 1037}, {"\ \n\ \n\ -has been modified, do you want to save the changes?\n", 1037}, - {" Save changes ", 1038}, - {" Can't spawn child program ", 1039}, - {" Empty output from child filter ", 1040}, - {" Could not open file ", 1041}, - {" Can't open file \"", 1042}, +has been modified, do you want to save the changes?\n", 1038}, + {" Save changes ", 1039}, + {" Can't spawn child program ", 1040}, + {" Empty output from child filter ", 1041}, + {" Could not open file ", 1042}, + {" Can't open file \"", 1043}, {"\ Can't stat file \n\ - ", 1043}, - {" Can't view: not a regular file ", 1044}, - {"File: %s", 1045}, - {" [grow]", 1046}, - {"Searching for `%s'", 1047}, - {" Search string not found ", 1048}, - {" Invalid regular expression ", 1049}, + ", 1044}, + {" Can't view: not a regular file ", 1045}, + {"File: %s", 1046}, + {" [grow]", 1047}, + {"Searching for `%s'", 1048}, + {" Search string not found ", 1049}, + {" Invalid regular expression ", 1050}, {"\ The current line number is %d.\n\ - Enter the new line number:", 1050}, - {" Enter regexp:", 1051}, - {" Enter search string:", 1052}, - {"Ascii", 1053}, - {"Hex", 1054}, - {"Line", 1055}, - {"RxSrch", 1056}, - {"EdText", 1057}, - {"EdHex", 1058}, - {"UnWrap", 1059}, - {"Wrap", 1060}, - {"HxSrch", 1061}, - {"Raw", 1062}, - {"Parse", 1063}, - {"Unform", 1064}, - {"Format", 1065}, - {"Function key 1", 1066}, - {"Function key 2", 1067}, - {"Function key 3", 1068}, - {"Function key 4", 1069}, - {"Function key 5", 1070}, - {"Function key 6", 1071}, - {"Function key 7", 1072}, - {"Function key 8", 1073}, - {"Function key 9", 1074}, - {"Function key 10", 1075}, - {"Function key 11", 1076}, - {"Function key 12", 1077}, - {"Function key 13", 1078}, - {"Function key 14", 1079}, - {"Function key 15", 1080}, - {"Function key 16", 1081}, - {"Function key 17", 1082}, - {"Function key 18", 1083}, - {"Function key 19", 1084}, - {"Function key 20", 1085}, - {"Backspace key", 1086}, - {"End key", 1087}, - {"Up arrow key", 1088}, - {"Down arrow key", 1089}, - {"Left arrow key", 1090}, - {"Right arrow key", 1091}, - {"Home key", 1092}, - {"Page Down key", 1093}, - {"Page Up key", 1094}, - {"Insert key", 1095}, - {"Delete key", 1096}, - {"Completion/M-tab", 1097}, - {"+ on keypad", 1098}, - {"- on keypad", 1099}, - {"* on keypad", 1100}, - {"Left arrow keypad", 1101}, - {"Right arrow keypad", 1102}, - {"Up arrow keypad", 1103}, - {"Down arrow keypad", 1104}, - {"Home on keypad", 1105}, - {"End on keypad", 1106}, - {"Page Down keypad", 1107}, - {"Page Up keypad", 1108}, - {"Insert on keypad", 1109}, - {"Delete on keypad", 1110}, - {"Enter on keypad", 1111}, - {"Slash on keypad", 1112}, - {"NumLock on keypad", 1113}, - {"Password:", 1114}, - {"Password", 1115}, - {"Ok", 1116}, + Enter the new line number:", 1051}, + {" Enter regexp:", 1052}, + {" Enter search string:", 1053}, + {"Ascii", 1054}, + {"Hex", 1055}, + {"Line", 1056}, + {"RxSrch", 1057}, + {"EdText", 1058}, + {"EdHex", 1059}, + {"UnWrap", 1060}, + {"Wrap", 1061}, + {"HxSrch", 1062}, + {"Raw", 1063}, + {"Parse", 1064}, + {"Unform", 1065}, + {"Format", 1066}, + {"Function key 1", 1067}, + {"Function key 2", 1068}, + {"Function key 3", 1069}, + {"Function key 4", 1070}, + {"Function key 5", 1071}, + {"Function key 6", 1072}, + {"Function key 7", 1073}, + {"Function key 8", 1074}, + {"Function key 9", 1075}, + {"Function key 10", 1076}, + {"Function key 11", 1077}, + {"Function key 12", 1078}, + {"Function key 13", 1079}, + {"Function key 14", 1080}, + {"Function key 15", 1081}, + {"Function key 16", 1082}, + {"Function key 17", 1083}, + {"Function key 18", 1084}, + {"Function key 19", 1085}, + {"Function key 20", 1086}, + {"Backspace key", 1087}, + {"End key", 1088}, + {"Up arrow key", 1089}, + {"Down arrow key", 1090}, + {"Left arrow key", 1091}, + {"Right arrow key", 1092}, + {"Home key", 1093}, + {"Page Down key", 1094}, + {"Page Up key", 1095}, + {"Insert key", 1096}, + {"Delete key", 1097}, + {"Completion/M-tab", 1098}, + {"+ on keypad", 1099}, + {"- on keypad", 1100}, + {"* on keypad", 1101}, + {"Left arrow keypad", 1102}, + {"Right arrow keypad", 1103}, + {"Up arrow keypad", 1104}, + {"Down arrow keypad", 1105}, + {"Home on keypad", 1106}, + {"End on keypad", 1107}, + {"Page Down keypad", 1108}, + {"Page Up keypad", 1109}, + {"Insert on keypad", 1110}, + {"Delete on keypad", 1111}, + {"Enter on keypad", 1112}, + {"Slash on keypad", 1113}, + {"NumLock on keypad", 1114}, + {"Password:", 1115}, + {"Password", 1116}, + {"Ok", 1117}, {"\ Couldn't open %s archive\n\ -%s", 1117}, - {"Inconsistent extfs archive", 1118}, - {"Sorry, we can not do password authenticated connections for now.", 1119}, - {" Could not set source routing (%s)", 1120}, +%s", 1118}, + {"Inconsistent extfs archive", 1119}, + {"Sorry, we can not do password authenticated connections for now.", 1120}, + {" Could not set source routing (%s)", 1121}, {"\ ~/.netrc file has not correct mode.\n\ -Remove password or correct mode.", 1121}, - {" MCFS ", 1122}, - {" The server does not support this version ", 1123}, +Remove password or correct mode.", 1122}, + {" MCFS ", 1123}, + {" The server does not support this version ", 1124}, {"\ The remote server is not running on a system port \n\ you need a password to log in, but the information may \n\ - not be safe on the remote side. Continue? \n", 1124}, - {" Yes ", 1125}, - {" No ", 1126}, - {" The remote server is running on strange port. Giving up.\n", 1127}, - {" MCFS Password required ", 1128}, - {" Invalid password ", 1129}, - {" Too many open connections ", 1130}, + not be safe on the remote side. Continue? \n", 1125}, + {" Yes ", 1126}, + {" No ", 1127}, + {" The remote server is running on strange port. Giving up.\n", 1128}, + {" MCFS Password required ", 1129}, + {" Invalid password ", 1130}, + {" Too many open connections ", 1131}, {"\ Couldn't open tar archive\n\ -%s", 1131}, - {"Unexpected EOF on archive file", 1132}, - {"Inconsistent tar archive", 1133}, +%s", 1132}, + {"Unexpected EOF on archive file", 1133}, + {"Inconsistent tar archive", 1134}, {"\ Hmm,...\n\ %s\n\ -doesn't look like a tar archive.", 1134}, +doesn't look like a tar archive.", 1135}, }; -int _msg_tbl_length = 1134; +int _msg_tbl_length = 1135; diff -ruN old/mc-4.5.18/po/mc.pot new/mc-4.5.19/po/mc.pot --- old/mc-4.5.18/po/mc.pot Tue Feb 23 21:41:40 1999 +++ new/mc-4.5.19/po/mc.pot Thu Feb 25 00:13:27 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-02-23 20:41-0600\n" +"POT-Creation-Date: 1999-02-24 23:13-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,23 +47,23 @@ msgid "The GNOME edition of the Midnight Commander file manager." msgstr "" -#: gnome/gcmd.c:121 src/main.c:821 src/screen.c:2047 +#: gnome/gcmd.c:121 src/main.c:827 src/screen.c:2047 msgid " The Midnight Commander " msgstr "" -#: gnome/gcmd.c:122 src/main.c:822 +#: gnome/gcmd.c:122 src/main.c:828 msgid " Do you really want to quit the Midnight Commander? " msgstr "" -#: gnome/gcmd.c:123 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1809 -#: src/file.c:2189 src/filegui.c:573 src/hotlist.c:1035 src/main.c:823 +#: gnome/gcmd.c:123 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1817 +#: src/file.c:2197 src/filegui.c:573 src/hotlist.c:1035 src/main.c:829 #: src/screen.c:2049 src/subshell.c:701 src/subshell.c:727 src/tree.c:755 #: src/view.c:404 msgid "&Yes" msgstr "" -#: gnome/gcmd.c:123 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1809 -#: src/file.c:2189 src/filegui.c:572 src/hotlist.c:1035 src/main.c:823 +#: gnome/gcmd.c:123 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1817 +#: src/file.c:2197 src/filegui.c:572 src/hotlist.c:1035 src/main.c:829 #: src/screen.c:2049 src/subshell.c:701 src/subshell.c:727 src/tree.c:755 #: src/view.c:404 msgid "&No" @@ -181,7 +181,7 @@ msgid "Enter extra arguments:" msgstr "" -#: gnome/gdesktop.c:392 gnome/gdesktop.c:1810 +#: gnome/gdesktop.c:392 gnome/gdesktop.c:1816 msgid "Warning" msgstr "" @@ -190,41 +190,41 @@ msgid "Could not open %s; will not have desktop icons" msgstr "" -#: gnome/gdesktop.c:977 +#: gnome/gdesktop.c:983 msgid "While running the mount/umount command" msgstr "" -#: gnome/gdesktop.c:1026 +#: gnome/gdesktop.c:1032 msgid "While running the eject command" msgstr "" -#: gnome/gdesktop.c:1066 gnome/gicon.c:154 gnome/gtools.c:52 +#: gnome/gdesktop.c:1072 gnome/gicon.c:154 gnome/gtools.c:52 msgid "Error" msgstr "" #. Create the link to the user's home directory so that he will have an icon -#: gnome/gdesktop.c:1806 +#: gnome/gdesktop.c:1812 msgid "Home directory" msgstr "" -#: gnome/gdesktop.c:1811 +#: gnome/gdesktop.c:1817 #, c-format msgid "Could not symlink %s to %s; will not have initial desktop icons." msgstr "" -#: gnome/gdesktop.c:2140 gnome/glayout.c:410 +#: gnome/gdesktop.c:2148 gnome/glayout.c:410 msgid "Arrange Icons" msgstr "" -#: gnome/gdesktop.c:2142 +#: gnome/gdesktop.c:2150 msgid "Create New Window" msgstr "" -#: gnome/gdesktop.c:2144 gnome/glayout.c:412 +#: gnome/gdesktop.c:2152 msgid "Rescan Mountable Devices" msgstr "" -#: gnome/gdesktop.c:2145 gnome/glayout.c:413 +#: gnome/gdesktop.c:2153 gnome/glayout.c:413 msgid "Rescan Desktop" msgstr "" @@ -287,7 +287,7 @@ msgid "Replace it?" msgstr "" -#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1067 src/file.c:789 +#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1067 src/file.c:797 #: src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 msgid "Copy" msgstr "" @@ -579,6 +579,10 @@ msgid "Terminates the file manager and the desktop" msgstr "" +#: gnome/glayout.c:412 +msgid "Rescan System Devices" +msgstr "" + #: gnome/glayout.c:420 gnome/glayout.c:430 msgid "_Layout" msgstr "" @@ -1095,11 +1099,11 @@ msgid "help" msgstr "" -#: gnome/gwidget.c:96 src/file.c:2208 +#: gnome/gwidget.c:96 src/file.c:2216 msgid "yes" msgstr "" -#: gnome/gwidget.c:98 src/file.c:2206 +#: gnome/gwidget.c:98 src/file.c:2214 msgid "no" msgstr "" @@ -1152,8 +1156,8 @@ #. Warning message with a query to continue or cancel the operation #: gtkedit/editcmd.c:482 gtkedit/editcmd.c:801 gtkedit/editcmd.c:831 -#: gtkedit/editcmd.c:978 gtkedit/editcmd.c:1075 src/ext.c:294 src/file.c:606 -#: src/help.c:318 src/main.c:668 src/screen.c:2063 src/subshell.c:700 +#: gtkedit/editcmd.c:978 gtkedit/editcmd.c:1075 src/ext.c:294 src/file.c:614 +#: src/help.c:318 src/main.c:674 src/screen.c:2063 src/subshell.c:700 #: src/subshell.c:726 src/utilunix.c:388 src/utilunix.c:392 src/utilunix.c:458 #: vfs/mcfs.c:170 msgid " Warning " @@ -1545,7 +1549,7 @@ msgid "Error initialising editor.\n" msgstr "" -#: gtkedit/editwidget.c:1063 src/help.c:806 src/main.c:1671 src/screen.c:2284 +#: gtkedit/editwidget.c:1063 src/help.c:806 src/main.c:1677 src/screen.c:2284 #: src/screen.c:2314 src/tree.c:1018 src/view.c:1987 msgid "Help" msgstr "" @@ -1562,11 +1566,11 @@ msgid "Search" msgstr "" -#: gtkedit/editwidget.c:1072 src/main.c:1673 +#: gtkedit/editwidget.c:1072 src/main.c:1679 msgid "PullDn" msgstr "" -#: gtkedit/editwidget.c:1073 src/help.c:818 src/main.c:1674 src/view.c:1989 +#: gtkedit/editwidget.c:1073 src/help.c:818 src/main.c:1680 src/view.c:1989 #: src/view.c:2009 msgid "Quit" msgstr "" @@ -1751,7 +1755,7 @@ msgid "&Save mode..." msgstr "" -#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1305 +#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1311 msgid "&Layout..." msgstr "" @@ -2059,7 +2063,7 @@ msgid "Background process:" msgstr "" -#: src/background.c:284 src/file.c:2131 +#: src/background.c:284 src/file.c:2139 msgid " Background process error " msgstr "" @@ -2533,7 +2537,7 @@ msgid " Link " msgstr "" -#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1639 +#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1647 msgid " to:" msgstr "" @@ -2775,159 +2779,159 @@ msgid " Delete " msgstr "" -#: src/file.c:244 +#: src/file.c:252 msgid " Invalid target mask " msgstr "" -#: src/file.c:342 +#: src/file.c:350 msgid " Could not make the hardlink " msgstr "" -#: src/file.c:384 +#: src/file.c:392 #, c-format msgid "" " Cannot read source link \"%s\" \n" " %s " msgstr "" -#: src/file.c:394 +#: src/file.c:402 msgid "" " Cannot make stable symlinks across non-local filesystems: \n" "\n" " Option Stable Symlinks will be disabled " msgstr "" -#: src/file.c:442 +#: src/file.c:450 #, c-format msgid "" " Cannot create target symlink \"%s\" \n" " %s " msgstr "" -#: src/file.c:510 +#: src/file.c:518 #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" " %s " msgstr "" -#: src/file.c:519 +#: src/file.c:527 #, c-format msgid "" " Cannot stat source file \"%s\" \n" " %s " msgstr "" -#: src/file.c:532 +#: src/file.c:540 #, c-format msgid " `%s' and `%s' are the same file. " msgstr "" -#: src/file.c:565 +#: src/file.c:573 #, c-format msgid "" " Cannot create special file \"%s\" \n" " %s " msgstr "" -#: src/file.c:574 src/file.c:799 +#: src/file.c:582 src/file.c:807 #, c-format msgid "" " Cannot chown target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:583 src/file.c:817 +#: src/file.c:591 src/file.c:825 #, c-format msgid "" " Cannot chmod target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:596 +#: src/file.c:604 #, c-format msgid "" " Cannot open source file \"%s\" \n" " %s " msgstr "" -#: src/file.c:606 +#: src/file.c:614 msgid " Reget failed, about to overwrite file " msgstr "" -#: src/file.c:612 +#: src/file.c:620 #, c-format msgid "" " Cannot fstat source file \"%s\" \n" " %s " msgstr "" -#: src/file.c:638 +#: src/file.c:646 #, c-format msgid "" " Cannot create target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:652 +#: src/file.c:660 #, c-format msgid "" " Cannot fstat target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:683 +#: src/file.c:691 #, c-format msgid "" " Cannot read source file \"%s\" \n" " %s " msgstr "" -#: src/file.c:713 +#: src/file.c:721 #, c-format msgid "" " Cannot write target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:732 +#: src/file.c:740 msgid "(stalled)" msgstr "" -#: src/file.c:770 +#: src/file.c:778 #, c-format msgid "" " Cannot close source file \"%s\" \n" " %s " msgstr "" -#: src/file.c:779 +#: src/file.c:787 #, c-format msgid "" " Cannot close target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:789 +#: src/file.c:797 msgid "Incomplete file was retrieved. Keep it?" msgstr "" -#: src/file.c:790 +#: src/file.c:798 msgid "&Delete" msgstr "" -#: src/file.c:790 src/hotlist.c:1443 +#: src/file.c:798 src/hotlist.c:1443 msgid "&Keep" msgstr "" -#: src/file.c:862 +#: src/file.c:870 #, c-format msgid "" " Cannot stat source directory \"%s\" \n" " %s " msgstr "" -#: src/file.c:885 +#: src/file.c:893 #, c-format msgid "" " Source directory \"%s\" is not a directory \n" @@ -2935,21 +2939,21 @@ msgstr "" #. we found a cyclic symbolic link -#: src/file.c:893 +#: src/file.c:901 #, c-format msgid "" " Cannot copy cyclic symbolic link \n" " `%s' " msgstr "" -#: src/file.c:946 +#: src/file.c:954 #, c-format msgid "" " Cannot create target directory \"%s\" \n" " %s " msgstr "" -#: src/file.c:964 +#: src/file.c:972 #, c-format msgid "" " Cannot chown target directory \"%s\" \n" @@ -2957,69 +2961,69 @@ msgstr "" #. Source doesn't exist -#: src/file.c:1074 +#: src/file.c:1082 #, c-format msgid "" " Cannot stat file \"%s\" \n" " %s " msgstr "" -#: src/file.c:1096 +#: src/file.c:1104 #, c-format msgid " `%s' and `%s' are the same file " msgstr "" -#: src/file.c:1103 +#: src/file.c:1111 #, c-format msgid " Cannot overwrite directory `%s' " msgstr "" -#: src/file.c:1140 +#: src/file.c:1148 #, c-format msgid "" " Cannot move file \"%s\" to \"%s\" \n" " %s " msgstr "" -#: src/file.c:1160 +#: src/file.c:1168 #, c-format msgid "" " Cannot remove file \"%s\" \n" " %s " msgstr "" -#: src/file.c:1213 +#: src/file.c:1221 #, c-format msgid " Cannot overwrite directory \"%s\" %s " msgstr "" -#: src/file.c:1215 +#: src/file.c:1223 #, c-format msgid " Cannot overwrite file \"%s\" %s " msgstr "" -#: src/file.c:1238 +#: src/file.c:1246 #, c-format msgid "" " Cannot move directory \"%s\" to \"%s\" \n" " %s " msgstr "" -#: src/file.c:1301 +#: src/file.c:1309 #, c-format msgid "" " Cannot delete file \"%s\" \n" " %s " msgstr "" -#: src/file.c:1362 src/file.c:1429 src/file.c:1458 +#: src/file.c:1370 src/file.c:1437 src/file.c:1466 #, c-format msgid "" " Cannot remove directory \"%s\" \n" " %s " msgstr "" -#: src/file.c:1494 +#: src/file.c:1502 msgid " Internal error: get_file \n" msgstr "" @@ -3032,144 +3036,144 @@ #. * (I don't use spaces around the words, because someday they could be #. * dropped, when widgets get smarter) #. -#: src/file.c:1615 +#: src/file.c:1623 msgid "1Copy" msgstr "" -#: src/file.c:1615 +#: src/file.c:1623 msgid "1Move" msgstr "" -#: src/file.c:1615 +#: src/file.c:1623 msgid "1Delete" msgstr "" -#: src/file.c:1630 +#: src/file.c:1638 #, c-format msgid "%o %f \"%s\"%m" msgstr "" -#: src/file.c:1631 +#: src/file.c:1639 #, c-format msgid "%o %d %f%m" msgstr "" -#: src/file.c:1633 +#: src/file.c:1641 #, c-format msgid "%o %f \"%s\"%e" msgstr "" -#: src/file.c:1634 +#: src/file.c:1642 #, c-format msgid "%o %d %f%e" msgstr "" -#: src/file.c:1638 +#: src/file.c:1646 msgid "file" msgstr "" -#: src/file.c:1638 +#: src/file.c:1646 msgid "files" msgstr "" -#: src/file.c:1638 +#: src/file.c:1646 msgid "directory" msgstr "" -#: src/file.c:1638 +#: src/file.c:1646 msgid "directories" msgstr "" -#: src/file.c:1639 +#: src/file.c:1647 msgid "files/directories" msgstr "" -#: src/file.c:1639 +#: src/file.c:1647 msgid " with source mask:" msgstr "" -#: src/file.c:1787 +#: src/file.c:1795 msgid " Can't operate on \"..\"! " msgstr "" -#: src/file.c:1806 +#: src/file.c:1814 msgid "Yes" msgstr "" -#: src/file.c:1806 +#: src/file.c:1814 msgid "No" msgstr "" -#: src/file.c:1859 +#: src/file.c:1867 msgid " Sorry, I could not put the job in background " msgstr "" -#: src/file.c:1942 src/file.c:2047 +#: src/file.c:1950 src/file.c:2055 msgid " Internal failure " msgstr "" -#: src/file.c:1942 src/file.c:2047 +#: src/file.c:1950 src/file.c:2055 msgid " Unknown file operation " msgstr "" -#: src/file.c:1961 +#: src/file.c:1969 #, c-format msgid "" " Destination \"%s\" must be a directory \n" " %s " msgstr "" -#: src/file.c:2132 src/filegui.c:263 +#: src/file.c:2140 src/filegui.c:263 msgid "&Skip" msgstr "" -#: src/file.c:2132 +#: src/file.c:2140 msgid "&Retry" msgstr "" -#: src/file.c:2132 src/file.c:2191 src/filegui.c:260 src/filegui.c:562 +#: src/file.c:2140 src/file.c:2199 src/filegui.c:260 src/filegui.c:562 msgid "&Abort" msgstr "" -#: src/file.c:2182 +#: src/file.c:2190 msgid "" "\n" " Directory not empty. \n" " Delete it recursively? " msgstr "" -#: src/file.c:2183 +#: src/file.c:2191 msgid "" "\n" " Background process: Directory not empty \n" " Delete it recursively? " msgstr "" -#: src/file.c:2184 +#: src/file.c:2192 msgid " Delete: " msgstr "" -#: src/file.c:2190 +#: src/file.c:2198 msgid "a&ll" msgstr "" -#: src/file.c:2190 src/filegui.c:565 +#: src/file.c:2198 src/filegui.c:565 msgid "non&E" msgstr "" -#: src/file.c:2200 +#: src/file.c:2208 msgid " Type 'yes' if you REALLY want to delete " msgstr "" -#: src/file.c:2202 +#: src/file.c:2210 msgid "all the directories " msgstr "" -#: src/file.c:2204 +#: src/file.c:2212 msgid " Recursive Delete " msgstr "" -#: src/file.c:2205 +#: src/file.c:2213 msgid " Background process: Recursive Delete " msgstr "" @@ -3331,7 +3335,7 @@ msgid "Content: " msgstr "" -#: src/find.c:171 src/main.c:1202 src/main.c:1223 +#: src/find.c:171 src/main.c:1208 src/main.c:1229 msgid "&Tree" msgstr "" @@ -3870,7 +3874,7 @@ msgid "key, or click with the mouse to define it. Move around with Tab." msgstr "" -#: src/main.c:669 +#: src/main.c:675 msgid "" " The Commander can't change to the directory that \n" " the subshell claims you are in. Perhaps you have \n" @@ -3878,247 +3882,247 @@ " extra access permissions with the \"su\" command? " msgstr "" -#: src/main.c:744 +#: src/main.c:750 msgid "Press any key to continue..." msgstr "" -#: src/main.c:794 +#: src/main.c:800 msgid " The shell is already running a command " msgstr "" -#: src/main.c:1199 src/main.c:1220 +#: src/main.c:1205 src/main.c:1226 msgid "&Listing mode..." msgstr "" -#: src/main.c:1200 src/main.c:1221 +#: src/main.c:1206 src/main.c:1227 msgid "&Quick view C-x q" msgstr "" -#: src/main.c:1201 src/main.c:1222 +#: src/main.c:1207 src/main.c:1228 msgid "&Info C-x i" msgstr "" -#: src/main.c:1204 src/main.c:1225 +#: src/main.c:1210 src/main.c:1231 msgid "&Sort order..." msgstr "" -#: src/main.c:1206 src/main.c:1227 +#: src/main.c:1212 src/main.c:1233 msgid "&Filter..." msgstr "" -#: src/main.c:1209 src/main.c:1230 +#: src/main.c:1215 src/main.c:1236 msgid "&Network link..." msgstr "" -#: src/main.c:1210 src/main.c:1231 +#: src/main.c:1216 src/main.c:1237 msgid "FT&P link..." msgstr "" -#: src/main.c:1214 src/main.c:1235 +#: src/main.c:1220 src/main.c:1241 msgid "&Drive... M-d" msgstr "" -#: src/main.c:1216 src/main.c:1237 +#: src/main.c:1222 src/main.c:1243 msgid "&Rescan C-r" msgstr "" -#: src/main.c:1241 +#: src/main.c:1247 msgid "&User menu F2" msgstr "" -#: src/main.c:1242 +#: src/main.c:1248 msgid "&View F3" msgstr "" -#: src/main.c:1243 +#: src/main.c:1249 msgid "Vie&w file... " msgstr "" -#: src/main.c:1244 +#: src/main.c:1250 msgid "&Filtered view M-!" msgstr "" -#: src/main.c:1245 +#: src/main.c:1251 msgid "&Edit F4" msgstr "" -#: src/main.c:1246 +#: src/main.c:1252 msgid "&Copy F5" msgstr "" -#: src/main.c:1247 +#: src/main.c:1253 msgid "c&Hmod C-x c" msgstr "" -#: src/main.c:1249 +#: src/main.c:1255 msgid "&Link C-x l" msgstr "" -#: src/main.c:1250 +#: src/main.c:1256 msgid "&SymLink C-x s" msgstr "" -#: src/main.c:1251 +#: src/main.c:1257 msgid "edit s&Ymlink C-x C-s" msgstr "" -#: src/main.c:1252 +#: src/main.c:1258 msgid "ch&Own C-x o" msgstr "" -#: src/main.c:1253 +#: src/main.c:1259 msgid "&Advanced chown " msgstr "" -#: src/main.c:1255 +#: src/main.c:1261 msgid "&Rename/Move F6" msgstr "" -#: src/main.c:1256 +#: src/main.c:1262 msgid "&Mkdir F7" msgstr "" -#: src/main.c:1257 +#: src/main.c:1263 msgid "&Delete F8" msgstr "" -#: src/main.c:1258 +#: src/main.c:1264 msgid "&Quick cd M-c" msgstr "" -#: src/main.c:1260 +#: src/main.c:1266 msgid "select &Group M-+" msgstr "" -#: src/main.c:1261 +#: src/main.c:1267 msgid "u&Nselect group M-\\" msgstr "" -#: src/main.c:1262 +#: src/main.c:1268 msgid "reverse selec&Tion M-*" msgstr "" -#: src/main.c:1264 +#: src/main.c:1270 msgid "e&Xit F10" msgstr "" -#: src/main.c:1274 +#: src/main.c:1280 msgid "&Directory tree" msgstr "" -#: src/main.c:1276 +#: src/main.c:1282 msgid "&Find file M-?" msgstr "" -#: src/main.c:1277 +#: src/main.c:1283 msgid "s&Wap panels C-u" msgstr "" -#: src/main.c:1278 +#: src/main.c:1284 msgid "switch &Panels on/off C-o" msgstr "" -#: src/main.c:1279 +#: src/main.c:1285 msgid "&Compare directories C-x d" msgstr "" -#: src/main.c:1280 +#: src/main.c:1286 msgid "e&Xternal panelize C-x !" msgstr "" -#: src/main.c:1281 +#: src/main.c:1287 msgid "show directory s&Izes" msgstr "" -#: src/main.c:1283 +#: src/main.c:1289 msgid "command &History" msgstr "" -#: src/main.c:1284 +#: src/main.c:1290 msgid "di&Rectory hotlist C-\\" msgstr "" -#: src/main.c:1286 +#: src/main.c:1292 msgid "&Active VFS list C-x a" msgstr "" -#: src/main.c:1289 +#: src/main.c:1295 msgid "&Background jobs C-x j" msgstr "" -#: src/main.c:1293 +#: src/main.c:1299 msgid "&Undelete files (ext2fs only)" msgstr "" -#: src/main.c:1296 +#: src/main.c:1302 msgid "&Listing format edit" msgstr "" -#: src/main.c:1298 +#: src/main.c:1304 msgid "&Extension file edit" msgstr "" -#: src/main.c:1299 +#: src/main.c:1305 msgid "&Menu file edit" msgstr "" -#: src/main.c:1304 +#: src/main.c:1310 msgid "&Configuration..." msgstr "" -#: src/main.c:1306 +#: src/main.c:1312 msgid "c&Onfirmation..." msgstr "" -#: src/main.c:1307 +#: src/main.c:1313 msgid "&Display bits..." msgstr "" -#: src/main.c:1309 +#: src/main.c:1315 msgid "learn &Keys..." msgstr "" -#: src/main.c:1312 +#: src/main.c:1318 msgid "&Virtual FS..." msgstr "" -#: src/main.c:1315 +#: src/main.c:1321 msgid "&Save setup" msgstr "" -#: src/main.c:1331 src/main.c:1333 +#: src/main.c:1337 src/main.c:1339 msgid " &Left " msgstr "" -#: src/main.c:1333 +#: src/main.c:1339 msgid " &Above " msgstr "" -#: src/main.c:1336 +#: src/main.c:1342 msgid " &File " msgstr "" -#: src/main.c:1337 +#: src/main.c:1343 msgid " &Command " msgstr "" -#: src/main.c:1338 +#: src/main.c:1344 msgid " &Options " msgstr "" -#: src/main.c:1340 src/main.c:1342 +#: src/main.c:1346 src/main.c:1348 msgid " &Right " msgstr "" -#: src/main.c:1342 +#: src/main.c:1348 msgid " &Below " msgstr "" -#: src/main.c:1397 +#: src/main.c:1403 msgid " Information " msgstr "" -#: src/main.c:1398 +#: src/main.c:1404 msgid "" " Using the fast reload option may not reflect the exact \n" " directory contents. In this cases you'll need to do a \n" @@ -4126,64 +4130,64 @@ " the details. " msgstr "" -#: src/main.c:1672 src/screen.c:2285 src/screen.c:2315 +#: src/main.c:1678 src/screen.c:2285 src/screen.c:2315 msgid "Menu" msgstr "" -#: src/main.c:1877 +#: src/main.c:1883 msgid "Thank you for using GNU Midnight Commander" msgstr "" -#: src/main.c:2236 +#: src/main.c:2242 #, c-format msgid "with mouse support on xterm%s.\n" msgstr "" -#: src/main.c:2237 +#: src/main.c:2243 msgid " and the Linux console" msgstr "" -#: src/main.c:2332 +#: src/main.c:2338 msgid "The TERM environment variable is unset!\n" msgstr "" -#: src/main.c:2539 +#: src/main.c:2545 #, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "" -#: src/main.c:2550 +#: src/main.c:2556 msgid "" "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" msgstr "" -#: src/main.c:2676 +#: src/main.c:2682 msgid "Geometry for the window" msgstr "" -#: src/main.c:2676 +#: src/main.c:2682 msgid "GEOMETRY" msgstr "" -#: src/main.c:2677 +#: src/main.c:2683 msgid "No windows opened at startup" msgstr "" -#: src/main.c:2678 +#: src/main.c:2684 msgid "Force activation even if a server is already running" msgstr "" -#: src/main.c:2950 +#: src/main.c:2956 msgid "" "Couldn't open tty line. You have to run mc without the -P flag.\n" "On some systems you may want to run # `which mc`\n" msgstr "" -#: src/main.c:3024 +#: src/main.c:3030 msgid " Notice " msgstr "" -#: src/main.c:3025 +#: src/main.c:3031 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" diff -ruN old/mc-4.5.18/src/ChangeLog new/mc-4.5.19/src/ChangeLog --- old/mc-4.5.18/src/ChangeLog Tue Feb 23 21:41:25 1999 +++ new/mc-4.5.19/src/ChangeLog Thu Feb 25 00:13:17 1999 @@ -1,3 +1,15 @@ +1999-02-24 Miguel de Icaza + + * file.c: Moved FileCopyMode here (thanks to Wolfgang Scherer for + pointing this out) and made it a typedef. + + * treestore.c (process_special_dirs): New function. + (should_skip_directory): Load the settings from the global + special.dirs file and from the + + * util.c: Test for glibc/linux and if so, do not use getwd, but + getcwd as on this system it is better than popen ("pwd"). + 1999-02-18 Federico Mena Quintero * setup.c: Declare extern int tree_panel_visible for the GNOME diff -ruN old/mc-4.5.18/src/file.c new/mc-4.5.19/src/file.c --- old/mc-4.5.18/src/file.c Tue Feb 23 21:41:25 1999 +++ new/mc-4.5.19/src/file.c Thu Feb 25 00:13:15 1999 @@ -107,7 +107,7 @@ /* }}} */ -/* rcsid [] = "$Id: file.c,v 1.47 1999/02/09 00:32:02 unammx Exp $" */ +/* rcsid [] = "$Id: file.c,v 1.48 1999/02/25 04:21:38 unammx Exp $" */ int verbose = 1; @@ -155,6 +155,14 @@ N_(" Move "), N_(" Delete ") }; + +typedef enum { + RECURSIVE_YES, + RECURSIVE_NO, + RECURSIVE_ALWAYS, + RECURSIVE_NEVER, + RECURSIVE_ABORT +} FileCopyMode; static int recursive_erase (FileOpContext *ctx, char *s, long *progress_count, double *progress_bytes); diff -ruN old/mc-4.5.18/src/file.h new/mc-4.5.19/src/file.h --- old/mc-4.5.18/src/file.h Tue Feb 23 21:41:24 1999 +++ new/mc-4.5.19/src/file.h Thu Feb 25 00:13:15 1999 @@ -4,14 +4,6 @@ #include "fileopctx.h" #include "background.h" -enum { - RECURSIVE_YES, - RECURSIVE_NO, - RECURSIVE_ALWAYS, - RECURSIVE_NEVER, - RECURSIVE_ABORT -} FileCopyMode; - extern int know_not_what_am_i_doing; struct link; diff -ruN old/mc-4.5.18/src/main.c new/mc-4.5.19/src/main.c --- old/mc-4.5.18/src/main.c Tue Feb 23 21:41:25 1999 +++ new/mc-4.5.19/src/main.c Thu Feb 25 00:13:15 1999 @@ -139,7 +139,7 @@ #include "popt.h" -/* "$Id: main.c,v 1.80 1999/02/23 02:53:39 unammx Exp $" */ +/* "$Id: main.c,v 1.82 1999/02/25 05:11:45 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 */ @@ -335,8 +335,14 @@ /* Used for keeping track of the original stdout */ int stdout_fd = 0; +/* + * Ugh. Pavel, you shell hack in sfs is BAD. + * We need to kill shell from vfs + */ +#ifndef USE_VFS /* The user's shell */ char *shell; +#endif /* mc_home: The home of MC */ char *mc_home; @@ -2520,7 +2526,7 @@ }; static void -process_args (int c, char *option_arg) +process_args (int c, const char *option_arg) { switch (c) { case 'V': diff -ruN old/mc-4.5.18/src/regex.c new/mc-4.5.19/src/regex.c --- old/mc-4.5.18/src/regex.c Tue Feb 23 21:41:25 1999 +++ new/mc-4.5.19/src/regex.c Thu Feb 25 00:13:16 1999 @@ -32,7 +32,13 @@ /* We need this for `regex.h', and perhaps for the Emacs include files. */ #include +#if defined(__GLIBC__) +# if __GLIBC__ > 1 +# define ELIDE_CODE +# endif +#endif +#ifndef ELIDE_CODE /* This is for other GNU distributions with internationalized messages. */ #if HAVE_LIBINTL_H || defined (_LIBC) # include @@ -5406,6 +5412,7 @@ } #endif /* not emacs */ +#endif /* !defined(elide_code) */ /* Local variables: diff -ruN old/mc-4.5.18/src/treestore.c new/mc-4.5.19/src/treestore.c --- old/mc-4.5.18/src/treestore.c Tue Feb 23 21:41:25 1999 +++ new/mc-4.5.19/src/treestore.c Thu Feb 25 00:13:16 1999 @@ -689,26 +689,34 @@ tree_store_set_freeze (FALSE); } +static void +process_special_dirs (GList **special_dirs, char *file) +{ + char *token; + char *buffer = g_malloc (4096); + char *s; + + GetPrivateProfileString ("Special dirs", "list", + "", buffer, 4096, file); + s = buffer; + while ((token = strtok (s, ",")) != NULL){ + *special_dirs = g_list_prepend (*special_dirs, g_strdup (token)); + s = NULL; + } +} + gboolean should_skip_directory (char *dir) { - static GList *special_dirs, *l; + static GList *special_dirs; + GList *l; static int loaded; if (loaded == 0){ - char *token; - char *buffer = g_malloc (4096); - char *s; - loaded = 1; setup_init (); - GetPrivateProfileString ("Special dirs", "list", - "/afs,/coda,/:,/...,/net", buffer, 4096, profile_name); - s = buffer; - while ((token = strtok (s, ",")) != NULL){ - special_dirs = g_list_prepend (special_dirs, g_strdup (token)); - s = NULL; - } + process_special_dirs (&special_dirs, profile_name); + process_special_dirs (&special_dirs, CONFDIR "mc.global"); } for (l = special_dirs; l; l = l->next){ diff -ruN old/mc-4.5.18/src/util.c new/mc-4.5.19/src/util.c --- old/mc-4.5.18/src/util.c Tue Feb 23 21:41:25 1999 +++ new/mc-4.5.19/src/util.c Thu Feb 25 00:13:15 1999 @@ -76,7 +76,7 @@ #include "user.h" /* expand_format */ #include "../vfs/vfs.h" -/* "$Id: util.c,v 1.18 1999/02/13 20:12:52 unammx Exp $" */ +/* "$Id: util.c,v 1.19 1999/02/24 21:26:50 unammx Exp $" */ char app_text [] = "Midnight-Commander"; @@ -775,6 +775,16 @@ } #endif /* VFS_STANDALONE */ + +/* + * Ok, on systems running glibc, getcwd does not use popen pwd on + * Linux at least + */ +#ifdef __GLIBC__ +# ifdef linux +# undef HAVE_GETWD +# endif +#endif /* getwd is better than getcwd, the later uses a popen ("pwd"); */ char *get_current_wd (char *buffer, int size)