diff -ruN old/mc-4.5.27/Make.common.in new/mc-4.5.28/Make.common.in
--- old/mc-4.5.27/Make.common.in Thu Mar 18 20:42:26 1999
+++ new/mc-4.5.28/Make.common.in Fri Mar 26 15:30:38 1999
@@ -5,7 +5,7 @@
# This variable makes it possible to move the installation root to another
# directory. This is useful when you're creating a binary distribution of mc.
# If empty, normal root will be used.
-# You can run e.g. 'make install DESTDIR=/packages/mc/3.0' to accomplish
+# You can run e.g. 'make install DESTDIR=/packages/mc/5.0' to accomplish
# that.
# DESTDIR = /opt/apps/mc/$(VERSION)
@@ -18,24 +18,28 @@
builddir = @builddir@
bindir = @bindir@
sysconfdir = @sysconfdir@
+datadir = @datadir@
+libdir = @libdir@
+mandir = @mandir@
+gnomeicondir = @gnomeicondir@
+xv_bindir = @xv_bindir@
corbadir = $(sysconfdir)/CORBA/servers
-libdir = $(exec_prefix)/lib/mc
+mclibdir = $(libdir)/mc
+desktopdir = $(mclibdir)/desktop-scripts
idldir = $(prefix)/share/idl
-suppbindir = $(libdir)/bin
+suppbindir = $(mclibdir)/bin
gnewdir = $(prefix)/share/mc/templates
-tidir = $(libdir)/term
-extfsdir = $(libdir)/extfs
+tidir = $(mclibdir)/term
+extfsdir = $(mclibdir)/extfs
confdir = $(prefix)/etc
-datadir = @datadir@
icondir = $(datadir)/pixmaps/mc
-gnomeicondir = @gnomeicondir@
+syntaxdir = $(mclibdir)/syntax
localedir = $(datadir)/locale
-mandir = @mandir@
man1dir = $(mandir)/man1
manext = 1
man8dir = $(mandir)/man8
-man8ext = 8
-xv_bindir = @xv_bindir@
+man8ext = 8
+
top_srcdir = $(rootdir)
# Tools & program stuff
@@ -60,22 +64,22 @@
# 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)/"\" -DCONFDIR=\""$(confdir)/"\"
+XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(mclibdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" -DCONFDIR=\""$(confdir)/"\" -DDESKTOP_INIT_DIR=\""$(desktopdir)/"\"
XLDFLAGS = @LDFLAGS@
XDEFS = @DEFS@
XLIBS = @LIBS@
# Where do we have the sources?
# You shouldn't have to edit this :)
-mcsrcdir = $(rootdir)/src
-docdir = $(rootdir)/doc
-mclibdir = $(rootdir)/lib
-slangdir = $(rootdir)/slang
-vfsdir = $(rootdir)/vfs
-xvdir = $(rootdir)/xv
-tkdir = $(rootdir)/tk
-gnomedir = $(rootdir)/gnome
-icodir = $(rootdir)/icons
+mcsrcdir = $(rootdir)/src
+docdir = $(rootdir)/doc
+mcsrclibdir = $(rootdir)/lib
+slangdir = $(rootdir)/slang
+vfsdir = $(rootdir)/vfs
+xvdir = $(rootdir)/xv
+tkdir = $(rootdir)/tk
+gnomedir = $(rootdir)/gnome
+icodir = $(rootdir)/icons
hpath = -I$(mcsrcdir) -I$(slangdir) -I$(vfsdir) -I$(xvdir) -I$(xvdir)/support/xview_private -I$(tkdir)
diff -ruN old/mc-4.5.27/Makefile.in new/mc-4.5.28/Makefile.in
--- old/mc-4.5.27/Makefile.in Thu Mar 18 20:42:26 1999
+++ new/mc-4.5.28/Makefile.in Fri Mar 26 15:30:37 1999
@@ -5,7 +5,7 @@
@MCFGR@@MCF@
foreigndirs=pc
-codedirs=vfs lib doc slang gtkedit edit src gnome new_icons icons idl
+codedirs=vfs lib doc slang gtkedit edit src gnome new_icons icons idl syntax
unixdirs=intl $(codedirs) @POSUB@
alldirs=$(unixdirs) $(foreigndirs)
subdirs=$(alldirs)
@@ -45,32 +45,32 @@
install: installdirs
@for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done
- $(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(libdir)/FAQ
+ $(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(mclibdir)/FAQ
$(INSTALL_PROGRAM) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
chmod +x $(DESTDIR)$(suppbindir)/mcfn_install
@echo "Please verify that the configuration values are correctly"
- @echo "set in the mc.ext file in $(libdir)"
+ @echo "set in the mc.ext file in $(mclibdir)"
install.create_vcs:
$(INSTALL_PROGRAM) $(srcdir)/create_vcs $(DESTDIR)$(suppbindir)/create_vcs
if test x$(DESTDIR) = x; then $(SHELL) $(srcdir)/create_vcs; fi
installdirs:
- $(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
+ $(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mclibdir)
$(MKINSTALLDIRS) $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir)
$(MKINSTALLDIRS) $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir)
$(MKINSTALLDIRS) $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir)
- $(MKINSTALLDIRS) $(DESTDIR)$(idldir)
+ $(MKINSTALLDIRS) $(DESTDIR)$(idldir) $(DESTDIR)$(syntaxdir)
mcfninstall:
-/bin/sh ./mcfn_install
uninstall:
@for I in $(unixdirs); do cd $$I; $(MAKE) $@ || exit 1; cd ..; done
- -$(RMF) $(DESTDIR)$(libdir)/FAQ
+ -$(RMF) $(DESTDIR)$(mclibdir)/FAQ
-$(RMF) $(DESTDIR)$(suppbindir)/mcfn_install
-rmdir $(DESTDIR)$(suppbindir)
- -rmdir $(DESTDIR)$(libdir)
+ -rmdir $(DESTDIR)$(mclibdir)
@echo Midnight Commander uninstalled
cross TAGS clean depend dep:
diff -ruN old/mc-4.5.27/Specfile new/mc-4.5.28/Specfile
--- old/mc-4.5.27/Specfile Thu Mar 18 20:42:26 1999
+++ new/mc-4.5.28/Specfile Fri Mar 26 15:30:38 1999
@@ -1,5 +1,5 @@
# Note that this is NOT a relocatable package
-%define ver 4.5.27
+%define ver 4.5.28
%define rel 1
%define prefix /usr
diff -ruN old/mc-4.5.27/VERSION new/mc-4.5.28/VERSION
--- old/mc-4.5.27/VERSION Thu Mar 18 20:42:26 1999
+++ new/mc-4.5.28/VERSION Fri Mar 26 15:30:38 1999
@@ -1 +1 @@
-#define VERSION "4.5.27"
+#define VERSION "4.5.28"
diff -ruN old/mc-4.5.27/configure new/mc-4.5.28/configure
--- old/mc-4.5.27/configure Thu Mar 18 20:42:26 1999
+++ new/mc-4.5.28/configure Fri Mar 26 15:30:37 1999
@@ -586,7 +586,7 @@
PACKAGE=mc
-VERSION=4.5.27
+VERSION=4.5.28
cat >> confdefs.h <<EOF
#define PACKAGE "$PACKAGE"
EOF
@@ -10072,7 +10072,7 @@
LSLANG="-lslang"
screen_manager="SLang (system-installed library)"
echo "$ac_t""Using system installed SLang library" 1>&6
- rm slang/slang.h
+ rm -f slang/slang.h
ac_save_LIBS="$LIBS"
LIBS="$LIBS $LSLANG"
if test "$cross_compiling" = yes; then
@@ -10164,7 +10164,8 @@
LSLANG="-lmcslang"
CPPFLAGS="$CPPFLAGS -I../slang"
fastdepslang=fastdepslang
- rm slang/slang.h
+ mkdir -p slang
+ rm -f slang/slang.h
ln -s ../$srcdir/slang/slang-mc.h slang/slang.h
fi
if $slang_check_lib
@@ -10193,7 +10194,7 @@
EOF
echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:10197: checking for tgoto in -ltermcap" >&5
+echo "configure:10198: checking for tgoto in -ltermcap" >&5
ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -10201,7 +10202,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ltermcap $LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10205 "configure"
+#line 10206 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10212,7 +10213,7 @@
tgoto()
; return 0; }
EOF
-if { (eval echo configure:10216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10387,17 +10388,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10391: checking for $ac_hdr" >&5
+echo "configure:10392: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10396 "configure"
+#line 10397 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -10450,7 +10451,7 @@
fi
else
echo $ac_n "checking for ext2fs_close in -lext2fs""... $ac_c" 1>&6
-echo "configure:10454: checking for ext2fs_close in -lext2fs" >&5
+echo "configure:10455: checking for ext2fs_close in -lext2fs" >&5
ac_lib_var=`echo ext2fs'_'ext2fs_close | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -10458,7 +10459,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lext2fs -lcom_err $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10462 "configure"
+#line 10463 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10469,7 +10470,7 @@
ext2fs_close()
; return 0; }
EOF
-if { (eval echo configure:10473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10490,17 +10491,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10494: checking for $ac_hdr" >&5
+echo "configure:10495: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10499 "configure"
+#line 10500 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -10565,7 +10566,7 @@
if $search_ncurses
then
echo "checking "location of ncurses.h file"" 1>&6
-echo "configure:10569: checking "location of ncurses.h file"" >&5
+echo "configure:10570: checking "location of ncurses.h file"" >&5
if $search_ncurses
@@ -10705,7 +10706,7 @@
if $search_ncurses
then
cat > conftest.$ac_ext <<EOF
-#line 10709 "configure"
+#line 10710 "configure"
#include "confdefs.h"
#include </usr/include/curses.h>
EOF
@@ -10731,7 +10732,7 @@
rm -f conftest*
cat > conftest.$ac_ext <<EOF
-#line 10735 "configure"
+#line 10736 "configure"
#include "confdefs.h"
#include <curses.h>
@@ -10791,10 +10792,10 @@
else
# check for ncurses version, to properly ifdef mouse-fix
echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:10795: checking for ncurses version" >&5
+echo "configure:10796: checking for ncurses version" >&5
ncurses_version=unknown
cat > conftest.$ac_ext <<EOF
-#line 10798 "configure"
+#line 10799 "configure"
#include "confdefs.h"
#ifdef RENAMED_NCURSES
#include <curses.h>
@@ -10838,12 +10839,12 @@
for ac_func in resizeterm keyok
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10842: checking for $ac_func" >&5
+echo "configure:10843: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10847 "configure"
+#line 10848 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -10866,7 +10867,7 @@
; return 0; }
EOF
-if { (eval echo configure:10870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -10907,14 +10908,14 @@
LSLANG="-lslang"
screen_manager="SLang (system-installed library)"
echo "$ac_t""Using system installed SLang library" 1>&6
- rm slang/slang.h
+ rm -f slang/slang.h
ac_save_LIBS="$LIBS"
LIBS="$LIBS $LSLANG"
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 10918 "configure"
+#line 10919 "configure"
#include "confdefs.h"
#ifdef SLANG_H_INSIDE_SLANG_DIR
@@ -10928,7 +10929,7 @@
return 0;
}
EOF
-if { (eval echo configure:10932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS="$ac_save_LIBS"; cat >> confdefs.h <<\EOF
#define SLANG_TERMINFO 1
@@ -10947,7 +10948,7 @@
EOF
echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:10951: checking for tgoto in -ltermcap" >&5
+echo "configure:10952: checking for tgoto in -ltermcap" >&5
ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -10955,7 +10956,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ltermcap $LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10959 "configure"
+#line 10960 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10966,7 +10967,7 @@
tgoto()
; return 0; }
EOF
-if { (eval echo configure:10970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10999,7 +11000,8 @@
LSLANG="-lmcslang"
CPPFLAGS="$CPPFLAGS -I../slang"
fastdepslang=fastdepslang
- rm slang/slang.h
+ mkdir -p slang
+ rm -f slang/slang.h
ln -s ../$srcdir/slang/slang-mc.h slang/slang.h
fi
if $slang_check_lib
@@ -11028,7 +11030,7 @@
EOF
echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:11032: checking for tgoto in -ltermcap" >&5
+echo "configure:11034: checking for tgoto in -ltermcap" >&5
ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -11036,7 +11038,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ltermcap $LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11040 "configure"
+#line 11042 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11047,7 +11049,7 @@
tgoto()
; return 0; }
EOF
-if { (eval echo configure:11051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11087,7 +11089,7 @@
install_saver="yes"
echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6
-echo "configure:11091: checking for pam_start in -lpam" >&5
+echo "configure:11093: checking for pam_start in -lpam" >&5
ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -11095,7 +11097,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpam -ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11099 "configure"
+#line 11101 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11106,7 +11108,7 @@
pam_start()
; return 0; }
EOF
-if { (eval echo configure:11110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11149,7 +11151,7 @@
else
echo $ac_n "checking for -lXpm""... $ac_c" 1>&6
-echo "configure:11153: checking for -lXpm" >&5
+echo "configure:11155: checking for -lXpm" >&5
if eval "test \"`echo '$''{'ac_cv_has_xpm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -11165,7 +11167,7 @@
has_xpm_save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $X_CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 11169 "configure"
+#line 11171 "configure"
#include "confdefs.h"
#include <X11/Xlib.h>
@@ -11175,7 +11177,7 @@
XpmLibraryVersion();
; return 0; }
EOF
-if { (eval echo configure:11179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_has_xpm=yes
else
@@ -11197,7 +11199,7 @@
echo $ac_n "checking for X11 non-rectangular shape extension""... $ac_c" 1>&6
-echo "configure:11201: checking for X11 non-rectangular shape extension" >&5
+echo "configure:11203: checking for X11 non-rectangular shape extension" >&5
if eval "test \"`echo '$''{'ac_cv_has_shape'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -11213,7 +11215,7 @@
has_shape_save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $X_CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 11217 "configure"
+#line 11219 "configure"
#include "confdefs.h"
#include <X11/Xlib.h>
@@ -11228,7 +11230,7 @@
; return 0; }
EOF
-if { (eval echo configure:11232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_has_shape=yes
else
@@ -11264,7 +11266,7 @@
echo
else
echo $ac_n "checking for setupterm in -lcurses""... $ac_c" 1>&6
-echo "configure:11268: checking for setupterm in -lcurses" >&5
+echo "configure:11270: checking for setupterm in -lcurses" >&5
ac_lib_var=`echo curses'_'setupterm | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -11272,7 +11274,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11276 "configure"
+#line 11278 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11283,7 +11285,7 @@
setupterm()
; return 0; }
EOF
-if { (eval echo configure:11287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11300,7 +11302,7 @@
echo "$ac_t""yes" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 11304 "configure"
+#line 11306 "configure"
#include "confdefs.h"
#include <curses.h>
@@ -11313,7 +11315,7 @@
; return 0; }
EOF
-if { (eval echo configure:11317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
LIBS="$LIBS -lcurses"
@@ -11499,6 +11501,7 @@
slang/Makefile
edit/Makefile
gtkedit/Makefile
+syntax/Makefile
new_icons/Makefile
icons/Makefile
@@ -11506,8 +11509,8 @@
lib/mc-gnome.ext
mcfn_install
-vfs/extfs/ftplist vfs/extfs/uzip vfs/extfs/uzoo vfs/extfs/lslR
-vfs/extfs/ulha vfs/extfs/ucpio vfs/extfs/deb vfs/extfs/urar vfs/extfs/uar
+vfs/extfs/ftplist vfs/extfs/uzip vfs/extfs/uzoo vfs/extfs/lslR vfs/extfs/ulha
+vfs/extfs/uha vfs/extfs/ucpio vfs/extfs/deb vfs/extfs/urar vfs/extfs/uar
doc/mc.1 doc/mcedit.1 doc/mcserv.8
@@ -11717,6 +11720,7 @@
slang/Makefile
edit/Makefile
gtkedit/Makefile
+syntax/Makefile
new_icons/Makefile
icons/Makefile
@@ -11724,8 +11728,8 @@
lib/mc-gnome.ext
mcfn_install
-vfs/extfs/ftplist vfs/extfs/uzip vfs/extfs/uzoo vfs/extfs/lslR
-vfs/extfs/ulha vfs/extfs/ucpio vfs/extfs/deb vfs/extfs/urar vfs/extfs/uar
+vfs/extfs/ftplist vfs/extfs/uzip vfs/extfs/uzoo vfs/extfs/lslR vfs/extfs/ulha
+vfs/extfs/uha vfs/extfs/ucpio vfs/extfs/deb vfs/extfs/urar vfs/extfs/uar
doc/mc.1 doc/mcedit.1 doc/mcserv.8
@@ -11956,7 +11960,6 @@
if test x$srcdir != x; then
if test $srcdir != .; then
- cp $srcdir/VERSION VERSION
mkdir nt
mkdir os2
cp $srcdir/pc/Makefile nt/Makefile
diff -ruN old/mc-4.5.27/configure.in new/mc-4.5.28/configure.in
--- old/mc-4.5.27/configure.in Thu Mar 18 20:42:26 1999
+++ new/mc-4.5.28/configure.in Fri Mar 26 15:30:37 1999
@@ -5,7 +5,7 @@
AC_CONFIG_HEADER(config.h)
PACKAGE=mc
-VERSION=4.5.27
+VERSION=4.5.28
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
AC_SUBST(VERSION)
@@ -820,7 +820,7 @@
LSLANG="-lslang"
screen_manager="SLang (system-installed library)"
AC_MSG_RESULT(Using system installed SLang library)
- rm slang/slang.h
+ rm -f slang/slang.h
ac_save_LIBS="$LIBS"
LIBS="$LIBS $LSLANG"
AC_TRY_RUN(
@@ -844,7 +844,8 @@
LSLANG="-lmcslang"
CPPFLAGS="$CPPFLAGS -I../slang"
fastdepslang=fastdepslang
- rm slang/slang.h
+ mkdir -p slang
+ rm -f slang/slang.h
ln -s ../$srcdir/slang/slang-mc.h slang/slang.h
fi
if $slang_check_lib
@@ -1245,6 +1246,7 @@
slang/Makefile
edit/Makefile
gtkedit/Makefile
+syntax/Makefile
new_icons/Makefile
icons/Makefile
@@ -1252,8 +1254,8 @@
lib/mc-gnome.ext
mcfn_install
-vfs/extfs/ftplist vfs/extfs/uzip vfs/extfs/uzoo vfs/extfs/lslR
-vfs/extfs/ulha vfs/extfs/ucpio vfs/extfs/deb vfs/extfs/urar vfs/extfs/uar
+vfs/extfs/ftplist vfs/extfs/uzip vfs/extfs/uzoo vfs/extfs/lslR vfs/extfs/ulha
+vfs/extfs/uha vfs/extfs/ucpio vfs/extfs/deb vfs/extfs/urar vfs/extfs/uar
doc/mc.1 doc/mcedit.1 doc/mcserv.8
@@ -1262,7 +1264,6 @@
if test x$srcdir != x; then
if test $srcdir != .; then
- cp $srcdir/VERSION VERSION
mkdir nt
mkdir os2
cp $srcdir/pc/Makefile nt/Makefile
diff -ruN old/mc-4.5.27/doc/Makefile.in new/mc-4.5.28/doc/Makefile.in
--- old/mc-4.5.27/doc/Makefile.in Thu Mar 18 20:42:27 1999
+++ new/mc-4.5.28/doc/Makefile.in Fri Mar 26 15:30:39 1999
@@ -59,9 +59,9 @@
../src/fixhlp:
cd ../src; $(MAKE) fixhlp
-mc.hlp: mc.sgml ../src/fixhlp $(mclibdir)/xnc.hlp
+mc.hlp: mc.sgml ../src/fixhlp $(mcsrclibdir)/xnc.hlp
$(LINUXDOCDIR)/bin/format -T hlp $(srcdir)/mc | ../src/fixhlp 58 mc.hlp.toc > mc.hlp.tmp
- cat mc.hlp.toc mc.hlp.tmp $(mclibdir)/xnc.hlp > mc.hlp
+ cat mc.hlp.toc mc.hlp.tmp $(mcsrclibdir)/xnc.hlp > mc.hlp
$(RMF) mc.hlp.toc mc.hlp.tmp
mc.texi: mc.sgml
diff -ruN old/mc-4.5.27/edit/Makefile.in new/mc-4.5.28/edit/Makefile.in
--- old/mc-4.5.27/edit/Makefile.in Thu Mar 18 20:42:28 1999
+++ new/mc-4.5.28/edit/Makefile.in Fri Mar 26 15:30:40 1999
@@ -21,7 +21,7 @@
EDITSRC = edit_key_translator.c
EDITOBJS = edit.o editcmd.o editwidget.o editdraw.o editmenu.o wordproc.o \
- syntax.o editoptions.o
+ syntax.o editoptions.o bookmark.o
DIST = Makefile.in $(EDITSRC)
@@ -35,6 +35,8 @@
checklinks:
@if test -f $(rootdir)/edit/edit.c; then echo ok; \
+ else $(MAKE) sourcelinks; fi
+ @if test -f $(rootdir)/edit/bookmark.c; then echo ok; \
else $(MAKE) sourcelinks; fi
sourcelinks:
diff -ruN old/mc-4.5.27/edit/edit_key_translator.c new/mc-4.5.28/edit/edit_key_translator.c
--- old/mc-4.5.27/edit/edit_key_translator.c Thu Mar 18 20:42:28 1999
+++ new/mc-4.5.28/edit/edit_key_translator.c Fri Mar 26 15:30:40 1999
@@ -145,7 +145,7 @@
goto fin;
}
if (x_key == XCTRL ('a') && edit_key_emulation != EDIT_KEY_EMULATION_EMACS) {
- command = CK_Macro (edit_raw_key_query (" Execute Macro ", " Press macro hotkey: ", 1));
+ command = CK_Macro (edit_raw_key_query (_(" Execute Macro "), _(" Press macro hotkey: "), 1));
if (command == CK_Macro (0))
command = -1;
goto fin;
diff -ruN old/mc-4.5.27/gnome/ChangeLog new/mc-4.5.28/gnome/ChangeLog
--- old/mc-4.5.27/gnome/ChangeLog Thu Mar 18 20:42:31 1999
+++ new/mc-4.5.28/gnome/ChangeLog Fri Mar 26 15:30:43 1999
@@ -1,3 +1,87 @@
+1999-03-26 Federico Mena Quintero <federico@nuclecu.unam.mx>
+
+ * mc.keys.in: Now that the menu code uses the full filename, we do
+ not need "%d/%f" for html files.
+
+1999-03-25 Federico Mena Quintero <federico@nuclecu.unam.mx>
+
+ * gdialogs.c (file_progress_show_bytes): Total may be zero (for
+ instance, if you are copying zero-byte files). Take this into
+ account instead of issuing a warning.
+
+1999-03-25 Jonathan Blandford <jrb@redhat.com>
+
+ * gdesktop.c (set_background_image): now we can set the background
+ from GMC.
+
+1999-03-22 Miguel de Icaza <miguel@nuclecu.unam.mx>
+
+ * glayout.c (create_new_menu_from): closedir after running.
+
+1999-03-20 Miguel de Icaza <miguel@nuclecu.unam.mx>
+
+ * gnome-file-property-dialog.c (apply_metadata_change): Fix the
+ test for setting the icon. It was being done incorrectly and thus
+ it was never possible to change the icon.
+
+ * glayout.c (gnome_launch_mime_editor): Add mime-type-edit command
+ to the menu: this launches mime-type-capplet
+
+1999-03-23 Federico Mena Quintero <federico@nuclecu.unam.mx>
+
+ * gnome-file-property-dialog.c (apply_metadata_change): Fixed
+ incorrect logic when testing whether the icon changed or not.
+ This makes icons change correctly again.
+
+ * Makefile.in (GNOMEHDRS): Added gdesktop-init.h.
+
+1999-03-23 Jonathan Blandford <jrb@redhat.com>
+
+ * gscreen.c (panel_tree_drag_motion): lets try to cut down on the flickers.
+
+1999-03-22 Jonathan Blandford <jrb@redhat.com>
+
+ * gdesktop-init.c (gdesktop_init): Do what the documentation says.
+
+1999-03-20 Miguel de Icaza <miguel@nuclecu.unam.mx>
+
+ * gdesktop-init.c (desktop_load_init_from): New file that loads
+ new configuration files from the installation directory.
+
+ * gdesktop.c: Drop all the reload code from there, put it above.
+
+ * gpopup2.c (create_mime_actions): Attach to the menu, not the uiinfo.
+
+1999-03-19 Jonathan Blandford <jrb@redhat.com>
+
+ * gscreen.c (panel_tree_drag_motion): Dragging now automatically
+ highlights the tree. God does it flicker... )-:
+
+ * gtkdtree.h (gtk_dtree_construct): removed unused prototype.
+
+ * gscreen.c (panel_tree_check_auto_expand): removed the
+ auto-collapse of trees, as it is confusing to the user.
+
+ * gcustom-layout.c (custom_layout_set): We don't want to let the
+ user remove all of the settings.
+
+ * gdialogs.c (file_progress_show_bytes): bug fix proposed by Max
+ Weninger <max@takefive.co.at>
+
+ * gcmd.c (dentry_apply_callback): new function.
+ (gnome_new_launcher): We can now create new
+
+1999-03-19 Miguel de Icaza <miguel@nuclecu.unam.mx>
+
+ * gpopup2.c (create_mime_actions): Free full_name, just once, not
+ once per action.
+
+1999-03-19 Paul Raines <raines@slac.stanford.edu>
+
+ * gtkdtree.c (gtk_dtree_load_path): Uses a phantom node to get
+ directories with the expandable flag. Avoids loading directories
+ at two levels.
+
1999-03-18 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gdesktop.c (desktop_icon_info_open): Fix condition. Should not
diff -ruN old/mc-4.5.27/gnome/Makefile.in new/mc-4.5.28/gnome/Makefile.in
--- old/mc-4.5.27/gnome/Makefile.in Thu Mar 18 20:42:31 1999
+++ new/mc-4.5.28/gnome/Makefile.in Fri Mar 26 15:30:43 1999
@@ -35,6 +35,7 @@
gcmd.c \
gcorba.c \
gdesktop-icon.c \
+ gdesktop-init.c \
gdesktop.c \
gdialogs.c \
gdnd.c \
@@ -71,6 +72,7 @@
gcorba.h \
gcustom-layout.h\
gdesktop-icon.h \
+ gdesktop-init.h \
gdesktop.h \
gdnd.h \
gicon.h \
@@ -141,6 +143,7 @@
gcmd.o \
gcustom-layout.o\
gdesktop-icon.o \
+ gdesktop-init.o \
gdesktop.o \
gdnd.o \
ghelp.o \
@@ -286,7 +289,7 @@
install_mx: all
$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
$(MKINSTALLDIRS) $(DESTDIR)$(icondir)
- $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+ $(MKINSTALLDIRS) $(DESTDIR)$(mclibdir)
$(MKINSTALLDIRS) $(DESTDIR)$(datadir)/mime-info
$(MKINSTALLDIRS) $(DESTDIR)$(corbadir)
$(MKINSTALLDIRS) $(DESTDIR)$(gnewdir)
@@ -294,7 +297,7 @@
$(INSTALL_PROGRAM) corba-gmc $(DESTDIR)$(bindir)/$(binprefix)gmc
for I in $(ICONS); \
do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(icondir)/$$I; done
- $(INSTALL_DATA) $(srcdir)/layout $(DESTDIR)$(libdir)/layout
+ $(INSTALL_DATA) $(srcdir)/layout $(DESTDIR)$(mclibdir)/layout
$(INSTALL_DATA) mc.keys $(DESTDIR)$(datadir)/mime-info
$(INSTALL_DATA) $(srcdir)/gmc.gnorba $(DESTDIR)$(corbadir)
@@ -304,7 +307,7 @@
for I in $(ICONS); \
do $(RMF) $(DESTDIR)$(icondir)/$$I; done
-rmdir $(DESTDIR)$(icondir)
- -$(RMF) $(DESTDIR)$(libdir)/layout
+ -$(RMF) $(DESTDIR)$(mclibdir)/layout
-$(RMF) $(DESTDIR)$(datadir)/mime-info/mc.keys
-rmdir $(DESTDIR)$(datadir)/mime-info
-$(RMF) $(gnewdir)
diff -ruN old/mc-4.5.27/gnome/gcmd.c new/mc-4.5.28/gnome/gcmd.c
--- old/mc-4.5.27/gnome/gcmd.c Thu Mar 18 20:42:31 1999
+++ new/mc-4.5.28/gnome/gcmd.c Fri Mar 26 15:30:43 1999
@@ -22,6 +22,7 @@
#include "gcmd.h"
#include "dialog.h"
#include "layout.h"
+#include "gdesktop.h"
#include "../vfs/vfs.h"
enum {
@@ -753,4 +754,56 @@
{
mkdir_cmd (panel);
}
+static void
+dentry_apply_callback(GtkWidget *widget, int page, gpointer data)
+{
+ GnomeDesktopEntry *dentry;
+ gchar *desktop_directory;
+
+ if (page != -1)
+ return;
+
+ g_return_if_fail(data!=NULL);
+ g_return_if_fail(GNOME_IS_DENTRY_EDIT(data));
+ dentry = gnome_dentry_get_dentry(GNOME_DENTRY_EDIT(data));
+
+ if (getenv ("GNOME_DESKTOP_DIR") != NULL)
+ desktop_directory = g_strconcat (getenv ("GNOME_DESKTOP_DIR"),
+ "/",
+ dentry->name, ".desktop",
+ NULL);
+ else
+ desktop_directory = g_strconcat (gnome_user_home_dir, "/",
+ DESKTOP_DIR_NAME, "/",
+ dentry->name, ".desktop",
+ NULL);
+
+ dentry->location = desktop_directory;
+ gnome_desktop_entry_save(dentry);
+ gnome_desktop_entry_free(dentry);
+ gnome_config_sync ();
+ desktop_reload_icons (FALSE, 0, 0);
+
+}
+
+void
+gnome_new_launcher (GtkWidget *widget, WPanel *panel)
+{
+ GtkWidget *dialog;
+ GtkObject *dentry;
+ dialog = gnome_property_box_new ();
+ gtk_window_set_title(GTK_WINDOW(dialog), _("Desktop entry properties"));
+ gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, FALSE, TRUE);
+ dentry = gnome_dentry_edit_new_notebook(GTK_NOTEBOOK(GNOME_PROPERTY_BOX(dialog)->notebook));
+ gtk_signal_connect_object(GTK_OBJECT(dentry), "changed",
+ GTK_SIGNAL_FUNC(gnome_property_box_changed),
+ GTK_OBJECT(dialog));
+
+ gtk_signal_connect(GTK_OBJECT(dialog), "apply",
+ GTK_SIGNAL_FUNC(dentry_apply_callback),
+ dentry);
+ gtk_widget_show(dialog);
+
+
+}
diff -ruN old/mc-4.5.27/gnome/gcmd.h new/mc-4.5.28/gnome/gcmd.h
--- old/mc-4.5.27/gnome/gcmd.h Thu Mar 18 20:42:32 1999
+++ new/mc-4.5.28/gnome/gcmd.h Fri Mar 26 15:30:43 1999
@@ -22,6 +22,7 @@
void gnome_open_files (GtkWidget *widget, WPanel *panel);
void gnome_run_new (GtkWidget *widget, GnomeDesktopEntry *gde);
void gnome_mkdir_cmd (GtkWidget *widget, WPanel *panel);
+void gnome_new_launcher (GtkWidget *widget, WPanel *panel);
void gnome_reverse_selection_cmd_panel (WPanel *panel);
#endif /* __GCMD_H */
diff -ruN old/mc-4.5.27/gnome/gcustom-layout.c new/mc-4.5.28/gnome/gcustom-layout.c
--- old/mc-4.5.27/gnome/gcustom-layout.c Thu Mar 18 20:42:31 1999
+++ new/mc-4.5.28/gnome/gcustom-layout.c Fri Mar 26 15:30:43 1999
@@ -26,6 +26,7 @@
GtkWidget *srcList;
GtkWidget *destList;
GtkWidget *addButton;
+ GtkWidget *delButton;
GHashTable *hash;
GnomePropertyBox *prop_box;
WPanel *panel;
@@ -72,6 +73,8 @@
gtk_widget_set_sensitive (layout->addButton, FALSE);
gnome_property_box_changed (layout->prop_box);
}
+ if (GTK_CLIST (layout->destList)->rows >= 2)
+ gtk_widget_set_sensitive (layout->delButton, TRUE);
}
static void
@@ -84,6 +87,8 @@
gtk_clist_remove (GTK_CLIST (layout->destList), row);
gnome_property_box_changed (layout->prop_box);
}
+ if (GTK_CLIST (layout->destList)->rows <= 1)
+ gtk_widget_set_sensitive (layout->delButton, FALSE);
}
static void
@@ -126,7 +131,6 @@
{
GtkWidget *vbox2;
GtkWidget *scrollwin;
- GtkWidget *delButton;
GtkWidget *label;
GtkWidget *align;
gint i;
@@ -179,12 +183,12 @@
/* add add/remove buttons in center */
layout->addButton = gtk_button_new_with_label(_("Add"));
- delButton = gtk_button_new_with_label(_("Remove"));
+ layout->delButton = gtk_button_new_with_label(_("Remove"));
align = gtk_alignment_new(0.0, 0.5, 0, 0);
vbox2 = gtk_vbox_new(TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox2), layout->addButton, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox2), delButton, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox2), layout->delButton, FALSE, FALSE, 0);
gtk_container_add(GTK_CONTAINER(align), vbox2);
gtk_table_attach(GTK_TABLE(layout->table), align, 1, 2, 0, 1, 0, 0, 5, 5);
@@ -205,7 +209,7 @@
gtk_signal_connect(GTK_OBJECT(layout->addButton), "clicked",
GTK_SIGNAL_FUNC(custom_layout_add_clicked),
layout);
- gtk_signal_connect(GTK_OBJECT(delButton), "clicked",
+ gtk_signal_connect(GTK_OBJECT(layout->delButton), "clicked",
GTK_SIGNAL_FUNC(custom_layout_del_clicked),
layout);
gtk_signal_connect(GTK_OBJECT(layout->srcList), "select_row",
@@ -258,6 +262,9 @@
gint row = GPOINTER_TO_UINT (GTK_CLIST (layout->srcList)->selection->data);
custom_layout_select_row (NULL, row, 0, NULL, layout);
}
+ /* Set the status of the "Remove" button correctly */
+ if (GTK_CLIST (layout->destList)->rows <= 1)
+ gtk_widget_set_sensitive (layout->delButton, FALSE);
}
diff -ruN old/mc-4.5.27/gnome/gdesktop-init.c new/mc-4.5.28/gnome/gdesktop-init.c
--- old/mc-4.5.27/gnome/gdesktop-init.c Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/gnome/gdesktop-init.c Fri Mar 26 15:30:43 1999
@@ -0,0 +1,143 @@
+/*
+ *
+ * Copyright (C) 1998-1999 The Free Software Foundation
+ *
+ * Authors: Miguel de Icaza <miguel@nuclecu.unam.mx>
+ */
+
+#include <config.h>
+#include <unistd.h>
+#include "main.h"
+#include "util.h"
+#include <libgnome/libgnome.h>
+#include "gdesktop.h"
+#include "gdesktop-init.h"
+#include "gprint.h"
+#include "gmount.h"
+
+static void
+desktop_load_init_from (const char *file)
+{
+ void *iterator_handle;
+ char *config_path = g_strconcat ("=", file, "=", NULL);
+
+ iterator_handle = gnome_config_init_iterator_sections (config_path);
+
+ do {
+ char *key;
+ char *file_and_section;
+ char *title, *type;
+
+ /* Get next section name */
+ iterator_handle = gnome_config_iterator_next (
+ iterator_handle, &key, NULL);
+
+ /* Now access the values in the section */
+ file_and_section = g_strconcat (config_path, "/", key, "/", NULL);
+ gnome_config_push_prefix (file_and_section);
+ title = gnome_config_get_translated_string ("title=None");
+ type = gnome_config_get_string ("type=url");
+
+ /*
+ * handle the different link types
+ */
+ if (strcmp (type, "url") == 0){
+ int used;
+ char *icon = NULL, *url;
+ char *icon2 = NULL;
+
+ url = gnome_config_get_string ("url");
+ icon = gnome_config_get_string_with_default ("icon=", &used);
+ if (!icon)
+ icon2 = g_concat_dir_and_file (ICONDIR, "gnome-http-url.png");
+ else {
+ icon2 = gnome_pixmap_file (icon);
+ if (!icon2)
+ icon2 = g_concat_dir_and_file (ICONDIR, "gnome-http-url.png");
+ }
+ if (url && *url){
+ char *filename = g_concat_dir_and_file (desktop_directory, key);
+
+ desktop_create_url (filename, title, url, icon2);
+
+ g_free (filename);
+ }
+
+ if (url)
+ g_free (url);
+ g_free (icon);
+ g_free (icon2);
+ }
+ g_free (title);
+ g_free (file_and_section);
+ gnome_config_pop_prefix ();
+ } while (iterator_handle);
+
+ g_free (config_path);
+}
+
+static void
+desktop_init_at (const char *dir)
+{
+ DIR *d;
+ struct dirent *dent;
+ const int links_extlen = sizeof (".links")-1;
+ struct stat s;
+
+ d = opendir (dir);
+ if (!d)
+ return;
+
+ while ((dent = readdir (d)) != NULL){
+ int len = strlen (dent->d_name);
+ char *fname;
+
+ fname = g_concat_dir_and_file (dir, dent->d_name);
+
+ /*
+ * If it is an executable
+ */
+ if (access (fname, X_OK) == 0){
+ char *desktop_quoted;
+ char *command;
+
+ desktop_quoted = name_quote (desktop_directory, 0);
+ command = g_strconcat (fname, " --desktop-dir", desktop_quoted, NULL);
+ g_free (desktop_quoted);
+
+ my_system (EXECUTE_WAIT | EXECUTE_AS_SHELL, shell, command);
+ g_free (command);
+ g_free (fname);
+ continue;
+ }
+
+ if (len < links_extlen){
+ g_free (fname);
+ continue;
+ }
+
+ if (strcmp (dent->d_name + len - links_extlen, ".links")){
+ g_free (fname);
+ continue;
+ }
+
+ desktop_load_init_from (fname);
+ }
+}
+
+void
+gdesktop_init (void)
+{
+ char *dir;
+
+ desktop_init_at (DESKTOP_INIT_DIR);
+
+ dir = gnome_libdir_file ("desktop-links");
+ if (dir) {
+ desktop_init_at (dir);
+ g_free (dir);
+ }
+ gmount_setup_devices ();
+ gprint_setup_devices ();
+}
+
diff -ruN old/mc-4.5.27/gnome/gdesktop-init.h new/mc-4.5.28/gnome/gdesktop-init.h
--- old/mc-4.5.27/gnome/gdesktop-init.h Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/gnome/gdesktop-init.h Fri Mar 26 15:30:43 1999
@@ -0,0 +1,6 @@
+#ifndef GDESKTOP_INIT_H
+#define GDESKTOP_INIT_H
+
+void gdesktop_init (void);
+
+#endif
diff -ruN old/mc-4.5.27/gnome/gdesktop.c new/mc-4.5.28/gnome/gdesktop.c
--- old/mc-4.5.27/gnome/gdesktop.c Thu Mar 18 20:42:31 1999
+++ new/mc-4.5.28/gnome/gdesktop.c Fri Mar 26 15:30:43 1999
@@ -25,15 +25,11 @@
#include "gmetadata.h"
#include "gcmd.h"
#include "gdnd.h"
-#include "gmount.h"
#include "gpopup.h"
-#include "gprint.h"
#include "gscreen.h"
#include "../vfs/vfs.h"
#include "main.h"
-
-/* Name of the user's desktop directory (i.e. ~/desktop) */
-#define DESKTOP_DIR_NAME ".gnome-desktop"
+#include "gmount.h"
struct layout_slot {
@@ -2044,7 +2040,8 @@
layout_slots = g_new0 (struct layout_slot, layout_cols * layout_rows);
}
-/* Check that the user's desktop directory exists, and if not, create the
+/*
+ * Check that the user's desktop directory exists, and if not, create the
* default desktop setup.
*/
static void
@@ -2074,7 +2071,7 @@
}
g_free (home_link_name);
- gmount_setup_devices ();
+ gdesktop_init ();
}
}
@@ -2378,8 +2375,9 @@
desktop_rescan_devices (void)
{
desktop_cleanup_devices ();
- gmount_setup_devices ();
- gprint_setup_devices ();
+
+ gdesktop_init ();
+
desktop_reload_icons (FALSE, 0, 0);
}
@@ -2396,10 +2394,31 @@
{
desktop_reload_icons (FALSE, 0, 0);
}
+static void
+set_background_image (GtkWidget *widget, gpointer data)
+{
+ gchar *bg_capplet;
+ gchar *argv[1];
+ bg_capplet = gnome_is_program_in_path ("background-properties-capplet");
+ if (bg_capplet) {
+ argv[0] = bg_capplet;
+ gnome_execute_async (bg_capplet, 1, argv);
+ g_free (bg_capplet);
+ } else {
+ GtkWidget *msg_box;
+ msg_box = gnome_message_box_new (_("Unable to locate the file:\nbackground-properties-capplet\n"
+ "in your path.\n\nWe are unable to set the background."),
+ GNOME_MESSAGE_BOX_WARNING,
+ GNOME_STOCK_BUTTON_OK,
+ NULL);
+ gnome_dialog_run (msg_box);
+ }
+}
static GnomeUIInfo gnome_panel_new_menu [] = {
- GNOMEUIINFO_ITEM_NONE(N_("_Terminal"), N_("Launch a new terminal in the current directory"), gnome_open_terminal),
+ GNOMEUIINFO_ITEM_NONE(N_("_Terminal"), N_("Launch a new terminal in the current directory"), gnome_open_terminal),
/* If this ever changes, make sure you update create_new_menu accordingly. */
GNOMEUIINFO_ITEM_NONE( N_("_Directory..."), N_("Creates a new directory"), gnome_mkdir_cmd ),
+ GNOMEUIINFO_ITEM_NONE( N_("_Launcher..."), N_("Creates a new launcher"), gnome_new_launcher ),
GNOMEUIINFO_END
};
@@ -2410,8 +2429,9 @@
GNOMEUIINFO_ITEM_NONE (N_("Arrange Icons"), NULL, handle_arrange_icons),
GNOMEUIINFO_ITEM_NONE (N_("Create New Window"), NULL, handle_new_window),
GNOMEUIINFO_SEPARATOR,
- GNOMEUIINFO_ITEM_NONE (N_("Rescan Mountable Devices"), NULL, handle_rescan_devices),
+ GNOMEUIINFO_ITEM_NONE (N_("Recreate Desktop Shortcuts"), NULL, handle_rescan_devices),
GNOMEUIINFO_ITEM_NONE (N_("Rescan Desktop"), NULL, handle_rescan_desktop),
+ GNOMEUIINFO_ITEM_NONE (N_("Configure Background Image"), NULL, set_background_image),
GNOMEUIINFO_END
};
@@ -2903,4 +2923,25 @@
gtk_widget_destroy (proxy_invisible);
XDeleteProperty (GDK_DISPLAY (), GDK_ROOT_WINDOW (), gdk_atom_intern ("XdndProxy", FALSE));
}
+
+void
+desktop_create_url (const char *filename, const char *title, const char *url, const char *icon)
+{
+ FILE *f;
+
+ f = fopen (filename, "w");
+ if (f) {
+
+ fprintf (f, "URL: %s\n", url);
+ fclose (f);
+
+ gnome_metadata_set (filename, "desktop-url",
+ strlen (url) + 1, url);
+ gnome_metadata_set (filename, "icon-caption",
+ strlen (title) + 1, title);
+
+ gnome_metadata_set (filename, "icon-filename", strlen (icon) + 1, icon);
+ }
+}
+
diff -ruN old/mc-4.5.27/gnome/gdesktop.h new/mc-4.5.28/gnome/gdesktop.h
--- old/mc-4.5.27/gnome/gdesktop.h Thu Mar 18 20:42:32 1999
+++ new/mc-4.5.28/gnome/gdesktop.h Fri Mar 26 15:30:43 1999
@@ -18,6 +18,9 @@
#define DESKTOP_SNAP_X 80
#define DESKTOP_SNAP_Y 80
+/* Name of the user's desktop directory (i.e. ~/desktop) */
+#define DESKTOP_DIR_NAME ".gnome-desktop"
+
/* Configuration options for the desktop */
diff -ruN old/mc-4.5.27/gnome/gdialogs.c new/mc-4.5.28/gnome/gdialogs.c
--- old/mc-4.5.27/gnome/gdialogs.c Thu Mar 18 20:42:31 1999
+++ new/mc-4.5.28/gnome/gdialogs.c Fri Mar 26 15:30:43 1999
@@ -3,6 +3,7 @@
#include <config.h>
#include "panel.h"
#include <gnome.h>
+#include "dialog.h"
#include "global.h"
#include "file.h"
#include "filegui.h"
@@ -242,12 +243,9 @@
if (total > 0) {
perc = (double) done / (double) total;
- snprintf (count, 9, "%d%%", (gint) (100.0 * perc));
+ snprintf (count, 9, "%3d%% ", (gint) (100.0 * perc));
gtk_label_set_text (GTK_LABEL (ui->file_label), count);
- gtk_progress_bar_update (GTK_PROGRESS_BAR (ui->byte_prog), perc);
- } else
- gtk_progress_bar_update (GTK_PROGRESS_BAR (ui->byte_prog), 0.0);
-
+ }
while (gtk_events_pending ())
gtk_main_iteration ();
return FILE_CONT;
@@ -270,7 +268,7 @@
if (ui->aborting)
return FILE_ABORT;
- snprintf (count, 13, "%d/%d", done, total);
+ snprintf (count, 13, "%d/%d ", done, total);
gtk_label_set_text (GTK_LABEL (ui->count_label), count);
while (gtk_events_pending ())
gtk_main_iteration ();
@@ -294,7 +292,11 @@
if (ui->aborting)
return FILE_ABORT;
- perc = done / total;
+ if (total == 0.0)
+ perc = 1.0;
+ else
+ perc = done / total;
+
gtk_progress_bar_update (GTK_PROGRESS_BAR (ui->byte_prog), CLAMP (perc, 0.0, 1.0));
while (gtk_events_pending ())
@@ -893,10 +895,10 @@
ui->count_label = GTK_OBJECT (gtk_label_new (""));
gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (ui->count_label), FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_(" is ")), FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("is ")), FALSE, FALSE, 0);
ui->file_label = gtk_label_new ("");
gtk_box_pack_start (GTK_BOX (hbox), ui->file_label, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_(" Done.")), FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("done.")), FALSE, FALSE, 0);
gtk_container_add (GTK_CONTAINER (alignment), hbox);
gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (ui->op_win)->vbox),
diff -ruN old/mc-4.5.27/gnome/gdnd.c new/mc-4.5.28/gnome/gdnd.c
--- old/mc-4.5.27/gnome/gdnd.c Thu Mar 18 20:42:31 1999
+++ new/mc-4.5.28/gnome/gdnd.c Fri Mar 26 15:30:43 1999
@@ -264,26 +264,16 @@
template = g_concat_dir_and_file (destdir, "urlXXXXXX");
if (mktemp (template)) {
- FILE *f;
+ char *icon;
- f = fopen (template, "w");
- if (f) {
- char *icon;
-
- fprintf (f, "URL: %s\n", selection_data->data);
- fclose (f);
-
- gnome_metadata_set (template, "desktop-url",
- strlen (selection_data->data) + 1, selection_data->data);
- gnome_metadata_set (template, "icon-caption",
- strlen (selection_data->data) + 1, selection_data->data);
-
- icon = g_concat_dir_and_file (ICONDIR, "gnome-http-url.png");
- gnome_metadata_set (template, "icon-filename", strlen (icon) + 1, icon);
- g_free (icon);
- }
+ icon = g_concat_dir_and_file (ICONDIR, "gnome-http-url.png");
+ desktop_create_url (
+ template,
+ selection_data->data,
+ selection_data->data,
+ icon);
+ g_free (icon);
}
-
g_free (template);
}
diff -ruN old/mc-4.5.27/gnome/glayout.c new/mc-4.5.28/gnome/glayout.c
--- old/mc-4.5.27/gnome/glayout.c Thu Mar 18 20:42:31 1999
+++ new/mc-4.5.28/gnome/glayout.c Fri Mar 26 15:30:43 1999
@@ -348,6 +348,12 @@
desktop_reload_icons (FALSE, 0, 0);
}
+static void
+gnome_launch_mime_editor (void)
+{
+ my_system (EXECUTE_AS_SHELL, shell, "mime-type-capplet");
+}
+
void configure_box (void);
GtkCheckMenuItem *gnome_toggle_snap (void);
@@ -409,6 +415,8 @@
GNOMEUIINFO_ITEM_STOCK(N_("_Find File..."), N_("Locate files on disk"), find_cmd, GNOME_STOCK_MENU_JUMP_TO),
/* { GNOME_APP_UI_ITEM, N_("_Compare panels..."), N_("Compare two panel contents"), gnome_compare_panels },*/
+ GNOMEUIINFO_ITEM_NONE(N_("_Edit mime types..."), N_("Edits the MIME type bindings"),
+ gnome_launch_mime_editor),
{ GNOME_APP_UI_ITEM, N_("_Run Command..."), N_("Runs a command"), run_cmd, NULL,
NULL, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_OPEN, GDK_F2, 0 },
GNOMEUIINFO_ITEM_NONE(N_("_Run Command in panel..."),N_("Run a command and put the results in a panel"), gnome_external_panelize),
@@ -582,6 +590,8 @@
}
g_free (file2);
}
+ closedir (dir);
+
return pos;
}
diff -ruN old/mc-4.5.27/gnome/gnome-file-property-dialog.c new/mc-4.5.28/gnome/gnome-file-property-dialog.c
--- old/mc-4.5.27/gnome/gnome-file-property-dialog.c Thu Mar 18 20:42:31 1999
+++ new/mc-4.5.28/gnome/gnome-file-property-dialog.c Fri Mar 26 15:30:43 1999
@@ -1365,7 +1365,7 @@
/*gtk_entry_get_text (GTK_ENTRY (gnome_icon_entry_gtk_entry (GNOME_ICON_ENTRY (fpd->button))));*/
if (text) {
- if (fpd->icon_filename == NULL || (!strcmp (fpd->icon_filename, text)))
+ if (fpd->icon_filename == NULL || strcmp (fpd->icon_filename, text) != 0)
gnome_metadata_set (fpd->file_name, "icon-filename", strlen (text) + 1, text);
g_free (text);
}
diff -ruN old/mc-4.5.27/gnome/gpopup2.c new/mc-4.5.28/gnome/gpopup2.c
--- old/mc-4.5.27/gnome/gpopup2.c Thu Mar 18 20:42:31 1999
+++ new/mc-4.5.28/gnome/gpopup2.c Fri Mar 26 15:30:43 1999
@@ -410,13 +410,13 @@
gtk_object_set_user_data (GTK_OBJECT (uiinfo[0].widget), key);
- /* Remember to free this memory */
-
- gtk_signal_connect (GTK_OBJECT (uiinfo[0].widget), "destroy",
- (GtkSignalFunc) free_on_destroy,
- full_name);
}
+ /* Remember to free this memory */
+ gtk_signal_connect (GTK_OBJECT (menu), "destroy",
+ (GtkSignalFunc) free_on_destroy,
+ full_name);
+
if (pos_init != pos) {
uiinfo[0].type = GNOME_APP_UI_SEPARATOR;
fill_menu (GTK_MENU_SHELL (menu), uiinfo, pos++);
diff -ruN old/mc-4.5.27/gnome/gprint.c new/mc-4.5.28/gnome/gprint.c
--- old/mc-4.5.27/gnome/gprint.c Thu Mar 18 20:42:31 1999
+++ new/mc-4.5.28/gnome/gprint.c Fri Mar 26 15:30:43 1999
@@ -26,7 +26,7 @@
return;
desktop_quoted = name_quote (desktop_directory, 0);
- command = g_strconcat (gprint_path, " --create-printers ", desktop_quoted, NULL);
+ command = g_strconcat (gprint_path, " --desktop-dir ", desktop_quoted, NULL);
g_free (desktop_quoted);
my_system (EXECUTE_WAIT | EXECUTE_AS_SHELL, shell, command);
diff -ruN old/mc-4.5.27/gnome/gscreen.c new/mc-4.5.28/gnome/gscreen.c
--- old/mc-4.5.27/gnome/gscreen.c Thu Mar 18 20:42:32 1999
+++ new/mc-4.5.28/gnome/gscreen.c Fri Mar 26 15:30:43 1999
@@ -113,6 +113,17 @@
}
}
+static void
+panel_cancel_drag_scroll (WPanel *panel)
+{
+ g_return_if_fail (panel != NULL);
+
+ if (panel->timer_id != -1){
+ gtk_timeout_remove (panel->timer_id);
+ panel->timer_id = -1;
+ }
+}
+
/*
* Sets the color attributes for a given row.
*/
@@ -605,10 +616,7 @@
static gboolean
panel_setup_drag_scroll (WPanel *panel, int x, int y, desirable_fn desirable, scroll_fn scroll)
{
- if (panel->timer_id != -1){
- gtk_timeout_remove (panel->timer_id);
- panel->timer_id = -1;
- }
+ panel_cancel_drag_scroll (panel);
panel->drag_motion_x = x;
panel->drag_motion_y = y;
@@ -728,6 +736,7 @@
char *data;
GList *files;
+ panel_cancel_drag_scroll (panel);
data = panel_build_selected_file_list (panel, &len);
switch (info){
@@ -1005,6 +1014,7 @@
static void
panel_drag_end (GtkWidget *widget, GdkDragContext *context, WPanel *panel)
{
+ panel_cancel_drag_scroll (panel);
panel->dragging = 0;
}
@@ -1164,10 +1174,7 @@
{
WPanel *panel = data;
- if (panel->timer_id != -1){
- gtk_timeout_remove (panel->timer_id);
- panel->timer_id = -1;
- }
+ panel_cancel_drag_scroll (panel);
}
/**
@@ -1280,10 +1287,7 @@
{
WPanel *panel = data;
- if (panel->timer_id != -1){
- gtk_timeout_remove (panel->timer_id);
- panel->timer_id = -1;
- }
+ panel_cancel_drag_scroll (panel);
}
/*
@@ -2044,6 +2048,8 @@
* so that the "current" stays the same place on the
* screen
*/
+#if 0
+ /* This behaviour is confusing --jrb and quartic (and MS, apparently)*/
if (tmp_list) {
if (current) {
row = g_list_position (clist->row_list, (GList *)current);
@@ -2074,6 +2080,7 @@
free_list->prev = NULL;
g_list_free (free_list);
}
+#endif
}
/**
@@ -2130,9 +2137,11 @@
GtkCTreeNode *current;
current = gtk_ctree_node_nth (GTK_CTREE (widget), row);
panel_tree_check_auto_expand (panel, current);
+ GTK_DTREE (widget)->internal = TRUE;
+ gtk_clist_select_row (GTK_CLIST (widget), row, 0);
+ GTK_DTREE (widget)->internal = FALSE;
} else
panel_tree_check_auto_expand (panel, NULL);
-
panel->timer_id = gtk_timeout_add (400, tree_drag_open_directory, data);
return TRUE;
}
diff -ruN old/mc-4.5.27/gnome/gtkdtree.c new/mc-4.5.28/gnome/gtkdtree.c
--- old/mc-4.5.27/gnome/gtkdtree.c Thu Mar 18 20:42:32 1999
+++ new/mc-4.5.28/gnome/gtkdtree.c Fri Mar 26 15:30:43 1999
@@ -120,14 +120,34 @@
static gboolean
gtk_dtree_load_path (GtkDTree *dtree, char *path, GtkCTreeNode *parent, int level)
{
+ GtkCTreeNode *phantom;
tree_scan *dir;
tree_entry *dirent;
+ struct stat dir_stat;
g_assert (path);
g_assert (parent);
g_assert (dtree);
+ if (mc_stat (path, &dir_stat)){
+ return FALSE;
+ }
+ if (!S_ISDIR(dir_stat.st_mode))
+ return FALSE;
+
dtree->loading_dir++;
+
+
+ phantom = gtk_dtree_contains (dtree, parent, "PHANTOM");
+ if (!level) {
+ dirent = tree_store_whereis (path);
+ if (!phantom && (!dirent || (dirent && !dirent->scanned)))
+ if (dir_stat.st_nlink > 2 || strncmp(path,"/afs",4)==0)
+ gtk_dtree_insert_node (dtree, parent, "PHANTOM");
+ dtree->loading_dir--;
+ return TRUE;
+ }
+
dir = tree_store_opendir (path);
if (!dir){
dtree->loading_dir--;
@@ -155,6 +175,11 @@
tree_store_closedir (dir);
dtree->loading_dir--;
+ if (phantom != NULL && level) {
+ dtree->removing_rows = 1;
+ gtk_ctree_remove_node (GTK_CTREE (dtree), phantom);
+ dtree->removing_rows = 0;
+ }
return TRUE;
}
@@ -190,8 +215,9 @@
parent_class->tree_select_row (ctree, row, column);
- if (row == dtree->last_node)
+ if (row == dtree->last_node) {
return;
+ }
dtree->loading_dir++;
dtree->last_node = row;
diff -ruN old/mc-4.5.27/gnome/gtkdtree.h new/mc-4.5.28/gnome/gtkdtree.h
--- old/mc-4.5.27/gnome/gtkdtree.h Thu Mar 18 20:42:32 1999
+++ new/mc-4.5.28/gnome/gtkdtree.h Fri Mar 26 15:30:44 1999
@@ -50,7 +50,6 @@
GtkWidget *gtk_dtree_new (void);
void gtk_dtree_select_parent (GtkDTree *dtree,
char *directory);
-void gtk_dtree_select_child (GtkDTree *dtree);
void gtk_dtree_remove_dir_by_name (GtkDTree *dtree,
char *directory);
gboolean gtk_dtree_select_dir (GtkDTree *dtree,
diff -ruN old/mc-4.5.27/gtkedit/Makefile.in new/mc-4.5.28/gtkedit/Makefile.in
--- old/mc-4.5.27/gtkedit/Makefile.in Thu Mar 18 20:42:28 1999
+++ new/mc-4.5.28/gtkedit/Makefile.in Fri Mar 26 15:30:40 1999
@@ -20,10 +20,11 @@
EDITSRC = edit.c editcmd.c editdraw.c gtkedit.c gtkeditkey.c \
propfont.c syntax.c wordproc.c edit.h editcmddef.h global.h gtkedit.h \
- libgettext.h lkeysym.h editmenu.c editoptions.c mousemark.h editwidget.c
+ libgettext.h lkeysym.h editmenu.c editoptions.c mousemark.h \
+ editwidget.c bookmark.c
EDITOBJS = edit.o editcmd.o editdraw.o gtkedit.o gtkeditkey.o \
- propfont.o syntax.o wordproc.o
+ propfont.o syntax.o wordproc.o bookmark.o
DIST = Makefile.in $(EDITSRC)
diff -ruN old/mc-4.5.27/gtkedit/bookmark.c new/mc-4.5.28/gtkedit/bookmark.c
--- old/mc-4.5.27/gtkedit/bookmark.c Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/gtkedit/bookmark.c Fri Mar 26 15:30:40 1999
@@ -0,0 +1,217 @@
+/* editor book mark handling
+
+ Copyright (C) 1996, 1997 the Free Software Foundation
+
+ Authors: 1996, 1997 Paul Sheer
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307, USA.
+ */
+
+
+#include <config.h>
+#include "edit.h"
+
+/* note, if there is more than one bookmark on a line, then they are
+ appended after each other and the last one is always the one found
+ by book_mark_found() i.e. last in is the one seen */
+
+static inline struct _book_mark *double_marks (WEdit * edit, struct _book_mark *p)
+{
+ if (p->next)
+ while (p->next->line == p->line)
+ p = p->next;
+ return p;
+}
+
+/* returns the first bookmark on or before this line */
+struct _book_mark *book_mark_find (WEdit * edit, int line)
+{
+ struct _book_mark *p;
+ if (!edit->book_mark) {
+/* must have an imaginary top bookmark at line -1 to make things less complicated */
+ edit->book_mark = malloc (sizeof (struct _book_mark));
+ memset (edit->book_mark, 0, sizeof (struct _book_mark));
+ edit->book_mark->line = -1;
+ return edit->book_mark;
+ }
+ for (p = edit->book_mark; p; p = p->next) {
+ if (p->line > line)
+ break; /* gone past it going downward */
+ if (p->line <= line) {
+ if (p->next) {
+ if (p->next->line > line) {
+ edit->book_mark = p;
+ return double_marks (edit, p);
+ }
+ } else {
+ edit->book_mark = p;
+ return double_marks (edit, p);
+ }
+ }
+ }
+ for (p = edit->book_mark; p; p = p->prev) {
+ if (p->next)
+ if (p->next->line <= line)
+ break; /* gone past it going upward */
+ if (p->line <= line) {
+ if (p->next) {
+ if (p->next->line > line) {
+ edit->book_mark = p;
+ return double_marks (edit, p);
+ }
+ } else {
+ edit->book_mark = p;
+ return double_marks (edit, p);
+ }
+ }
+ }
+ return 0; /* can't get here */
+}
+
+/* returns true if a bookmark exists at this line of colour c */
+int book_mark_query_color (WEdit * edit, int line, int c)
+{
+ struct _book_mark *p;
+ if (!edit->book_mark)
+ return 0;
+ for (p = book_mark_find (edit, line); p; p = p->prev) {
+ if (p->line != line)
+ return 0;
+ if (p->c == c)
+ return 1;
+ }
+ return 0;
+}
+
+/* returns the number of bookmarks at this line and a list of their colours in c
+ up to a maximum of 8 colours */
+int book_mark_query_all (WEdit * edit, int line, int *c)
+{
+ int i;
+ struct _book_mark *p;
+ if (!edit->book_mark)
+ return 0;
+ for (i = 0, p = book_mark_find (edit, line); p && i < 8; p = p->prev, i++) {
+ if (p->line != line)
+ return i;
+ c[i] = p->c;
+ }
+ return i;
+}
+
+/* insert a bookmark at this line */
+void book_mark_insert (WEdit * edit, int line, int c)
+{
+ struct _book_mark *p, *q;
+ p = book_mark_find (edit, line);
+#if 0
+ if (p->line == line) { /* already exists, so just change the colour */
+ if (p->c != c) {
+ edit->force |= REDRAW_LINE;
+ p->c = c;
+ }
+ return;
+ }
+#endif
+ edit->force |= REDRAW_LINE;
+/* create list entry */
+ q = malloc (sizeof (struct _book_mark));
+ memset (q, 0, sizeof (struct _book_mark));
+ q->line = line;
+ q->c = c;
+ q->next = p->next;
+/* insert into list */
+ q->prev = p;
+ if (p->next)
+ p->next->prev = q;
+ p->next = q;
+}
+
+/* remove a bookmark if there is one at this line matching this colour - c of -1 clear all */
+void book_mark_clear (WEdit * edit, int line, int c)
+{
+ struct _book_mark *p, *q;
+ if (!edit->book_mark)
+ return;
+ for (p = book_mark_find (edit, line); p; p = q) {
+ q = p->prev;
+ if (p->line == line && (p->c == c || c == -1)) {
+ edit->force |= REDRAW_LINE;
+ edit->book_mark = p->prev;
+ p->prev->next = p->next;
+ if (p->next)
+ p->next->prev = p->prev;
+ memset (p, 0, sizeof (struct _book_mark));
+ free (p);
+ break;
+ }
+ }
+/* if there is only our dummy book mark left, clear it for speed */
+ if (edit->book_mark->line == -1 && !edit->book_mark->next) {
+ free (edit->book_mark);
+ edit->book_mark = 0;
+ }
+}
+
+/* clear all bookmarks matching this colour, if c is -1 clears all */
+void book_mark_flush (WEdit * edit, int c)
+{
+ struct _book_mark *p, *q;
+ if (!edit->book_mark)
+ return;
+ edit->force |= REDRAW_PAGE;
+ while (edit->book_mark->prev)
+ edit->book_mark = edit->book_mark->prev;
+ for (q = edit->book_mark->next; q; q = p) {
+ p = q->next;
+ if (q->c == c || c == -1) {
+ q->prev->next = q->next;
+ if (p)
+ p->prev = q->prev;
+ memset (q, 0, sizeof (struct _book_mark));
+ free (q);
+ }
+ }
+ if (!edit->book_mark->next) {
+ free (edit->book_mark);
+ edit->book_mark = 0;
+ }
+}
+
+/* shift down bookmarks after this line */
+void book_mark_inc (WEdit * edit, int line)
+{
+ if (edit->book_mark) {
+ struct _book_mark *p;
+ p = book_mark_find (edit, line);
+ for (p = p->next; p; p = p->next)
+ p->line++;
+ }
+}
+
+/* shift up bookmarks after this line */
+void book_mark_dec (WEdit * edit, int line)
+{
+ if (edit->book_mark) {
+ struct _book_mark *p;
+ p = book_mark_find (edit, line);
+ for (p = p->next; p; p = p->next)
+ p->line--;
+ }
+}
+
+
+
diff -ruN old/mc-4.5.27/gtkedit/edit.c new/mc-4.5.28/gtkedit/edit.c
--- old/mc-4.5.27/gtkedit/edit.c Thu Mar 18 20:42:28 1999
+++ new/mc-4.5.28/gtkedit/edit.c Fri Mar 26 15:30:40 1999
@@ -16,15 +16,17 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307, USA.
+*/
#define _EDIT_C THIS_IS
#include <config.h>
#if defined(NEEDS_IO_H)
# include <io.h>
+# include <fcntl.h>
#endif
-#include <fcntl.h>
#ifdef NEEDS_CR_LF_TRANSLATION
# define CR_LF_TRANSLATION
#endif
@@ -255,10 +257,10 @@
/* Lastbyte calculation in TEXT mode FRANCO */
#if defined CR_LF_TRANSLATION
- if(file && (!text)){
+ if(file && (!text)) {
real_size=0;
- tmp_buf[sizeof (tmp_buf)-1]=0;
- while((bytes_read = read(file,tmp_buf,1024)) > 0){
+ tmp_buf[sizeof (tmp_buf) - 1] = 0;
+ while ((bytes_read = read (file, tmp_buf, 1024)) > 0) {
real_size += bytes_read;
}
s.st_size = real_size;
@@ -362,6 +364,7 @@
if (edit) {
int j = 0;
edit_free_syntax_rules (edit);
+ book_mark_flush (edit, -1);
for (; j <= MAXBUFF; j++) {
if (edit->buffers1[j] != NULL)
free (edit->buffers1[j]);
@@ -602,6 +605,8 @@
}
/* now we must update some info on the file and check if a redraw is required */
if (c == '\n') {
+ if (edit->book_mark)
+ book_mark_inc (edit, edit->curs_line);
edit->curs_line++;
edit->total_lines++;
edit->force |= REDRAW_LINE_ABOVE | REDRAW_AFTER_CURSOR;
@@ -643,6 +648,8 @@
edit->start_line++;
}
if (c == '\n') {
+ if (edit->book_mark)
+ book_mark_inc (edit, edit->curs_line);
edit->total_lines++;
edit->force |= REDRAW_AFTER_CURSOR;
}
@@ -682,6 +689,8 @@
edit->curs2--;
if (p == '\n') {
+ if (edit->book_mark)
+ book_mark_dec (edit, edit->curs_line);
edit->total_lines--;
edit->force |= REDRAW_AFTER_CURSOR;
}
@@ -716,6 +725,8 @@
edit->curs1--;
if (p == '\n') {
+ if (edit->book_mark)
+ book_mark_dec (edit, edit->curs_line);
edit->curs_line--;
edit->total_lines--;
edit->force |= REDRAW_AFTER_CURSOR;
@@ -1169,6 +1180,10 @@
edit->line_offsets[2] = edit_bol (edit, edit->last_byte);
edit->caches_valid = 1;
}
+ if (line >= edit->total_lines)
+ return edit->line_offsets[2];
+ if (line <= 0)
+ return 0;
/* find the closest known point */
for (i = 0; i < N_LINE_CACHES; i++) {
int n;
@@ -2122,6 +2137,43 @@
edit_mark_cmd (edit, 1);
break;
+ case CK_Toggle_Bookmark:
+ if (book_mark_query_color (edit, edit->curs_line, BOOK_MARK_COLOR))
+ book_mark_clear (edit, edit->curs_line, BOOK_MARK_COLOR);
+ else
+ book_mark_insert (edit, edit->curs_line, BOOK_MARK_COLOR);
+ break;
+ case CK_Flush_Bookmarks:
+ book_mark_flush (edit, BOOK_MARK_COLOR);
+ edit->force |= REDRAW_PAGE;
+ break;
+ case CK_Next_Bookmark:
+ if (edit->book_mark) {
+ struct _book_mark *p;
+ p = (struct _book_mark *) book_mark_find (edit, edit->curs_line);
+ if (p->next) {
+ p = p->next;
+ if (p->line >= edit->start_line + edit->num_widget_lines || p->line < edit->start_line)
+ edit_move_display (edit, p->line - edit->num_widget_lines / 2);
+ edit_move_to_line (edit, p->line);
+ }
+ }
+ break;
+ case CK_Prev_Bookmark:
+ if (edit->book_mark) {
+ struct _book_mark *p;
+ p = (struct _book_mark *) book_mark_find (edit, edit->curs_line);
+ while (p->line == edit->curs_line)
+ if (p->prev)
+ p = p->prev;
+ if (p->line >= 0) {
+ if (p->line >= edit->start_line + edit->num_widget_lines || p->line < edit->start_line)
+ edit_move_display (edit, p->line - edit->num_widget_lines / 2);
+ edit_move_to_line (edit, p->line);
+ }
+ }
+ break;
+
case CK_Beginning_Of_Text:
case CK_Beginning_Of_Text_Highlight:
edit_move_to_top (edit);
@@ -2241,6 +2293,7 @@
#ifndef MIDNIGHT
case CK_Sort:
case CK_Mail:
+ case CK_Find_File:
#endif
case CK_Complete:
case CK_Cancel:
@@ -2250,6 +2303,16 @@
case CK_Save_And_Quit:
case CK_Check_Save_And_Quit:
case CK_Run_Another:
+ case CK_Debug_Start:
+ case CK_Debug_Stop:
+ case CK_Debug_Toggle_Break:
+ case CK_Debug_Clear:
+ case CK_Debug_Next:
+ case CK_Debug_Step:
+ case CK_Debug_Back_Trace:
+ case CK_Debug_Continue:
+ case CK_Debug_Enter_Command:
+ case CK_Debug_Until_Curser:
result = 0;
break;
case CK_Menu:
diff -ruN old/mc-4.5.27/gtkedit/edit.h new/mc-4.5.28/gtkedit/edit.h
--- old/mc-4.5.27/gtkedit/edit.h Thu Mar 18 20:42:28 1999
+++ new/mc-4.5.28/gtkedit/edit.h Fri Mar 26 15:30:40 1999
@@ -16,7 +16,9 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307, USA.
+*/
#ifndef __EDIT_H
#define __EDIT_H
@@ -79,7 +81,11 @@
# endif
# endif
+#ifdef GTK
# include <regex.h>
+#else
+# include "regex.h"
+#endif
#endif
@@ -110,6 +116,7 @@
#else
# include "src/main.h" /* for char *shell */
+# include "src/mad.h"
# include "src/dlg.h"
# include "src/widget.h"
# include "src/color.h"
@@ -166,7 +173,7 @@
#define SEARCH_DIALOG_OPTION_NO_CASE 4
#define SEARCH_DIALOG_OPTION_BACKWARDS 8
-#define SYNTAX_FILE "/.cedit/syntax"
+#define SYNTAX_FILE "/.cedit/Syntax"
#define CLIP_FILE "/.cedit/cooledit.clip"
#define MACRO_FILE "/.cedit/cooledit.macros"
#define BLOCK_FILE "/.cedit/cooledit.block"
@@ -281,7 +288,7 @@
char last;
char *whole_word_chars_left;
char *whole_word_chars_right;
-#define NO_COLOR ((unsigned long) -1);
+#define NO_COLOR 0xFFFFFFFF
int line_start;
int bg;
int fg;
@@ -313,6 +320,14 @@
struct _syntax_marker *next;
};
+struct _book_mark {
+ int line; /* line number */
+#define BOOK_MARK_COLOR ((5 << 8) + 26) /* cyan on white */
+ int c; /* colour */
+ struct _book_mark *next;
+ struct _book_mark *prev;
+};
+
struct editor_widget {
#ifdef MIDNIGHT
Widget widget;
@@ -381,6 +396,8 @@
int line_numbers[N_LINE_CACHES];
long line_offsets[N_LINE_CACHES];
+ struct _book_mark *book_mark;
+
/* undo stack and pointers */
unsigned long stack_pointer;
long *undo_stack;
@@ -420,7 +437,7 @@
int edit_man_page_cmd (WEdit * edit);
void edit_search_replace_dialog (Window parent, int x, int y, char **search_text, char **replace_text, char **arg_order, char *heading, int option);
void edit_search_dialog (WEdit * edit, char **search_text);
-long edit_find (long search_start, unsigned char *expr, int *len, long last_byte, int (*get_byte) (void *, long), void *data);
+long edit_find (long search_start, unsigned char *expr, int *len, long last_byte, int (*get_byte) (void *, long), void *data, void *d);
void edit_set_foreground_colors (unsigned long normal, unsigned long bold, unsigned long italic);
void edit_set_background_colors (unsigned long normal, unsigned long abnormal, unsigned long marked, unsigned long marked_abnormal, unsigned long highlighted);
void edit_set_cursor_color (unsigned long c);
@@ -555,6 +572,16 @@
void edit_load_syntax (WEdit * edit, char **names, char *type);
void edit_free_syntax_rules (WEdit * edit);
void edit_get_syntax_color (WEdit * edit, long byte_index, int *fg, int *bg);
+
+
+void book_mark_insert (WEdit * edit, int line, int c);
+int book_mark_query_color (WEdit * edit, int line, int c);
+int book_mark_query_all (WEdit * edit, int line, int *c);
+struct _book_mark *book_mark_find (WEdit * edit, int line);
+void book_mark_clear (WEdit * edit, int line, int c);
+void book_mark_flush (WEdit * edit, int c);
+void book_mark_inc (WEdit * edit, int line);
+void book_mark_dec (WEdit * edit, int line);
#ifdef MIDNIGHT
diff -ruN old/mc-4.5.27/gtkedit/editcmd.c new/mc-4.5.28/gtkedit/editcmd.c
--- old/mc-4.5.27/gtkedit/editcmd.c Thu Mar 18 20:42:28 1999
+++ new/mc-4.5.28/gtkedit/editcmd.c Fri Mar 26 15:30:40 1999
@@ -16,7 +16,9 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307, USA.
+*/
/* #define PIPE_BLOCKS_SO_READ_BYTE_BY_BYTE */
@@ -54,7 +56,7 @@
int edit_confirm_save = 0;
#endif
-#define NUM_REPL_ARGS 16
+#define NUM_REPL_ARGS 64
#define MAX_REPL_LEN 1024
#if defined(MIDNIGHT) || defined(GTK)
@@ -807,7 +809,7 @@
{
edit->force |= REDRAW_COMPLETELY;
if (edit->modified)
- if (edit_query_dialog2 (_(" Warning "), _(" Current text was modified without a file save. \n Continue discards these changes. "), _("Continue"), _("Cancel")))
+ if (edit_query_dialog2 (_ (" Warning "), _ (" Current text was modified without a file save. \n Continue discards these changes. "), _ ("Continue"), _ ("Cancel")))
return 0;
edit->modified = 0;
return edit_renew (edit); /* if this gives an error, something has really screwed up */
@@ -826,7 +828,7 @@
return 0;
} else {
/* Heads the 'Load' file dialog box */
- edit_error_dialog (_(" Load "), get_sys_error (_(" Error trying to open file for reading ")));
+ edit_error_dialog (_ (" Load "), get_sys_error (_ (" Error trying to open file for reading ")));
}
return 1;
}
@@ -837,10 +839,10 @@
edit->force |= REDRAW_COMPLETELY;
if (edit->modified)
- if (edit_query_dialog2 (_(" Warning "), _(" Current text was modified without a file save. \n Continue discards these changes. "), _("Continue"), _("Cancel")))
+ if (edit_query_dialog2 (_ (" Warning "), _ (" Current text was modified without a file save. \n Continue discards these changes. "), _ ("Continue"), _ ("Cancel")))
return 0;
- exp = edit_get_load_file (edit->dir, edit->filename, _(" Load "));
+ exp = edit_get_load_file (edit->dir, edit->filename, _ (" Load "));
if (exp) {
if (*exp)
@@ -984,7 +986,7 @@
return;
if ((end_mark - start_mark) > option_max_undo / 2)
- if (edit_query_dialog2 (_(" Warning "), _(" Block is large, you may not be able to undo this action. "), _("Continue"), _("Cancel")))
+ if (edit_query_dialog2 (_ (" Warning "), _ (" Block is large, you may not be able to undo this action. "), _ ("Continue"), _ ("Cancel")))
return;
edit_push_markers (edit);
@@ -1081,7 +1083,7 @@
edit_mark_cmd (edit, 0);
if ((end_mark - start_mark) > option_max_undo / 2)
/* Warning message with a query to continue or cancel the operation */
- if (edit_query_dialog2 (_(" Warning "), _(" Block is large, you may not be able to undo this action. "), _(" Continue "), _(" Cancel ")))
+ if (edit_query_dialog2 (_ (" Warning "), _ (" Block is large, you may not be able to undo this action. "), _ (" Continue "), _ (" Cancel ")))
return 1;
edit_push_markers (edit);
edit_cursor_move (edit, start_mark - edit->curs1);
@@ -1315,7 +1317,6 @@
}
}
-
#else
#define B_ENTER 0
@@ -1355,13 +1356,15 @@
(CDrawText ("replace.t2", win, xh, yh, _(" Enter replace text : ")))->hotkey = 'n';
CGetHintPos (0, &yh);
(CDrawTextInput ("replace.rinp", win, xh, yh, 10, AUTO_HEIGHT, 256, *replace_text))->hotkey = 'n';
+ CSetToolHint ("replace.t2", _("You can enter regexp substrings with %s (not \\1, \\2 like sed) then use \"Enter...order\""));
+ CSetToolHint ("replace.rinp", _("You can enter regexp substrings with %s (not \\1, \\2 like sed) then use \"Enter...order\""));
CGetHintPos (0, &yh);
- (CDrawText ("replace.t3", win, xh, yh, _(" Enter argument order : ")))->hotkey = 'o';
+ (CDrawText ("replace.t3", win, xh, yh, _(" Enter argument (or substring) order : ")))->hotkey = 'o';
CGetHintPos (0, &yh);
(CDrawTextInput ("replace.ainp", win, xh, yh, 10, AUTO_HEIGHT, 256, *arg_order))->hotkey = 'o';
/* Tool hint */
- CSetToolHint ("replace.ainp", _("Enter the order of replacement of your scanf format specifiers"));
- CSetToolHint ("replace.t3", _("Enter the order of replacement of your scanf format specifiers"));
+ CSetToolHint ("replace.ainp", _("Enter the order of replacement of your scanf format specifiers or regexp substrings"));
+ CSetToolHint ("replace.t3", _("Enter the order of replacement of your scanf format specifiers or regexp substrings"));
}
CGetHintPos (0, &yh);
ys = yh;
@@ -1609,14 +1612,20 @@
sargs[argord[8]], sargs[argord[9]], sargs[argord[10]], sargs[argord[11]], \
sargs[argord[12]], sargs[argord[13]], sargs[argord[14]], sargs[argord[15]]
+
/* This function is a modification of mc-3.2.10/src/view.c:regexp_view_search() */
/* returns -3 on error in pattern, -1 on not found, found_len = 0 if either */
-int string_regexp_search (char *pattern, char *string, int len, int match_type, int match_bol, int icase, int *found_len)
+int string_regexp_search (char *pattern, char *string, int len, int match_type, int match_bol, int icase, int *found_len, void *d)
{
static regex_t r;
- regmatch_t pmatch[1];
static char *old_pattern = NULL;
static int old_type, old_icase;
+ regmatch_t *pmatch;
+ static regmatch_t s[1];
+
+ pmatch = (regmatch_t *) d;
+ if (!pmatch)
+ pmatch = s;
if (!old_pattern || strcmp (old_pattern, pattern) || old_type != match_type || old_icase != icase) {
if (old_pattern) {
@@ -1632,7 +1641,7 @@
old_type = match_type;
old_icase = icase;
}
- if (regexec (&r, string, 1, pmatch, ((match_bol || match_type != match_normal) ? 0 : REG_NOTBOL)) != 0) {
+ if (regexec (&r, string, d ? NUM_REPL_ARGS : 1, pmatch, ((match_bol || match_type != match_normal) ? 0 : REG_NOTBOL)) != 0) {
*found_len = 0;
return -1;
}
@@ -1643,7 +1652,7 @@
/* thanks to Liviu Daia <daia@stoilow.imar.ro> for getting this
(and the above) routines to work properly - paul */
-long edit_find_string (long start, unsigned char *exp, int *len, long last_byte, int (*get_byte) (void *, long), void *data, int once_only)
+long edit_find_string (long start, unsigned char *exp, int *len, long last_byte, int (*get_byte) (void *, long), void *data, int once_only, void *d)
{
long p, q = 0;
long l = strlen ((char *) exp), f = 0;
@@ -1734,7 +1743,7 @@
buf = mbuf;
while (q) {
- found_start = string_regexp_search ((char *) exp, (char *) buf, q, match_normal, match_bol, !replace_case, len);
+ found_start = string_regexp_search ((char *) exp, (char *) buf, q, match_normal, match_bol, !replace_case, len, d);
if (found_start <= -2) { /* regcomp/regexec error */
*len = 0;
@@ -1800,13 +1809,13 @@
}
-long edit_find_forwards (long search_start, unsigned char *exp, int *len, long last_byte, int (*get_byte) (void *, long), void *data, int once_only)
+long edit_find_forwards (long search_start, unsigned char *exp, int *len, long last_byte, int (*get_byte) (void *, long), void *data, int once_only, void *d)
{ /*front end to find_string to check for
whole words */
long p;
p = search_start;
- while ((p = edit_find_string (p, exp, len, last_byte, get_byte, data, once_only)) >= 0) {
+ while ((p = edit_find_string (p, exp, len, last_byte, get_byte, data, once_only, d)) >= 0) {
if (replace_whole) {
/*If the bordering chars are not in option_whole_chars_search then word is whole */
if (!strcasechr (option_whole_chars_search, (*get_byte) (data, p - 1))
@@ -1823,18 +1832,18 @@
return p;
}
-long edit_find (long search_start, unsigned char *exp, int *len, long last_byte, int (*get_byte) (void *, long), void *data)
+long edit_find (long search_start, unsigned char *exp, int *len, long last_byte, int (*get_byte) (void *, long), void *data, void *d)
{
long p;
if (replace_backwards) {
while (search_start >= 0) {
- p = edit_find_forwards (search_start, exp, len, last_byte, get_byte, data, 1);
+ p = edit_find_forwards (search_start, exp, len, last_byte, get_byte, data, 1, d);
if (p == search_start)
return p;
search_start--;
}
} else {
- return edit_find_forwards (search_start, exp, len, last_byte, get_byte, data, 0);
+ return edit_find_forwards (search_start, exp, len, last_byte, get_byte, data, 0, d);
}
return -2;
}
@@ -1948,6 +1957,7 @@
/* call with edit = 0 before shutdown to close memory leaks */
void edit_replace_cmd (WEdit * edit, int again)
{
+ static regmatch_t pmatch[NUM_REPL_ARGS];
static char *old1 = NULL;
static char *old2 = NULL;
static char *old3 = NULL;
@@ -1976,7 +1986,6 @@
}
return;
}
-
last_search = edit->last_byte;
edit->force |= REDRAW_COMPLETELY;
@@ -2045,7 +2054,7 @@
int len = 0;
long new_start;
new_start = edit_find (edit->search_start, (unsigned char *) exp1, &len, last_search,
- (int (*) (void *, long)) edit_get_byte, (void *) edit);
+ (int (*)(void *, long)) edit_get_byte, (void *) edit, pmatch);
if (new_start == -3) {
regexp_error (edit);
break;
@@ -2095,8 +2104,20 @@
}
}
if (replace_yes) { /* delete then insert new */
- if (replace_scanf) {
+ if (replace_scanf || replace_regexp) {
char repl_str[MAX_REPL_LEN + 2];
+ if (replace_regexp) { /* we need to fill in sargs just like with scanf */
+ int k, j;
+ for (k = 1; k < NUM_REPL_ARGS && pmatch[k].rm_eo >= 0; k++) {
+ unsigned char *t;
+ t = (unsigned char *) &sargs[k - 1][0];
+ for (j = 0; j < pmatch[k].rm_eo - pmatch[k].rm_so && j < 255; j++, t++)
+ *t = (unsigned char) edit_get_byte (edit, edit->search_start - pmatch[0].rm_so + pmatch[k].rm_so + j);
+ *t = '\0';
+ }
+ for (; k <= NUM_REPL_ARGS; k++)
+ sargs[k - 1][0] = 0;
+ }
if (sprintf_p (repl_str, exp2, PRINTF_ARGS) >= 0) {
times_replaced++;
while (i--)
@@ -2104,9 +2125,9 @@
while (repl_str[++i])
edit_insert (edit, repl_str[i]);
} else {
- edit_error_dialog (_(" Replace "),
+ edit_error_dialog (_ (" Replace "),
/* "Invalid regexp string or scanf string" */
- _(" Error in replacement format string. "));
+ _ (" Error in replacement format string. "));
replace_continue = 0;
}
} else {
@@ -2134,10 +2155,10 @@
edit->force |= REDRAW_PAGE;
edit_render_keypress (edit);
if (times_replaced) {
- sprintf (fin_string, _(" %ld replacements made. "), times_replaced);
- edit_message_dialog (_(" Replace "), fin_string);
+ sprintf (fin_string, _ (" %ld replacements made. "), times_replaced);
+ edit_message_dialog (_ (" Replace "), fin_string);
} else
- edit_message_dialog (_(" Replace "), _(" Search string not found. "));
+ edit_message_dialog (_ (" Replace "), _ (" Search string not found. "));
replace_continue = 0;
}
} while (replace_continue);
@@ -2189,7 +2210,7 @@
edit->search_start++;
edit->search_start = edit_find (edit->search_start, (unsigned char *) exp, &len, edit->last_byte,
- (int (*)(void *, long)) edit_get_byte, (void *) edit);
+ (int (*)(void *, long)) edit_get_byte, (void *) edit, 0);
if (edit->search_start >= 0) {
edit->found_start = edit->search_start;
diff -ruN old/mc-4.5.27/gtkedit/editcmddef.h new/mc-4.5.28/gtkedit/editcmddef.h
--- old/mc-4.5.27/gtkedit/editcmddef.h Thu Mar 18 20:42:28 1999
+++ new/mc-4.5.28/gtkedit/editcmddef.h Fri Mar 26 15:30:40 1999
@@ -47,7 +47,7 @@
#define CK_Remove 204
#define CK_Unmark 206
#define CK_Save_Block 207
-#define CK_Column_Mark 208
+#define CK_Column_Mark 208
/* search and replace */
#define CK_Find 301
@@ -55,6 +55,18 @@
#define CK_Replace 303
#define CK_Replace_Again 304
+/* debugger commands */
+#define CK_Debug_Start 350
+#define CK_Debug_Stop 351
+#define CK_Debug_Toggle_Break 352
+#define CK_Debug_Clear 353
+#define CK_Debug_Next 354
+#define CK_Debug_Step 355
+#define CK_Debug_Back_Trace 356
+#define CK_Debug_Continue 357
+#define CK_Debug_Enter_Command 358
+#define CK_Debug_Until_Curser 359
+
/* misc */
#define CK_Insert_File 401
#define CK_Exit 402
@@ -72,6 +84,9 @@
#define CK_Cancel 414
#define CK_Complete 415
#define CK_Paragraph_Format 416
+#define CK_Util 417
+#define CK_Type_Load_Python 418
+#define CK_Find_File 419
/* application control */
#define CK_Save_Desktop 451
@@ -81,13 +96,19 @@
#define CK_Save_And_Quit 455
#define CK_Run_Another 456
#define CK_Check_Save_And_Quit 457
-#define CK_Maximise 458
+#define CK_Maximize 458
/* macro */
#define CK_Begin_Record_Macro 501
#define CK_End_Record_Macro 502
#define CK_Delete_Macro 503
+/* book mark */
+#define CK_Toggle_Bookmark 550
+#define CK_Flush_Bookmarks 551
+#define CK_Next_Bookmark 552
+#define CK_Prev_Bookmark 553
+
/* highlight commands */
#define CK_Page_Up_Highlight 604
#define CK_Page_Down_Highlight 605
@@ -108,8 +129,8 @@
#define CK_Paragraph_Up_Highlight 620
#define CK_Paragraph_Down_Highlight 621
-/* X clipboard operations */
+/* X clipboard operations */
#define CK_XStore 701
#define CK_XCut 702
#define CK_XPaste 703
diff -ruN old/mc-4.5.27/gtkedit/editdraw.c new/mc-4.5.28/gtkedit/editdraw.c
--- old/mc-4.5.27/gtkedit/editdraw.c Thu Mar 18 20:42:28 1999
+++ new/mc-4.5.28/gtkedit/editdraw.c Fri Mar 26 15:30:40 1999
@@ -16,7 +16,9 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307, USA.
+*/
#include <config.h>
#include "edit.h"
@@ -103,12 +105,10 @@
#ifdef GTK
-void edit_status (WEdit * edit)
+void edit_status (WEdit *edit)
{
GtkEntry *entry;
- GtkWidget *widget;
int w, i, t;
- char id[33];
char s[160];
w = edit->num_widget_columns - 1;
if (w > 150)
@@ -119,7 +119,7 @@
if (w > 1) {
i = w > 24 ? 18 : w - 6;
i = i < 13 ? 13 : i;
- sprintf (s, "%s", name_trunc (edit->filename ? edit->filename : "", i));
+ sprintf (s, "%s", (char *) name_trunc (edit->filename ? edit->filename : "", i));
i = strlen (s);
s[i] = ' ';
s[i + 1] = ' ';
@@ -291,11 +291,6 @@
#else
-#define BOLD_COLOR MARKED_COLOR
-#define UNDERLINE_COLOR VIEW_UNDERLINED_COLOR
-#define MARK_COLOR SELECTED_COLOR
-#define DEF_COLOR NORMAL_COLOR
-
static void set_color (int font)
{
attrset (font);
@@ -309,7 +304,7 @@
int x1 = start_col + EDIT_TEXT_HORIZONTAL_OFFSET;
int y = row + EDIT_TEXT_VERTICAL_OFFSET;
- set_color (DEF_COLOR);
+ set_color (EDITOR_NORMAL_COLOR);
edit_move (x1, y);
hline (' ', end_col + 1 - EDIT_TEXT_HORIZONTAL_OFFSET - x1);
@@ -329,15 +324,15 @@
if (style & MOD_ABNORMAL)
textchar = '.';
if (style & MOD_HIGHLIGHTED) {
- set_color (BOLD_COLOR);
+ set_color (EDITOR_BOLD_COLOR);
} else if (style & MOD_MARKED) {
- set_color (MARK_COLOR);
+ set_color (EDITOR_MARKED_COLOR);
}
if (style & MOD_UNDERLINED) {
- set_color (UNDERLINE_COLOR);
+ set_color (EDITOR_UNDERLINED_COLOR);
}
if (style & MOD_BOLD) {
- set_color (BOLD_COLOR);
+ set_color (EDITOR_BOLD_COLOR);
}
addch (textchar);
p++;
@@ -354,7 +349,12 @@
int col, start_col_real;
unsigned int c;
int fg, bg;
- int i;
+ int i, book_mark = -1;
+
+#if 0
+ if (!book_mark_query (edit, edit->start_line + row, &book_mark))
+ book_mark = -1;
+#endif
edit_get_syntax_color (edit, b - 1, &fg, &bg);
q = edit_move_forward3 (edit, b, start_col - edit->start_col, 0);
@@ -384,9 +384,13 @@
if (q >= edit->found_start && q < edit->found_start + edit->found_len)
*p |= MOD_HIGHLIGHTED * 256;
c = edit_get_byte (edit, q);
- edit_get_syntax_color (edit, q, &fg, &bg);
/* we don't use bg for mc - fg contains both */
- *p |= fg << 16;
+ if (book_mark == -1) {
+ edit_get_syntax_color (edit, q, &fg, &bg);
+ *p |= fg << 16;
+ } else {
+ *p |= book_mark << 16;
+ }
q++;
switch (c) {
case '\n':
@@ -470,6 +474,7 @@
#ifndef MIDNIGHT
static unsigned long prev_win = 0;
#endif
+
int force = edit->force;
long b;
@@ -585,6 +590,7 @@
#endif
#endif
exit_render:
+ return;
}
diff -ruN old/mc-4.5.27/gtkedit/editmenu.c new/mc-4.5.28/gtkedit/editmenu.c
--- old/mc-4.5.27/gtkedit/editmenu.c Thu Mar 18 20:42:28 1999
+++ new/mc-4.5.28/gtkedit/editmenu.c Fri Mar 26 15:30:40 1999
@@ -16,8 +16,9 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307, USA.
+*/
#include <config.h>
#include "edit.h"
@@ -389,37 +390,42 @@
CDrawMenuButton (catstrs (ident, ".filemenu", 0), parent, focus_return, x, y, AUTO_WIDTH, AUTO_HEIGHT, 8,
/* The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t' */
_(" File "),
- _("Open...\tC-o"), '~', menu_cmd, CK_Load,
- _("New\tC-n"), '~', menu_cmd, CK_New,
- "", ' ', 0, 0,
- _("Save\tF2"), '~', menu_cmd, CK_Save,
- _("Save as...\tF12"), '~', menu_cmd, CK_Save_As,
- "", ' ', 0, 0,
- _("Insert file...\tF15"), '~', menu_cmd, CK_Insert_File,
- _("Copy to file...\tC-f"), '~', menu_cmd, CK_Save_Block
+ _("Open...\tC-o"), '~', menu_cmd, (unsigned long) CK_Load,
+ _("New\tC-n"), '~', menu_cmd, (unsigned long) CK_New,
+ "", ' ', (void *) 0, 0L,
+ _("Save\tF2"), '~', menu_cmd, (unsigned long) CK_Save,
+ _("Save as...\tF12"), '~', menu_cmd, (unsigned long) CK_Save_As,
+ "", ' ', (void *) 0, 0L,
+ _("Insert file...\tF15"), '~', menu_cmd, (unsigned long) CK_Insert_File,
+ _("Copy to file...\tC-f"), '~', menu_cmd, (unsigned long) CK_Save_Block
);
/* Tool hint */
CSetToolHint (catstrs (ident, ".filemenu", 0), _("Disk operations"));
CGetHintPos (&x, &d);
- CDrawMenuButton (catstrs (ident, ".editmenu", 0), parent, focus_return, x, y, AUTO_WIDTH, AUTO_HEIGHT, 15,
+ CDrawMenuButton (catstrs (ident, ".editmenu", 0), parent, focus_return, x, y, AUTO_WIDTH, AUTO_HEIGHT, 20,
_(" Edit "),
- _("Toggle mark\tF3"), '~', menu_cmd, CK_Mark,
- _("Toggle mark columns\tC-b"), '~', menu_cmd, CK_Column_Mark,
- "", ' ', 0, 0,
- _("Toggle insert/overwrite\tIns"), '~', menu_cmd, CK_Toggle_Insert,
- "", ' ', 0, 0,
- _("Copy block to cursor\tF5"), '~', menu_cmd, CK_Copy,
- _("Move block to cursor\tF6"), '~', menu_cmd, CK_Move,
- _("Delete block\tF8/C-Del"), '~', menu_cmd, CK_Remove,
- "", ' ', 0, 0,
- _("Copy block to clipbrd\tC-Ins"), '~', menu_cmd, CK_XStore,
- _("Cut block to clipbrd\tS-Del"), '~', menu_cmd, CK_XCut,
- _("Paste block from clipbrd\tS-Ins"), '~', menu_cmd, CK_XPaste,
- _("Selection history\tM-Ins"), '~', menu_cmd, CK_Selection_History,
- "", ' ', 0, 0,
- _("Undo\tC-BackSpace"), '~', menu_cmd, CK_Undo
+ _("Toggle mark\tF3"), '~', menu_cmd, (unsigned long) CK_Mark,
+ _("Toggle mark columns\tC-b"), '~', menu_cmd, (unsigned long) CK_Column_Mark,
+ "", ' ', (void *) 0, 0L,
+ _("Toggle book mark\tC-M-Ins"), '~', menu_cmd, (unsigned long) CK_Toggle_Bookmark,
+ _("Previous book mark\tC-M-Up"), '~', menu_cmd, (unsigned long) CK_Prev_Bookmark,
+ _("Next book mark\tC-M-Down"), '~', menu_cmd, (unsigned long) CK_Next_Bookmark,
+ _("Flush book marks"), '~', menu_cmd, (unsigned long) CK_Flush_Bookmarks,
+ "", ' ', (void *) 0, 0L,
+ _("Toggle insert/overwrite\tIns"), '~', menu_cmd, (unsigned long) CK_Toggle_Insert,
+ "", ' ', (void *) 0, 0L,
+ _("Copy block to cursor\tF5"), '~', menu_cmd, (unsigned long) CK_Copy,
+ _("Move block to cursor\tF6"), '~', menu_cmd, (unsigned long) CK_Move,
+ _("Delete block\tF8/C-Del"), '~', menu_cmd, (unsigned long) CK_Remove,
+ "", ' ', (void *) 0, 0L,
+ _("Copy block to clipbrd\tC-Ins"), '~', menu_cmd, (unsigned long) CK_XStore,
+ _("Cut block to clipbrd\tS-Del"), '~', menu_cmd, (unsigned long) CK_XCut,
+ _("Paste block from clipbrd\tS-Ins"), '~', menu_cmd, (unsigned long) CK_XPaste,
+ _("Selection history\tM-Ins"), '~', menu_cmd, (unsigned long) CK_Selection_History,
+ "", ' ', (void *) 0, 0L,
+ _("Undo\tC-BackSpace"), '~', menu_cmd, (unsigned long) CK_Undo
);
/* Tool hint */
CSetToolHint (catstrs (ident, ".editmenu", 0), _("Manipulating blocks of text"));
@@ -428,10 +434,10 @@
CDrawMenuButton (catstrs (ident, ".searchmenu", 0), parent, focus_return, x, y, AUTO_WIDTH, AUTO_HEIGHT, 4,
_(" Srch/Replce "),
- _("Search...\tF7"), '~', menu_cmd, CK_Find,
- _("Search again\tF17"), '~', menu_cmd, CK_Find_Again,
- _("Replace...\tF4"), '~', menu_cmd, CK_Replace,
- _("Replace again\tF14"), '~', menu_cmd, CK_Replace_Again
+ _("Search...\tF7"), '~', menu_cmd, (unsigned long) CK_Find,
+ _("Search again\tF17"), '~', menu_cmd, (unsigned long) CK_Find_Again,
+ _("Replace...\tF4"), '~', menu_cmd, (unsigned long) CK_Replace,
+ _("Replace again\tF14"), '~', menu_cmd, (unsigned long) CK_Replace_Again
);
/* Tool hint */
CSetToolHint (catstrs (ident, ".searchmenu", 0), _("Search for and replace text"));
@@ -440,17 +446,17 @@
CDrawMenuButton (catstrs (ident, ".commandmenu", 0), parent, focus_return, x, y, AUTO_WIDTH, AUTO_HEIGHT, 11,
_(" Command "),
- _("Goto line...\tM-l"), '~', menu_cmd, CK_Goto,
- "", ' ', 0, 0,
- _("Start record macro\tC-r"), '~', menu_cmd, CK_Begin_Record_Macro,
- _("Finish record macro...\tC-r"), '~', menu_cmd, CK_End_Record_Macro,
- _("Execute macro...\tC-a, KEY"), '~', menu_ctrl_key, XK_a,
- _("Delete macro...\t"), '~', menu_cmd, CK_Delete_Macro,
- "", ' ', 0, 0,
- _("Insert date/time\tC-d"), '~', menu_cmd, CK_Date,
- _("Format paragraph\tM-p"), '~', menu_cmd, CK_Paragraph_Format,
- "", ' ', 0, 0,
- _("Refresh display\tC-l"), '~', menu_cmd, CK_Refresh
+ _("Goto line...\tM-l"), '~', menu_cmd, (unsigned long) CK_Goto,
+ "", ' ', (void *) 0, 0L,
+ _("Start record macro\tC-r"), '~', menu_cmd, (unsigned long) CK_Begin_Record_Macro,
+ _("Finish record macro...\tC-r"), '~', menu_cmd, (unsigned long) CK_End_Record_Macro,
+ _("Execute macro...\tC-a, KEY"), '~', menu_ctrl_key, (unsigned long) XK_a,
+ _("Delete macro...\t"), '~', menu_cmd, (unsigned long) CK_Delete_Macro,
+ "", ' ', (void *) 0, 0L,
+ _("Insert date/time\tC-d"), '~', menu_cmd, (unsigned long) CK_Date,
+ _("Format paragraph\tM-p"), '~', menu_cmd, (unsigned long) CK_Paragraph_Format,
+ "", ' ', (void *) 0, 0L,
+ _("Refresh display\tC-l"), '~', menu_cmd, (unsigned long) CK_Refresh
);
/* Tool hint */
CSetToolHint (catstrs (ident, ".commandmenu", 0), _("Macros and internal commands"));
diff -ruN old/mc-4.5.27/gtkedit/editoptions.c new/mc-4.5.28/gtkedit/editoptions.c
--- old/mc-4.5.27/gtkedit/editoptions.c Thu Mar 18 20:42:28 1999
+++ new/mc-4.5.28/gtkedit/editoptions.c Fri Mar 26 15:30:40 1999
@@ -16,7 +16,9 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307, USA.
+*/
#include <config.h>
#include "edit.h"
diff -ruN old/mc-4.5.27/gtkedit/editwidget.c new/mc-4.5.28/gtkedit/editwidget.c
--- old/mc-4.5.27/gtkedit/editwidget.c Thu Mar 18 20:42:28 1999
+++ new/mc-4.5.28/gtkedit/editwidget.c Fri Mar 26 15:30:40 1999
@@ -16,7 +16,9 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307, USA.
+*/
#include <config.h>
diff -ruN old/mc-4.5.27/gtkedit/propfont.c new/mc-4.5.28/gtkedit/propfont.c
--- old/mc-4.5.27/gtkedit/propfont.c Thu Mar 18 20:42:28 1999
+++ new/mc-4.5.28/gtkedit/propfont.c Fri Mar 26 15:30:40 1999
@@ -13,7 +13,9 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307, USA.
+*/
#include <config.h>
#include "edit.h"
@@ -57,6 +59,7 @@
{
int fgp, bgp;
fgp = (s & 0xFF000000UL) >> 24;
+/* NO_COLOR would give fgp == 255 */
if (fgp < 255)
*fg = color_palette (fgp);
else
@@ -277,23 +280,41 @@
return s | ((fg & 0xFF) << 24) | ((bg & 0xFF) << 16);
}
-void convert_text (WEdit * edit, long q, cache_type *p, int x, int x_max)
+void convert_text (WEdit * edit, long q, cache_type * p, int x, int x_max, int row)
{
int c;
cache_type s;
long m1, m2;
unsigned char *r, text[4];
+ int book_mark_colors[10], book_mark, book_mark_cycle = 0, the_end = 0;
+
eval_marks (edit, &m1, &m2);
+
+ book_mark = book_mark_query_all (edit, edit->start_line + row, book_mark_colors);
+
for (;;) {
c = edit_get_byte (edit, q);
- *p = get_style (edit, q, c, m1, m2, x);
+ if (!the_end)
+ *p = get_style (edit, q, c, m1, m2, x);
+ if (book_mark) {
+ if (the_end)
+ *p = 0;
+ *p = (*p & 0x0000FFFF) | (book_mark_colors[book_mark_cycle++ % book_mark] << 16);
+ }
switch (c) {
case '\n':
- *p++ |= ' ';
- *p = 0;
- if (x > edit->max_column)
- edit->max_column = x;
- return;
+ if (book_mark) { /* bookmarks must show right across the screen */
+ the_end = 1;
+ c = ' ';
+ q--;
+ goto the_default;
+ } else {
+ *p++ |= ' ';
+ *p = 0;
+ if (x > edit->max_column)
+ edit->max_column = x;
+ return;
+ }
case '\t':
if (fixed_font) {
int t;
@@ -301,6 +322,10 @@
t = min (t, x_max);
s = *p;
while (x < t) {
+#if 0
+ if (book_mark)
+ *p = (*p & 0x0000FFFF) | (book_mark_colors[book_mark_cycle++ % book_mark] << 16);
+#endif
x += per_char[' '];
*p++ = s | ' ';
}
@@ -310,6 +335,7 @@
}
break;
default:
+ the_default:
x += convert_to_long_printable (c, text);
r = text;
s = *p;
@@ -557,7 +583,7 @@
#define NOT_VALID (-2000000000)
void edit_draw_proportional (void *data,
- void (*converttext) (void *, long, cache_type *, int, int),
+ void (*converttext) (void *, long, cache_type *, int, int, int),
int calctextpos (void *, long, long *, int),
int scroll_right,
Window win,
@@ -594,7 +620,7 @@
/* q contains the offset in the edit buffer */
/* translate this line into printable characters with a style (=color) high byte */
- (*converttext) (data, q, line, x0, x_max - scroll_right - EDIT_TEXT_HORIZONTAL_OFFSET);
+ (*converttext) (data, q, line, x0, x_max - scroll_right - EDIT_TEXT_HORIZONTAL_OFFSET, row);
/* adjust for the horizontal scroll and border */
x0 += scroll_right + EDIT_TEXT_HORIZONTAL_OFFSET;
@@ -693,7 +719,7 @@
edit_get_syntax_color (edit, b - 1, &fg, &bg);
edit_draw_proportional (edit,
- (void (*) (void *, long, cache_type *, int, int)) convert_text,
+ (void (*) (void *, long, cache_type *, int, int, int)) convert_text,
(int (*) (void *, long, long *, int)) calc_text_pos,
edit->start_col, CWindowOf (edit->widget),
end_column, b, row, row * FONT_PIX_PER_LINE + EDIT_TEXT_VERTICAL_OFFSET,
@@ -799,7 +825,7 @@
int highlight_this_line;
/* this is for the text widget (i.e. nroff formatting) */
-void convert_text2 (CWidget * w, long q, cache_type *line, int x, int x_max)
+void convert_text2 (CWidget * w, long q, cache_type *line, int x, int x_max, int row)
{
int c = 0, d;
cache_type s, *p;
diff -ruN old/mc-4.5.27/gtkedit/syntax.c new/mc-4.5.28/gtkedit/syntax.c
--- old/mc-4.5.27/gtkedit/syntax.c Thu Mar 18 20:42:28 1999
+++ new/mc-4.5.28/gtkedit/syntax.c Fri Mar 26 15:30:40 1999
@@ -16,7 +16,9 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307, USA.
+*/
#include <config.h>
#if defined(MIDNIGHT) || defined(GTK)
@@ -698,15 +700,41 @@
#endif
#endif
+static char *error_file_name = 0;
+
+static FILE *open_include_file (char *filename)
+{
+ FILE *f;
+ char p[MAX_PATH_LEN];
+ syntax_free (error_file_name);
+ error_file_name = strdup (filename);
+ if (*filename == '/')
+ return fopen (filename, "r");
+ strcpy (p, home_dir);
+ strcat (p, EDIT_DIR "/");
+ strcat (p, filename);
+ syntax_free (error_file_name);
+ error_file_name = strdup (p);
+ f = fopen (p, "r");
+ if (f)
+ return f;
+ strcpy (p, LIBDIR "/syntax/");
+ strcat (p, filename);
+ syntax_free (error_file_name);
+ error_file_name = strdup (p);
+ return fopen (p, "r");
+}
+
/* returns line number on error */
static int edit_read_syntax_rules (WEdit * edit, FILE * f)
{
+ FILE *g = 0;
char *fg, *bg;
char last_fg[32] = "", last_bg[32] = "";
- char whole_right[256];
- char whole_left[256];
+ char whole_right[512];
+ char whole_left[512];
char *args[1024], *l = 0;
- int line = 0;
+ int save_line = 0, line = 0;
struct context_rule **r, *c;
int num_words = -1, num_contexts = -1;
int argc, result = 0;
@@ -722,12 +750,40 @@
for (;;) {
char **a;
line++;
- if (!read_one_line (&l, f))
- break;
+ l = 0;
+ if (!read_one_line (&l, f)) {
+ if (g) {
+ fclose (f);
+ f = g;
+ g = 0;
+ line = save_line + 1;
+ syntax_free (error_file_name);
+ if (l)
+ free (l);
+ if (!read_one_line (&l, f))
+ break;
+ } else {
+ break;
+ }
+ }
get_args (l, args, &argc);
a = args + 1;
if (!args[0]) {
/* do nothing */
+ } else if (!strcmp (args[0], "include")) {
+ if (g || argc != 2) {
+ result = line;
+ break;
+ }
+ g = f;
+ f = open_include_file (args[1]);
+ if (!f) {
+ syntax_free (error_file_name);
+ result = line;
+ break;
+ }
+ save_line = line;
+ line = 0;
} else if (!strcmp (args[0], "wholechars")) {
check_a;
if (!strcmp (*a, "left")) {
@@ -956,7 +1012,7 @@
syntax_free (edit->rules);
}
-#define CURRENT_SYNTAX_RULES_VERSION "44"
+#define CURRENT_SYNTAX_RULES_VERSION "48"
char *syntax_text[] = {
"# syntax rules version " CURRENT_SYNTAX_RULES_VERSION,
@@ -978,1955 +1034,63 @@
"# brightcyan",
"# white",
"",
-"###############################################################################",
-"file ..\\*\\\\.diff$ Unified\\sDiff\\sOutput ^diff.\\*(-u|--unified)",
-"# yawn",
+"file gobledy_gook #\\sHelp\\ssupport\\sother\\sfile\\stypes",
+"context default",
+"file gobledy_gook #\\sby\\scoding\\srules\\sin\\s~/.cedit/syntax.",
+"context default",
+"file gobledy_gook #\\sSee\\sman/syntax\\sin\\sthe\\ssource\\sdistribution",
+"context default",
+"file gobledy_gook #\\sand\\sconsult\\sthe\\sman\\spage.",
"context default",
-" keyword linestart @@*@@ green/16",
-" keyword linestart \\s black/0 white/26",
-"context linestart diff \\n white/26 red/9",
-"context linestart --- \\n brightmagenta/20",
-"context linestart +++ \\n brightmagenta/20",
-"context linestart + \\n brightgreen/6",
-"context linestart - \\n brightred/18",
-"context linestart A \\n white/26 black/0",
-"context linestart B \\n white/26 black/0",
-"context linestart C \\n white/26 black/0",
-"context linestart D \\n white/26 black/0",
-"context linestart E \\n white/26 black/0",
-"context linestart F \\n white/26 black/0",
-"context linestart G \\n white/26 black/0",
-"context linestart H \\n white/26 black/0",
-"context linestart I \\n white/26 black/0",
-"context linestart J \\n white/26 black/0",
-"context linestart K \\n white/26 black/0",
-"context linestart L \\n white/26 black/0",
-"context linestart M \\n white/26 black/0",
-"context linestart N \\n white/26 black/0",
-"context linestart O \\n white/26 black/0",
-"context linestart P \\n white/26 black/0",
-"context linestart Q \\n white/26 black/0",
-"context linestart R \\n white/26 black/0",
-"context linestart S \\n white/26 black/0",
-"context linestart T \\n white/26 black/0",
-"context linestart U \\n white/26 black/0",
-"context linestart V \\n white/26 black/0",
-"context linestart W \\n white/26 black/0",
-"context linestart X \\n white/26 black/0",
-"context linestart Y \\n white/26 black/0",
-"context linestart Z \\n white/26 black/0",
"",
-"###############################################################################",
-"file ..\\*\\\\.lsm$ LSM\\sFile",
"",
-"context default",
-" keyword linestart Begin3 brightmagenta/20",
-" keyword linestart Title:\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s red/9 yellow/24",
-" keyword linestart Version:\\s\\s\\s\\s\\s\\s\\s\\s red/9 yellow/24",
-" keyword linestart Entered-date:\\s\\s\\s red/9 yellow/24",
-" keyword linestart Description:\\s\\s\\s\\s red/9 yellow/24",
-" keyword linestart Keywords:\\s\\s\\s\\s\\s\\s\\s red/9 yellow/24",
-" keyword linestart Alternate-site:\\s red/9 yellow/24",
-" keyword linestart Primary-site:\\s\\s\\s red/9 yellow/24",
-" keyword linestart Original-site:\\s\\s red/9 yellow/24",
-" keyword linestart Platforms:\\s\\s\\s\\s\\s\\s red/9 yellow/24",
-" keyword linestart Copying-policy:\\s red/9 yellow/24",
-" keyword linestart End brightmagenta/20",
-"",
-" keyword linestart \\t\\t white/26 yellow/24",
-" keyword linestart \\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s\\s white/26 yellow/24",
-" keyword whole GPL green/6",
-" keyword whole BSD green/6",
-" keyword whole Shareware green/6",
-" keyword whole sunsite.unc.edu green/6",
-" keyword wholeright \\s*.tar.gz green/6",
-" keyword wholeright \\s*.lsm green/6",
+"file ..\\*\\\\.diff$ Unified\\sDiff\\sOutput ^diff.\\*(-u|--unified)",
+"include diff.syntax",
"",
-"context linestart Author:\\s\\s\\s\\s\\s\\s\\s\\s\\s \\n brightred/19",
-" keyword whole \\s*@*\\s(*) cyan/16",
+"file ..\\*\\\\.diff$ Context\\sDiff\\sOutput ^diff.\\*(-c|--context)",
+"include diffc.syntax",
"",
-"context linestart Maintained-by:\\s\\s \\n brightred/19",
-" keyword whole \\s*@*\\s(*) cyan/16",
+"file ..\\*\\\\.lsm$ LSM\\sFile",
+"include lsm.syntax",
"",
-"###############################################################################",
"file ..\\*\\\\.sh$ Shell\\sScript ^#!\\s\\*/.\\*/(ksh|bash|sh|pdkzsh)$",
+"include sh.syntax",
"",
-"context default",
-" keyword whole for yellow/24",
-" keyword whole in yellow/24",
-" keyword whole do yellow/24",
-" keyword whole done yellow/24",
-" keyword whole select yellow/24",
-" keyword whole case yellow/24",
-" keyword whole esac yellow/24",
-" keyword whole if yellow/24",
-" keyword whole then yellow/24",
-" keyword whole elif yellow/24",
-" keyword whole else yellow/24",
-" keyword whole fi yellow/24",
-" keyword whole while yellow/24",
-" keyword whole until yellow/24",
-" keyword ;; brightred/18",
-" keyword \\\\\" brightred/18",
-" keyword \\\\' brightred/18",
-" keyword ` brightred/18",
-" keyword ; brightcyan/17",
-" keyword $(*) brightgreen/16",
-" keyword ${*} brightgreen/16",
-" keyword { brightcyan/14",
-" keyword } brightcyan/14",
-"",
-" keyword whole linestart #!\\[\\s\\]/bin/\\[abkpct\\]sh brightcyan/17 black/0",
-"",
-" keyword $\\* brightred/18",
-" keyword $@ brightred/18",
-" keyword $# brightred/18",
-" keyword $? brightred/18",
-" keyword $- brightred/18",
-" keyword $$ brightred/18",
-" keyword $! brightred/18",
-" keyword $_ brightred/18",
-"",
-" keyword wholeright $\\[0123456789\\]0 brightred/18",
-" keyword wholeright $\\[0123456789\\]1 brightred/18",
-" keyword wholeright $\\[0123456789\\]2 brightred/18",
-" keyword wholeright $\\[0123456789\\]3 brightred/18",
-" keyword wholeright $\\[0123456789\\]4 brightred/18",
-" keyword wholeright $\\[0123456789\\]5 brightred/18",
-" keyword wholeright $\\[0123456789\\]6 brightred/18",
-" keyword wholeright $\\[0123456789\\]7 brightred/18",
-" keyword wholeright $\\[0123456789\\]8 brightred/18",
-" keyword wholeright $\\[0123456789\\]9 brightred/18",
-"",
-" keyword wholeright $+A brightgreen/16",
-" keyword wholeright $+B brightgreen/16",
-" keyword wholeright $+C brightgreen/16",
-" keyword wholeright $+D brightgreen/16",
-" keyword wholeright $+E brightgreen/16",
-" keyword wholeright $+F brightgreen/16",
-" keyword wholeright $+G brightgreen/16",
-" keyword wholeright $+H brightgreen/16",
-" keyword wholeright $+I brightgreen/16",
-" keyword wholeright $+J brightgreen/16",
-" keyword wholeright $+K brightgreen/16",
-" keyword wholeright $+L brightgreen/16",
-" keyword wholeright $+M brightgreen/16",
-" keyword wholeright $+N brightgreen/16",
-" keyword wholeright $+O brightgreen/16",
-" keyword wholeright $+P brightgreen/16",
-" keyword wholeright $+Q brightgreen/16",
-" keyword wholeright $+R brightgreen/16",
-" keyword wholeright $+S brightgreen/16",
-" keyword wholeright $+T brightgreen/16",
-" keyword wholeright $+U brightgreen/16",
-" keyword wholeright $+V brightgreen/16",
-" keyword wholeright $+W brightgreen/16",
-" keyword wholeright $+X brightgreen/16",
-" keyword wholeright $+Y brightgreen/16",
-" keyword wholeright $+Z brightgreen/16",
-"",
-" keyword wholeright $+a brightgreen/16",
-" keyword wholeright $+b brightgreen/16",
-" keyword wholeright $+c brightgreen/16",
-" keyword wholeright $+d brightgreen/16",
-" keyword wholeright $+e brightgreen/16",
-" keyword wholeright $+f brightgreen/16",
-" keyword wholeright $+g brightgreen/16",
-" keyword wholeright $+h brightgreen/16",
-" keyword wholeright $+i brightgreen/16",
-" keyword wholeright $+j brightgreen/16",
-" keyword wholeright $+k brightgreen/16",
-" keyword wholeright $+l brightgreen/16",
-" keyword wholeright $+m brightgreen/16",
-" keyword wholeright $+n brightgreen/16",
-" keyword wholeright $+o brightgreen/16",
-" keyword wholeright $+p brightgreen/16",
-" keyword wholeright $+q brightgreen/16",
-" keyword wholeright $+r brightgreen/16",
-" keyword wholeright $+s brightgreen/16",
-" keyword wholeright $+t brightgreen/16",
-" keyword wholeright $+u brightgreen/16",
-" keyword wholeright $+v brightgreen/16",
-" keyword wholeright $+w brightgreen/16",
-" keyword wholeright $+x brightgreen/16",
-" keyword wholeright $+y brightgreen/16",
-" keyword wholeright $+z brightgreen/16",
-"",
-" keyword wholeright $+0 brightgreen/16",
-" keyword wholeright $+1 brightgreen/16",
-" keyword wholeright $+2 brightgreen/16",
-" keyword wholeright $+3 brightgreen/16",
-" keyword wholeright $+4 brightgreen/16",
-" keyword wholeright $+5 brightgreen/16",
-" keyword wholeright $+6 brightgreen/16",
-" keyword wholeright $+7 brightgreen/16",
-" keyword wholeright $+8 brightgreen/16",
-" keyword wholeright $+9 brightgreen/16",
-"",
-" keyword $ brightgreen/16",
-"",
-" keyword wholeleft function*() brightblue/11",
-"",
-"wholechars right abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._",
-"wholechars left abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._",
-"",
-" keyword whole arch cyan/14",
-" keyword whole ash cyan/14",
-" keyword whole awk cyan/14",
-" keyword whole basename cyan/14",
-" keyword whole bash cyan/14",
-" keyword whole basnemae cyan/14",
-" keyword whole bg_backup cyan/14",
-" keyword whole bg_restore cyan/14",
-" keyword whole bsh cyan/14",
-" keyword whole cat cyan/14",
-" keyword whole chgrp cyan/14",
-" keyword whole chmod cyan/14",
-" keyword whole chown cyan/14",
-" keyword whole cp cyan/14",
-" keyword whole cpio cyan/14",
-" keyword whole csh cyan/14",
-" keyword whole date cyan/14",
-" keyword whole dd cyan/14",
-" keyword whole df cyan/14",
-" keyword whole dmesg cyan/14",
-" keyword whole dnsdomainname cyan/14",
-" keyword whole doexec cyan/14",
-" keyword whole domainname cyan/14",
-" keyword whole echo cyan/14",
-" keyword whole ed cyan/14",
-" keyword whole egrep cyan/14",
-" keyword whole ex cyan/14",
-" keyword whole false cyan/14",
-" keyword whole fgrep cyan/14",
-" keyword whole fsconf cyan/14",
-" keyword whole gawk cyan/14",
-" keyword whole grep cyan/14",
-" keyword whole gunzip cyan/14",
-" keyword whole gzip cyan/14",
-" keyword whole hostname cyan/14",
-" keyword whole igawk cyan/14",
-" keyword whole ipcalc cyan/14",
-" keyword whole kill cyan/14",
-" keyword whole ksh cyan/14",
-" keyword whole linuxconf cyan/14",
-" keyword whole ln cyan/14",
-" keyword whole login cyan/14",
-" keyword whole lpdconf cyan/14",
-" keyword whole ls cyan/14",
-" keyword whole mail cyan/14",
-" keyword whole mkdir cyan/14",
-" keyword whole mknod cyan/14",
-" keyword whole mktemp cyan/14",
-" keyword whole more cyan/14",
-" keyword whole mount cyan/14",
-" keyword whole mt cyan/14",
-" keyword whole mv cyan/14",
-" keyword whole netconf cyan/14",
-" keyword whole netstat cyan/14",
-" keyword whole nice cyan/14",
-" keyword whole nisdomainname cyan/14",
-" keyword whole ping cyan/14",
-" keyword whole ps cyan/14",
-" keyword whole pwd cyan/14",
-" keyword whole red cyan/14",
-" keyword whole remadmin cyan/14",
-" keyword whole rm cyan/14",
-" keyword whole rmdir cyan/14",
-" keyword whole rpm cyan/14",
-" keyword whole sed cyan/14",
-" keyword whole setserial cyan/14",
-" keyword whole sh cyan/14",
-" keyword whole sleep cyan/14",
-" keyword whole sort cyan/14",
-" keyword whole stty cyan/14",
-" keyword whole su cyan/14",
-" keyword whole sync cyan/14",
-" keyword whole taper cyan/14",
-" keyword whole tar cyan/14",
-" keyword whole tcsh cyan/14",
-" keyword whole touch cyan/14",
-" keyword whole true cyan/14",
-" keyword whole umount cyan/14",
-" keyword whole uname cyan/14",
-" keyword whole userconf cyan/14",
-" keyword whole usleep cyan/14",
-" keyword whole vi cyan/14",
-" keyword whole view cyan/14",
-" keyword whole vim cyan/14",
-" keyword whole xconf cyan/14",
-" keyword whole ypdomainname cyan/14",
-" keyword whole zcat cyan/14",
-" keyword whole zsh cyan/14",
-"",
-"wholechars right abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_",
-"wholechars left abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_",
-"",
-"context # \\n brown/22",
-"",
-"context exclusive whole <\\[\\s\\\\\\]EOF EOF green/6",
-"",
-"context ' ' green/6",
-"",
-"context \" \" green/6",
-" keyword \\\\' brightgreen/16",
-" keyword \\\\\" brightgreen/16",
-" keyword $(*) brightgreen/16",
-" keyword ${*} brightgreen/16",
-" keyword $\\* brightred/18",
-" keyword $@ brightred/18",
-" keyword $# brightred/18",
-" keyword $? brightred/18",
-" keyword $- brightred/18",
-" keyword $$ brightred/18",
-" keyword $! brightred/18",
-" keyword $_ brightred/18",
-" keyword wholeright $\\[0123456789\\]0 brightred/18",
-" keyword wholeright $\\[0123456789\\]1 brightred/18",
-" keyword wholeright $\\[0123456789\\]2 brightred/18",
-" keyword wholeright $\\[0123456789\\]3 brightred/18",
-" keyword wholeright $\\[0123456789\\]4 brightred/18",
-" keyword wholeright $\\[0123456789\\]5 brightred/18",
-" keyword wholeright $\\[0123456789\\]6 brightred/18",
-" keyword wholeright $\\[0123456789\\]7 brightred/18",
-" keyword wholeright $\\[0123456789\\]8 brightred/18",
-" keyword wholeright $\\[0123456789\\]9 brightred/18",
-"",
-" keyword wholeright $+A brightgreen/16",
-" keyword wholeright $+B brightgreen/16",
-" keyword wholeright $+C brightgreen/16",
-" keyword wholeright $+D brightgreen/16",
-" keyword wholeright $+E brightgreen/16",
-" keyword wholeright $+F brightgreen/16",
-" keyword wholeright $+G brightgreen/16",
-" keyword wholeright $+H brightgreen/16",
-" keyword wholeright $+I brightgreen/16",
-" keyword wholeright $+J brightgreen/16",
-" keyword wholeright $+K brightgreen/16",
-" keyword wholeright $+L brightgreen/16",
-" keyword wholeright $+M brightgreen/16",
-" keyword wholeright $+N brightgreen/16",
-" keyword wholeright $+O brightgreen/16",
-" keyword wholeright $+P brightgreen/16",
-" keyword wholeright $+Q brightgreen/16",
-" keyword wholeright $+R brightgreen/16",
-" keyword wholeright $+S brightgreen/16",
-" keyword wholeright $+T brightgreen/16",
-" keyword wholeright $+U brightgreen/16",
-" keyword wholeright $+V brightgreen/16",
-" keyword wholeright $+W brightgreen/16",
-" keyword wholeright $+X brightgreen/16",
-" keyword wholeright $+Y brightgreen/16",
-" keyword wholeright $+Z brightgreen/16",
-"",
-" keyword wholeright $+a brightgreen/16",
-" keyword wholeright $+b brightgreen/16",
-" keyword wholeright $+c brightgreen/16",
-" keyword wholeright $+d brightgreen/16",
-" keyword wholeright $+e brightgreen/16",
-" keyword wholeright $+f brightgreen/16",
-" keyword wholeright $+g brightgreen/16",
-" keyword wholeright $+h brightgreen/16",
-" keyword wholeright $+i brightgreen/16",
-" keyword wholeright $+j brightgreen/16",
-" keyword wholeright $+k brightgreen/16",
-" keyword wholeright $+l brightgreen/16",
-" keyword wholeright $+m brightgreen/16",
-" keyword wholeright $+n brightgreen/16",
-" keyword wholeright $+o brightgreen/16",
-" keyword wholeright $+p brightgreen/16",
-" keyword wholeright $+q brightgreen/16",
-" keyword wholeright $+r brightgreen/16",
-" keyword wholeright $+s brightgreen/16",
-" keyword wholeright $+t brightgreen/16",
-" keyword wholeright $+u brightgreen/16",
-" keyword wholeright $+v brightgreen/16",
-" keyword wholeright $+w brightgreen/16",
-" keyword wholeright $+x brightgreen/16",
-" keyword wholeright $+y brightgreen/16",
-" keyword wholeright $+z brightgreen/16",
-"",
-" keyword wholeright $+0 brightgreen/16",
-" keyword wholeright $+1 brightgreen/16",
-" keyword wholeright $+2 brightgreen/16",
-" keyword wholeright $+3 brightgreen/16",
-" keyword wholeright $+4 brightgreen/16",
-" keyword wholeright $+5 brightgreen/16",
-" keyword wholeright $+6 brightgreen/16",
-" keyword wholeright $+7 brightgreen/16",
-" keyword wholeright $+8 brightgreen/16",
-" keyword wholeright $+9 brightgreen/16",
-"",
-" keyword $ brightgreen/16",
-"",
-"context exclusive ` ` white/26 black/0",
-" keyword '*' green/6",
-" keyword \" green/6",
-" keyword ; brightcyan/17",
-" keyword $(*) brightgreen/16",
-" keyword ${*} brightgreen/16",
-" keyword { brightcyan/14",
-" keyword } brightcyan/14",
-"",
-" keyword $\\* brightred/18",
-" keyword $@ brightred/18",
-" keyword $# brightred/18",
-" keyword $? brightred/18",
-" keyword $- brightred/18",
-" keyword $$ brightred/18",
-" keyword $! brightred/18",
-" keyword $_ brightred/18",
-"",
-" keyword wholeright $\\[0123456789\\]0 brightred/18",
-" keyword wholeright $\\[0123456789\\]1 brightred/18",
-" keyword wholeright $\\[0123456789\\]2 brightred/18",
-" keyword wholeright $\\[0123456789\\]3 brightred/18",
-" keyword wholeright $\\[0123456789\\]4 brightred/18",
-" keyword wholeright $\\[0123456789\\]5 brightred/18",
-" keyword wholeright $\\[0123456789\\]6 brightred/18",
-" keyword wholeright $\\[0123456789\\]7 brightred/18",
-" keyword wholeright $\\[0123456789\\]8 brightred/18",
-" keyword wholeright $\\[0123456789\\]9 brightred/18",
-"",
-" keyword wholeright $+A brightgreen/16",
-" keyword wholeright $+B brightgreen/16",
-" keyword wholeright $+C brightgreen/16",
-" keyword wholeright $+D brightgreen/16",
-" keyword wholeright $+E brightgreen/16",
-" keyword wholeright $+F brightgreen/16",
-" keyword wholeright $+G brightgreen/16",
-" keyword wholeright $+H brightgreen/16",
-" keyword wholeright $+I brightgreen/16",
-" keyword wholeright $+J brightgreen/16",
-" keyword wholeright $+K brightgreen/16",
-" keyword wholeright $+L brightgreen/16",
-" keyword wholeright $+M brightgreen/16",
-" keyword wholeright $+N brightgreen/16",
-" keyword wholeright $+O brightgreen/16",
-" keyword wholeright $+P brightgreen/16",
-" keyword wholeright $+Q brightgreen/16",
-" keyword wholeright $+R brightgreen/16",
-" keyword wholeright $+S brightgreen/16",
-" keyword wholeright $+T brightgreen/16",
-" keyword wholeright $+U brightgreen/16",
-" keyword wholeright $+V brightgreen/16",
-" keyword wholeright $+W brightgreen/16",
-" keyword wholeright $+X brightgreen/16",
-" keyword wholeright $+Y brightgreen/16",
-" keyword wholeright $+Z brightgreen/16",
-"",
-" keyword wholeright $+a brightgreen/16",
-" keyword wholeright $+b brightgreen/16",
-" keyword wholeright $+c brightgreen/16",
-" keyword wholeright $+d brightgreen/16",
-" keyword wholeright $+e brightgreen/16",
-" keyword wholeright $+f brightgreen/16",
-" keyword wholeright $+g brightgreen/16",
-" keyword wholeright $+h brightgreen/16",
-" keyword wholeright $+i brightgreen/16",
-" keyword wholeright $+j brightgreen/16",
-" keyword wholeright $+k brightgreen/16",
-" keyword wholeright $+l brightgreen/16",
-" keyword wholeright $+m brightgreen/16",
-" keyword wholeright $+n brightgreen/16",
-" keyword wholeright $+o brightgreen/16",
-" keyword wholeright $+p brightgreen/16",
-" keyword wholeright $+q brightgreen/16",
-" keyword wholeright $+r brightgreen/16",
-" keyword wholeright $+s brightgreen/16",
-" keyword wholeright $+t brightgreen/16",
-" keyword wholeright $+u brightgreen/16",
-" keyword wholeright $+v brightgreen/16",
-" keyword wholeright $+w brightgreen/16",
-" keyword wholeright $+x brightgreen/16",
-" keyword wholeright $+y brightgreen/16",
-" keyword wholeright $+z brightgreen/16",
-"",
-" keyword wholeright $+0 brightgreen/16",
-" keyword wholeright $+1 brightgreen/16",
-" keyword wholeright $+2 brightgreen/16",
-" keyword wholeright $+3 brightgreen/16",
-" keyword wholeright $+4 brightgreen/16",
-" keyword wholeright $+5 brightgreen/16",
-" keyword wholeright $+6 brightgreen/16",
-" keyword wholeright $+7 brightgreen/16",
-" keyword wholeright $+8 brightgreen/16",
-" keyword wholeright $+9 brightgreen/16",
-"",
-" keyword $ brightgreen/16",
-"",
-"wholechars right abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._",
-"wholechars left abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._",
-"",
-" keyword whole arch cyan/14",
-" keyword whole ash cyan/14",
-" keyword whole awk cyan/14",
-" keyword whole basename cyan/14",
-" keyword whole bash cyan/14",
-" keyword whole basnemae cyan/14",
-" keyword whole bg_backup cyan/14",
-" keyword whole bg_restore cyan/14",
-" keyword whole bsh cyan/14",
-" keyword whole cat cyan/14",
-" keyword whole chgrp cyan/14",
-" keyword whole chmod cyan/14",
-" keyword whole chown cyan/14",
-" keyword whole cp cyan/14",
-" keyword whole cpio cyan/14",
-" keyword whole csh cyan/14",
-" keyword whole date cyan/14",
-" keyword whole dd cyan/14",
-" keyword whole df cyan/14",
-" keyword whole dmesg cyan/14",
-" keyword whole dnsdomainname cyan/14",
-" keyword whole doexec cyan/14",
-" keyword whole domainname cyan/14",
-" keyword whole echo cyan/14",
-" keyword whole ed cyan/14",
-" keyword whole egrep cyan/14",
-" keyword whole ex cyan/14",
-" keyword whole false cyan/14",
-" keyword whole fgrep cyan/14",
-" keyword whole fsconf cyan/14",
-" keyword whole gawk cyan/14",
-" keyword whole grep cyan/14",
-" keyword whole gunzip cyan/14",
-" keyword whole gzip cyan/14",
-" keyword whole hostname cyan/14",
-" keyword whole igawk cyan/14",
-" keyword whole ipcalc cyan/14",
-" keyword whole kill cyan/14",
-" keyword whole ksh cyan/14",
-" keyword whole linuxconf cyan/14",
-" keyword whole ln cyan/14",
-" keyword whole login cyan/14",
-" keyword whole lpdconf cyan/14",
-" keyword whole ls cyan/14",
-" keyword whole mail cyan/14",
-" keyword whole mkdir cyan/14",
-" keyword whole mknod cyan/14",
-" keyword whole mktemp cyan/14",
-" keyword whole more cyan/14",
-" keyword whole mount cyan/14",
-" keyword whole mt cyan/14",
-" keyword whole mv cyan/14",
-" keyword whole netconf cyan/14",
-" keyword whole netstat cyan/14",
-" keyword whole nice cyan/14",
-" keyword whole nisdomainname cyan/14",
-" keyword whole ping cyan/14",
-" keyword whole ps cyan/14",
-" keyword whole pwd cyan/14",
-" keyword whole red cyan/14",
-" keyword whole remadmin cyan/14",
-" keyword whole rm cyan/14",
-" keyword whole rmdir cyan/14",
-" keyword whole rpm cyan/14",
-" keyword whole sed cyan/14",
-" keyword whole setserial cyan/14",
-" keyword whole sh cyan/14",
-" keyword whole sleep cyan/14",
-" keyword whole sort cyan/14",
-" keyword whole stty cyan/14",
-" keyword whole su cyan/14",
-" keyword whole sync cyan/14",
-" keyword whole taper cyan/14",
-" keyword whole tar cyan/14",
-" keyword whole tcsh cyan/14",
-" keyword whole touch cyan/14",
-" keyword whole true cyan/14",
-" keyword whole umount cyan/14",
-" keyword whole uname cyan/14",
-" keyword whole userconf cyan/14",
-" keyword whole usleep cyan/14",
-" keyword whole vi cyan/14",
-" keyword whole view cyan/14",
-" keyword whole vim cyan/14",
-" keyword whole xconf cyan/14",
-" keyword whole ypdomainname cyan/14",
-" keyword whole zcat cyan/14",
-" keyword whole zsh cyan/14",
-"",
-"###############################################################################",
"file ..\\*\\\\.(pl|PL])$ Perl\\sProgram ^#!\\s\\*/.\\*/perl$",
-"context default",
-" keyword whole linestart #!\\[\\s\\]/\\[abcdefghijklmnopqrstuvwxyz\\]/\\[abcdefghijklmnopqrstuvwxyz\\]/\\[abcdefghijklmnopqrstuvwxyz\\]/\\[abcdefghijklmnopqrstuvwxyz\\]/bin/perl brightcyan/17 black/0",
-" keyword whole linestart #!\\[\\s\\]/\\[abcdefghijklmnopqrstuvwxyz\\]/\\[abcdefghijklmnopqrstuvwxyz\\]/\\[abcdefghijklmnopqrstuvwxyz\\]/bin/perl brightcyan/17 black/0",
-" keyword whole linestart #!\\[\\s\\]/\\[abcdefghijklmnopqrstuvwxyz\\]/\\[abcdefghijklmnopqrstuvwxyz\\]/bin/perl brightcyan/17 black/0",
-" keyword whole linestart #!\\[\\s\\]/\\[abcdefghijklmnopqrstuvwxyz\\]/bin/perl brightcyan/17 black/0",
-" keyword whole linestart #!\\[\\s\\]/bin/perl brightcyan/17 black/0",
-"",
-" keyword $_ red/orange",
-" keyword $. red/orange",
-" keyword $/ red/orange",
-" keyword $, red/orange",
-" keyword $\" red/orange",
-" keyword $\\\\ red/orange",
-" keyword $# red/orange",
-" keyword $\\* red/orange",
-" keyword $? red/orange",
-" keyword $] red/orange",
-" keyword $[ red/orange",
-" keyword $; red/orange",
-" keyword $! red/orange",
-" keyword $@ red/orange",
-" keyword $: red/orange",
-" keyword $0 red/orange",
-" keyword $$ red/orange",
-" keyword $< red/orange",
-" keyword $> red/orange",
-" keyword $( red/orange",
-" keyword $) red/orange",
-"",
-" keyword $% red/orange",
-" keyword $= red/orange",
-" keyword $- red/orange",
-" keyword $~ red/orange",
-" keyword $| red/orange",
-" keyword $& red/orange",
-" keyword $` red/orange",
-" keyword $' red/orange",
-" keyword $+ red/orange",
-" keyword $11 red/orange",
-" keyword $12 red/orange",
-" keyword $13 red/orange",
-" keyword $14 red/orange",
-" keyword $15 red/orange",
-" keyword $16 red/orange",
-" keyword $17 red/orange",
-" keyword $18 red/orange",
-" keyword $19 red/orange",
-" keyword $20 red/orange",
-" keyword $10 red/orange",
-" keyword $1 red/orange",
-" keyword $2 red/orange",
-" keyword $3 red/orange",
-" keyword $4 red/orange",
-" keyword $5 red/orange",
-" keyword $6 red/orange",
-" keyword $7 red/orange",
-" keyword $8 red/orange",
-" keyword $9 red/orange",
-" keyword $0 red/orange",
-"",
-" keyword $^A red/orange",
-" keyword $^D red/orange",
-" keyword $^E red/orange",
-" keyword $^I red/orange",
-" keyword $^L red/orange",
-" keyword $^P red/orange",
-" keyword $^T red/orange",
-" keyword $^W red/orange",
-" keyword $^X red/orange",
-" keyword $^A red/orange",
-"",
-" keyword @EXPORT red/orange",
-" keyword @EXPORT_OK red/orange",
-" keyword @INC red/orange",
-" keyword @ISA red/orange",
-" keyword @_ red/orange",
-" keyword @ENV red/orange",
-" keyword @OVERLOAD red/orange",
-" keyword @SIG red/orange",
-"",
-" keyword $ brightgreen/15",
-" keyword & brightmagenta/19",
-" keyword % brightcyan/17",
-" keyword @ white/21",
-" keyword \\\\\" brightred/18",
-" keyword \\\\' brightred/18",
-"",
-" keyword <+> brightred/18",
-" keyword -> yellow/24",
-" keyword => yellow/24",
-" keyword > yellow/24",
-" keyword < yellow/24",
-" keyword \\+ yellow/24",
-" keyword - yellow/24",
-" keyword \\* yellow/24",
-" keyword / yellow/24",
-" keyword % yellow/24",
-" keyword = yellow/24",
-" keyword != yellow/24",
-" keyword == yellow/24",
-" keyword whole ge yellow/24",
-" keyword whole le yellow/24",
-" keyword whole gt yellow/24",
-" keyword whole lt yellow/24",
-" keyword whole eq yellow/24",
-" keyword whole ne yellow/24",
-" keyword whole cmp yellow/24",
-" keyword ~ yellow/24",
-" keyword { brightcyan/14",
-" keyword } brightcyan/14",
-" keyword ( brightcyan/15",
-" keyword ) brightcyan/15",
-" keyword [ brightcyan/14",
-" keyword ] brightcyan/14",
-" keyword , brightcyan/14",
-" keyword .. brightcyan/14",
-" keyword : brightcyan/14",
-" keyword ; brightmagenta/19",
-"",
-" keyword whole sub yellow/24",
-" keyword whole STDIN brightred/18",
-" keyword whole STDOUT brightred/18",
-" keyword whole STDERR brightred/18",
-" keyword whole STDARGV brightred/18",
-" keyword whole DATA brightred/18",
-"",
-" keyword whole do magenta/23",
-" keyword whole if magenta/23",
-" keyword whole until magenta/23",
-" keyword whole elsif magenta/23",
-" keyword whole else magenta/23",
-" keyword whole unless magenta/23",
-" keyword whole while magenta/23",
-" keyword whole foreach magenta/23",
-" keyword whole goto magenta/23",
-" keyword whole last magenta/23",
-" keyword whole next magenta/23",
-" keyword whole bless magenta/23",
-" keyword whole caller magenta/23",
-" keyword whole import magenta/23",
-" keyword whole package magenta/23",
-" keyword whole require magenta/23",
-" keyword whole return magenta/23",
-" keyword whole untie magenta/23",
-" keyword whole use magenta/23",
-"",
-" keyword whole diagnostics brightcyan/17",
-" keyword whole integer brightcyan/17",
-" keyword whole less brightcyan/17",
-" keyword whole lib brightcyan/17",
-" keyword whole ops brightcyan/17",
-" keyword whole overload brightcyan/17",
-" keyword whole sigtrap brightcyan/17",
-" keyword whole strict brightcyan/17",
-" keyword whole vars brightcyan/17",
-"",
-" keyword whole abs yellow/24",
-" keyword whole atan2 yellow/24",
-" keyword whole cos yellow/24",
-" keyword whole exp yellow/24",
-" keyword whole int yellow/24",
-" keyword whole log yellow/24",
-" keyword whole rand yellow/24",
-" keyword whole sin yellow/24",
-" keyword whole sqrt yellow/24",
-" keyword whole srand yellow/24",
-" keyword whole time yellow/24",
-" keyword whole chr yellow/24",
-" keyword whole gmtime yellow/24",
-" keyword whole hex yellow/24",
-" keyword whole localtime yellow/24",
-" keyword whole oct yellow/24",
-" keyword whole ord yellow/24",
-" keyword whole vec yellow/24",
-" keyword whole pack yellow/24",
-" keyword whole unpack yellow/24",
-"",
-" keyword whole chomp yellow/YellowGreen",
-" keyword whole chop yellow/YellowGreen",
-" keyword whole crypt yellow/YellowGreen",
-" keyword whole eval yellow/YellowGreen",
-" keyword whole index yellow/YellowGreen",
-" keyword whole length yellow/YellowGreen",
-" keyword whole lc yellow/YellowGreen",
-" keyword whole lcfirst yellow/YellowGreen",
-" keyword whole quotemeta yellow/YellowGreen",
-" keyword whole rindex yellow/YellowGreen",
-" keyword whole substr yellow/YellowGreen",
-" keyword whole uc yellow/YellowGreen",
-" keyword whole ucfirst yellow/YellowGreen",
-"",
-" keyword whole delete yellow/24",
-" keyword whole each yellow/24",
-" keyword whole exists yellow/24",
-" keyword whole grep yellow/24",
-" keyword whole join yellow/24",
-" keyword whole keys yellow/24",
-" keyword whole map yellow/24",
-" keyword whole pop yellow/24",
-" keyword whole push yellow/24",
-" keyword whole reverse yellow/24",
-" keyword whole scalar yellow/24",
-" keyword whole shift yellow/24",
-" keyword whole sort yellow/24",
-" keyword whole splice yellow/24",
-" keyword whole split yellow/24",
-" keyword whole unshift yellow/24",
-" keyword whole values yellow/24",
-"",
-" keyword whole chmod yellow/24",
-" keyword whole chown yellow/24",
-" keyword whole truncate yellow/24",
-" keyword whole link yellow/24",
-" keyword whole lstat yellow/24",
-" keyword whole mkdir yellow/24",
-" keyword whole readlink yellow/24",
-" keyword whole rename yellow/24",
-" keyword whole rmdir yellow/24",
-" keyword whole stat yellow/24",
-" keyword whole symlink yellow/24",
-" keyword whole unlink yellow/24",
-" keyword whole utime yellow/24",
-"",
-" keyword whole binmade yellow/24",
-" keyword whole close yellow/24",
-" keyword whole dbmclose yellow/24",
-" keyword whole dbmopen yellow/24",
-" keyword whole binmade yellow/24",
-" keyword whole eof yellow/24",
-" keyword whole fcntl yellow/24",
-" keyword whole fileno yellow/24",
-" keyword whole flock yellow/24",
-" keyword whole getc yellow/24",
-" keyword whole ioctl yellow/24",
-" keyword whole open yellow/24",
-" keyword whole pipe yellow/24",
-" keyword whole print yellow/24",
-" keyword whole printf yellow/24",
-" keyword whole read yellow/24",
-" keyword whole seek yellow/24",
-" keyword whole select yellow/24",
-" keyword whole sprintf yellow/24",
-" keyword whole sysopen yellow/24",
-" keyword whole sysread yellow/24",
-" keyword whole syswrite yellow/24",
-" keyword whole tell yellow/24",
-"",
-" keyword whole formline yellow/24",
-" keyword whole write yellow/24",
-"",
-" keyword whole closedir yellow/24",
-" keyword whole opendir yellow/24",
-" keyword whole readdir yellow/24",
-" keyword whole rewinddir yellow/24",
-" keyword whole seekdir yellow/24",
-" keyword whole telldir yellow/24",
-"",
-" keyword whole alarm yellow/24",
-" keyword whole chdir yellow/24",
-" keyword whole chroot yellow/24",
-" keyword whole die yellow/24",
-" keyword whole exec yellow/24",
-" keyword whole exit yellow/24",
-" keyword whole fork yellow/24",
-" keyword whole getlogin yellow/24",
-" keyword whole getpgrp yellow/24",
-" keyword whole getppid yellow/24",
-" keyword whole getpriority yellow/24",
-" keyword whole glob yellow/24",
-" keyword whole kill yellow/24",
-" keyword whole setpgrp yellow/24",
-" keyword whole setpriority yellow/24",
-" keyword whole sleep yellow/24",
-" keyword whole syscall yellow/24",
-" keyword whole system yellow/24",
-" keyword whole times yellow/24",
-" keyword whole umask yellow/24",
-" keyword whole wait yellow/24",
-" keyword whole waitpid yellow/24",
-" keyword whole warn yellow/24",
-"",
-" keyword whole accept yellow/24",
-" keyword whole bind yellow/24",
-" keyword whole connect yellow/24",
-" keyword whole getpeername yellow/24",
-" keyword whole getsockname yellow/24",
-" keyword whole getsockopt yellow/24",
-" keyword whole listen yellow/24",
-" keyword whole recv yellow/24",
-" keyword whole send yellow/24",
-" keyword whole setsockopt yellow/24",
-" keyword whole shutdown yellow/24",
-" keyword whole socket yellow/24",
-" keyword whole socketpair yellow/24",
-"",
-" keyword whole msgctl yellow/24",
-" keyword whole msgget yellow/24",
-" keyword whole msgsnd yellow/24",
-" keyword whole msgrcv yellow/24",
-" keyword whole semctl yellow/24",
-" keyword whole semget yellow/24",
-" keyword whole semop yellow/24",
-" keyword whole shmctl yellow/24",
-" keyword whole shmget yellow/24",
-" keyword whole shmread yellow/24",
-" keyword whole shmwrite yellow/24",
-"",
-" keyword whole defined yellow/24",
-" keyword whole dump yellow/24",
-" keyword whole eval yellow/24",
-" keyword whole local yellow/24",
-" keyword whole my yellow/24",
-" keyword whole ref yellow/24",
-" keyword whole reset yellow/24",
-" keyword whole scalar yellow/24",
-" keyword whole undef yellow/24",
-" keyword whole wantarray yellow/24",
-"",
-" keyword whole endpwent yellow/24",
-" keyword whole getpwent yellow/24",
-" keyword whole getpwnam yellow/24",
-" keyword whole getpwuid yellow/24",
-" keyword whole setpwent yellow/24",
-" keyword whole endgrent yellow/24",
-" keyword whole getgrgid yellow/24",
-" keyword whole getgrnam yellow/24",
-" keyword whole getgrent yellow/24",
-" keyword whole setgrent yellow/24",
-"",
-" keyword whole endhostent yellow/24",
-" keyword whole gethostbyaddr yellow/24",
-" keyword whole gethostbyname yellow/24",
-" keyword whole gethostent yellow/24",
-" keyword whole sethostent yellow/24",
-"",
-" keyword whole endnetent yellow/24",
-" keyword whole getnetbyaddr yellow/24",
-" keyword whole getnetbyname yellow/24",
-" keyword whole getnetent yellow/24",
-" keyword whole setnetent yellow/24",
-" keyword whole endservent yellow/24",
-" keyword whole getservbyname yellow/24",
-" keyword whole getservbyport yellow/24",
-" keyword whole getservent yellow/24",
-" keyword whole serservent yellow/24",
-" keyword whole endprotoent yellow/24",
-" keyword whole getprotobyname yellow/24",
-" keyword whole getprotobynumber yellow/24",
-" keyword whole getprotoent yellow/24",
-" keyword whole setprotoent yellow/24",
-"",
-"context exclusive whole <\\[\\s\\\\\\]EOF EOF green/6",
-"context # \\n brown/22",
-"context linestart = =cut brown/22",
-"context \" \" green/6",
-" keyword \\\\\" brightgreen/16",
-" keyword \\\\\\\\ brightgreen/16",
-"context ' ' brightgreen/16",
-" keyword \\\\' green/6",
-" keyword \\\\\\\\ green/6",
+"include perl.syntax",
"",
-"context exclusive ` ` white/26 black/0",
-"",
-"context whole __END__ guacomale_pudding white/26 black/0",
-"",
-"###############################################################################",
"file ..\\*\\\\.(py|PY])$ Python\\sProgram ^#!\\s\\*/.\\*/python$",
-"context default",
-" keyword : brightred/18",
-" keyword > yellow/24",
-" keyword < yellow/24",
-" keyword \\+ yellow/24",
-" keyword - yellow/24",
-" keyword \\* yellow/24",
-" keyword / yellow/24",
-" keyword % yellow/24",
-" keyword = yellow/24",
-" keyword != yellow/24",
-" keyword == yellow/24",
-" keyword { brightcyan/14",
-" keyword } brightcyan/14",
-" keyword ( brightcyan/15",
-" keyword ) brightcyan/15",
-" keyword [ brightcyan/14",
-" keyword ] brightcyan/14",
-" keyword , brightcyan/14",
-" keyword : brightcyan/14",
-" keyword ; brightmagenta/19",
-" keyword whole self brightred/18",
-" keyword whole access yellow/24",
-" keyword whole and yellow/24",
-" keyword whole break yellow/24",
-" keyword whole class yellow/24",
-" keyword whole continue yellow/24",
-" keyword whole def yellow/24",
-" keyword whole del yellow/24",
-" keyword whole elif yellow/24",
-" keyword whole else yellow/24",
-" keyword whole except yellow/24",
-" keyword whole exec yellow/24",
-" keyword whole finally yellow/24",
-" keyword whole for yellow/24",
-" keyword whole from yellow/24",
-" keyword whole global yellow/24",
-" keyword whole if yellow/24",
-" keyword whole import yellow/24",
-" keyword whole in yellow/24",
-" keyword whole is yellow/24",
-" keyword whole lambda yellow/24",
-" keyword whole not yellow/24",
-" keyword whole or yellow/24",
-" keyword whole pass yellow/24",
-" keyword whole print yellow/24",
-" keyword whole raise yellow/24",
-" keyword whole return yellow/24",
-" keyword whole try yellow/24",
-" keyword whole while yellow/24",
-"",
-" keyword whole abs brightcyan/17",
-" keyword whole apply brightcyan/17",
-" keyword whole callable brightcyan/17",
-" keyword whole chr brightcyan/17",
-" keyword whole cmp brightcyan/17",
-" keyword whole coerce brightcyan/17",
-" keyword whole compile brightcyan/17",
-" keyword whole delattr brightcyan/17",
-" keyword whole dir brightcyan/17",
-" keyword whole divmod brightcyan/17",
-" keyword whole eval brightcyan/17",
-" keyword whole exec brightcyan/17",
-" keyword whole execfile brightcyan/17",
-" keyword whole filter brightcyan/17",
-" keyword whole float brightcyan/17",
-" keyword whole getattr brightcyan/17",
-" keyword whole globals brightcyan/17",
-" keyword whole hasattr brightcyan/17",
-" keyword whole hash brightcyan/17",
-" keyword whole hex brightcyan/17",
-" keyword whole id brightcyan/17",
-" keyword whole input brightcyan/17",
-" keyword whole int brightcyan/17",
-" keyword whole len brightcyan/17",
-" keyword whole locals brightcyan/17",
-" keyword whole long brightcyan/17",
-" keyword whole map brightcyan/17",
-" keyword whole max brightcyan/17",
-" keyword whole min brightcyan/17",
-" keyword whole oct brightcyan/17",
-" keyword whole open brightcyan/17",
-" keyword whole ord brightcyan/17",
-" keyword whole pow brightcyan/17",
-" keyword whole range brightcyan/17",
-" keyword whole raw_input brightcyan/17",
-" keyword whole reduce brightcyan/17",
-" keyword whole reload brightcyan/17",
-" keyword whole repr brightcyan/17",
-" keyword whole round brightcyan/17",
-" keyword whole setattr brightcyan/17",
-" keyword whole str brightcyan/17",
-" keyword whole tuple brightcyan/17",
-" keyword whole type brightcyan/17",
-" keyword whole vars brightcyan/17",
-" keyword whole xrange brightcyan/17",
-"",
-" keyword whole atof magenta/23",
-" keyword whole atoi magenta/23",
-" keyword whole atol magenta/23",
-" keyword whole expandtabs magenta/23",
-" keyword whole find magenta/23",
-" keyword whole rfind magenta/23",
-" keyword whole index magenta/23",
-" keyword whole rindex magenta/23",
-" keyword whole count magenta/23",
-" keyword whole split magenta/23",
-" keyword whole splitfields magenta/23",
-" keyword whole join magenta/23",
-" keyword whole joinfields magenta/23",
-" keyword whole strip magenta/23",
-" keyword whole swapcase magenta/23",
-" keyword whole upper magenta/23",
-" keyword whole lower magenta/23",
-" keyword whole ljust magenta/23",
-" keyword whole rjust magenta/23",
-" keyword whole center magenta/23",
-" keyword whole zfill magenta/23",
-"",
-" keyword whole __init__ lightgray/13",
-" keyword whole __del__ lightgray/13",
-" keyword whole __repr__ lightgray/13",
-" keyword whole __str__ lightgray/13",
-" keyword whole __cmp__ lightgray/13",
-" keyword whole __hash__ lightgray/13",
-" keyword whole __call__ lightgray/13",
-" keyword whole __getattr__ lightgray/13",
-" keyword whole __setattr__ lightgray/13",
-" keyword whole __delattr__ lightgray/13",
-" keyword whole __len__ lightgray/13",
-" keyword whole __getitem__ lightgray/13",
-" keyword whole __setitem__ lightgray/13",
-" keyword whole __delitem__ lightgray/13",
-" keyword whole __getslice__ lightgray/13",
-" keyword whole __setslice__ lightgray/13",
-" keyword whole __delslice__ lightgray/13",
-" keyword whole __add__ lightgray/13",
-" keyword whole __sub__ lightgray/13",
-" keyword whole __mul__ lightgray/13",
-" keyword whole __div__ lightgray/13",
-" keyword whole __mod__ lightgray/13",
-" keyword whole __divmod__ lightgray/13",
-" keyword whole __pow__ lightgray/13",
-" keyword whole __lshift__ lightgray/13",
-" keyword whole __rshift__ lightgray/13",
-" keyword whole __and__ lightgray/13",
-" keyword whole __xor__ lightgray/13",
-" keyword whole __or__ lightgray/13",
-" keyword whole __neg__ lightgray/13",
-" keyword whole __pos__ lightgray/13",
-" keyword whole __abs__ lightgray/13",
-" keyword whole __invert__ lightgray/13",
-" keyword whole __nonzero__ lightgray/13",
-" keyword whole __coerce__ lightgray/13",
-" keyword whole __int__ lightgray/13",
-" keyword whole __long__ lightgray/13",
-" keyword whole __float__ lightgray/13",
-" keyword whole __oct__ lightgray/13",
-" keyword whole __hex__ lightgray/13",
-"",
-" keyword whole __init__ lightgray/13",
-" keyword whole __del__ lightgray/13",
-" keyword whole __repr__ lightgray/13",
-" keyword whole __str__ lightgray/13",
-" keyword whole __cmp__ lightgray/13",
-" keyword whole __hash__ lightgray/13",
-" keyword whole __call__ lightgray/13",
-" keyword whole __getattr__ lightgray/13",
-" keyword whole __setattr__ lightgray/13",
-" keyword whole __delattr__ lightgray/13",
-" keyword whole __len__ lightgray/13",
-" keyword whole __getitem__ lightgray/13",
-" keyword whole __setitem__ lightgray/13",
-" keyword whole __delitem__ lightgray/13",
-" keyword whole __getslice__ lightgray/13",
-" keyword whole __setslice__ lightgray/13",
-" keyword whole __delslice__ lightgray/13",
-" keyword whole __add__ lightgray/13",
-" keyword whole __sub__ lightgray/13",
-" keyword whole __mul__ lightgray/13",
-" keyword whole __div__ lightgray/13",
-" keyword whole __mod__ lightgray/13",
-" keyword whole __divmod__ lightgray/13",
-" keyword whole __pow__ lightgray/13",
-" keyword whole __lshift__ lightgray/13",
-" keyword whole __rshift__ lightgray/13",
-" keyword whole __and__ lightgray/13",
-" keyword whole __xor__ lightgray/13",
-" keyword whole __or__ lightgray/13",
-" keyword whole __neg__ lightgray/13",
-" keyword whole __pos__ lightgray/13",
-" keyword whole __abs__ lightgray/13",
-" keyword whole __invert__ lightgray/13",
-" keyword whole __nonzero__ lightgray/13",
-" keyword whole __coerce__ lightgray/13",
-" keyword whole __int__ lightgray/13",
-" keyword whole __long__ lightgray/13",
-" keyword whole __float__ lightgray/13",
-" keyword whole __oct__ lightgray/13",
-" keyword whole __hex__ lightgray/13",
-"",
-" keyword whole __radd__ lightgray/13",
-" keyword whole __rsub__ lightgray/13",
-" keyword whole __rmul__ lightgray/13",
-" keyword whole __rdiv__ lightgray/13",
-" keyword whole __rmod__ lightgray/13",
-" keyword whole __rdivmod__ lightgray/13",
-" keyword whole __rpow__ lightgray/13",
-" keyword whole __rlshift__ lightgray/13",
-" keyword whole __rrshift__ lightgray/13",
-" keyword whole __rand__ lightgray/13",
-" keyword whole __rxor__ lightgray/13",
-" keyword whole __ror__ lightgray/13",
-"",
-" keyword whole __*__ brightred/18",
-"",
-"context \"\"\" \"\"\" brown/22",
-"context # \\n brown/22",
-"context \" \" green/6",
-" keyword \\\\\" brightgreen/16",
-" keyword %% brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[L\\]e brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[L\\]E brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[L\\]f brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[L\\]g brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[L\\]G brightgreen/16",
-" keyword %\\[0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[hl\\]d brightgreen/16",
-" keyword %\\[0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[hl\\]i brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[hl\\]o brightgreen/16",
-" keyword %\\[0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[hl\\]u brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[hl\\]x brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[hl\\]X brightgreen/16",
-" keyword %\\[hl\\]n brightgreen/16",
-" keyword %\\[.\\]\\[0123456789\\]s brightgreen/16",
-" keyword %[*] brightgreen/16",
-" keyword %c brightgreen/16",
-" keyword \\\\\\\\ brightgreen/16",
-" keyword \\\\' brightgreen/16",
-" keyword \\\\a brightgreen/16",
-" keyword \\\\b brightgreen/16",
-" keyword \\\\t brightgreen/16",
-" keyword \\\\n brightgreen/16",
-" keyword \\\\v brightgreen/16",
-" keyword \\\\f brightgreen/16",
-" keyword \\\\r brightgreen/16",
-" keyword \\\\0 brightgreen/16",
-"",
-"context ' ' green/6",
-" keyword \\\\\" brightgreen/16",
-" keyword %% brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[L\\]e brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[L\\]E brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[L\\]f brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[L\\]g brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[L\\]G brightgreen/16",
-" keyword %\\[0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[hl\\]d brightgreen/16",
-" keyword %\\[0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[hl\\]i brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[hl\\]o brightgreen/16",
-" keyword %\\[0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[hl\\]u brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[hl\\]x brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[hl\\]X brightgreen/16",
-" keyword %\\[hl\\]n brightgreen/16",
-" keyword %\\[.\\]\\[0123456789\\]s brightgreen/16",
-" keyword %[*] brightgreen/16",
-" keyword %c brightgreen/16",
-" keyword \\\\\\\\ brightgreen/16",
-" keyword \\\\' brightgreen/16",
-" keyword \\\\a brightgreen/16",
-" keyword \\\\b brightgreen/16",
-" keyword \\\\t brightgreen/16",
-" keyword \\\\n brightgreen/16",
-" keyword \\\\v brightgreen/16",
-" keyword \\\\f brightgreen/16",
-" keyword \\\\r brightgreen/16",
-" keyword \\\\0 brightgreen/16",
+"include python.syntax",
"",
-"###############################################################################",
"file ..\\*\\\\.(man|[0-9n]|[0-9]x)$ NROFF\\sSource",
+"include nroff.syntax",
"",
-"context default",
-" keyword \\\\fP brightgreen/6",
-" keyword \\\\fR brightgreen/6",
-" keyword \\\\fB brightgreen/6",
-" keyword \\\\fI brightgreen/6",
-" keyword linestart .AS cyan/5",
-" keyword linestart .Ar cyan/5",
-" keyword linestart .At cyan/5",
-" keyword linestart .BE cyan/5",
-" keyword linestart .BH cyan/5",
-" keyword linestart .BI cyan/5",
-" keyword linestart .BR cyan/5",
-" keyword linestart .BS cyan/5",
-" keyword linestart .Bd cyan/5",
-" keyword linestart .Bk cyan/5",
-" keyword linestart .Bl cyan/5",
-" keyword linestart .Bu cyan/5",
-" keyword linestart .Bx cyan/5",
-" keyword linestart .CE cyan/5",
-" keyword linestart .CM cyan/5",
-" keyword linestart .CS cyan/5",
-" keyword linestart .CT cyan/5",
-" keyword linestart .CW cyan/5",
-" keyword linestart .Cm cyan/5",
-" keyword linestart .Co cyan/5",
-" keyword linestart .DA cyan/5",
-" keyword linestart .DE cyan/5",
-" keyword linestart .DS cyan/5",
-" keyword linestart .DT cyan/5",
-" keyword linestart .Dd cyan/5",
-" keyword linestart .De cyan/5",
-" keyword linestart .Dl cyan/5",
-" keyword linestart .Dq cyan/5",
-" keyword linestart .Ds cyan/5",
-" keyword linestart .Dt cyan/5",
-" keyword linestart .Dv cyan/5",
-" keyword linestart .EE cyan/5",
-" keyword linestart .EN cyan/5",
-" keyword linestart .EQ cyan/5",
-" keyword linestart .EX cyan/5",
-" keyword linestart .Ed cyan/5",
-" keyword linestart .Ee cyan/5",
-" keyword linestart .Ek cyan/5",
-" keyword linestart .El cyan/5",
-" keyword linestart .Em cyan/5",
-" keyword linestart .En cyan/5",
-" keyword linestart .Ev cyan/5",
-" keyword linestart .Ex cyan/5",
-" keyword linestart .FI cyan/5",
-" keyword linestart .FL cyan/5",
-" keyword linestart .FN cyan/5",
-" keyword linestart .FT cyan/5",
-" keyword linestart .Fi cyan/5",
-" keyword linestart .Fl cyan/5",
-" keyword linestart .Fn cyan/5",
-" keyword linestart .HP cyan/5",
-" keyword linestart .HS cyan/5",
-" keyword linestart .Hh cyan/5",
-" keyword linestart .Hi cyan/5",
-" keyword linestart .IB cyan/5",
-" keyword linestart .IP cyan/5",
-" keyword linestart .IR cyan/5",
-" keyword linestart .IX cyan/5",
-" keyword linestart .Ic cyan/5",
-" keyword linestart .Id cyan/5",
-" keyword linestart .Ip cyan/5",
-" keyword linestart .It cyan/5",
-" keyword linestart .LI cyan/5",
-" keyword linestart .LO cyan/5",
-" keyword linestart .LP cyan/5",
-" keyword linestart .LR cyan/5",
-" keyword linestart .Li cyan/5",
-" keyword linestart .MF cyan/5",
-" keyword linestart .ML cyan/5",
-" keyword linestart .MU cyan/5",
-" keyword linestart .MV cyan/5",
-" keyword linestart .N cyan/5",
-" keyword linestart .NF cyan/5",
-" keyword linestart .Nd cyan/5",
-" keyword linestart .Nm cyan/5",
-" keyword linestart .No cyan/5",
-" keyword linestart .OP cyan/5",
-" keyword linestart .Oc cyan/5",
-" keyword linestart .Oo cyan/5",
-" keyword linestart .Op cyan/5",
-" keyword linestart .Os cyan/5",
-" keyword linestart .PD cyan/5",
-" keyword linestart .PN cyan/5",
-" keyword linestart .PP cyan/5",
-" keyword linestart .PU cyan/5",
-" keyword linestart .Pa cyan/5",
-" keyword linestart .Pf cyan/5",
-" keyword linestart .Pp cyan/5",
-" keyword linestart .Pq cyan/5",
-" keyword linestart .Pr cyan/5",
-" keyword linestart .Ps cyan/5",
-" keyword linestart .Ql cyan/5",
-" keyword linestart .RB cyan/5",
-" keyword linestart .RE cyan/5",
-" keyword linestart .RI cyan/5",
-" keyword linestart .RS cyan/5",
-" keyword linestart .RT cyan/5",
-" keyword linestart .Re cyan/5",
-" keyword linestart .Rs cyan/5",
-" keyword linestart .SB cyan/5",
-" keyword linestart .SH cyan/5",
-" keyword linestart .SM cyan/5",
-" keyword linestart .SP cyan/5",
-" keyword linestart .SS cyan/5",
-" keyword linestart .Sa cyan/5",
-" keyword linestart .Sh cyan/5",
-" keyword linestart .Sm cyan/5",
-" keyword linestart .Sp cyan/5",
-" keyword linestart .Sq cyan/5",
-" keyword linestart .Ss cyan/5",
-" keyword linestart .St cyan/5",
-" keyword linestart .Sx cyan/5",
-" keyword linestart .Sy cyan/5",
-" keyword linestart .TE cyan/5",
-" keyword linestart .TH cyan/5",
-" keyword linestart .TP cyan/5",
-" keyword linestart .TQ cyan/5",
-" keyword linestart .TS cyan/5",
-" keyword linestart .Tn cyan/5",
-" keyword linestart .Tp cyan/5",
-" keyword linestart .UC cyan/5",
-" keyword linestart .Uh cyan/5",
-" keyword linestart .Ux cyan/5",
-" keyword linestart .VE cyan/5",
-" keyword linestart .VS cyan/5",
-" keyword linestart .Va cyan/5",
-" keyword linestart .Vb cyan/5",
-" keyword linestart .Ve cyan/5",
-" keyword linestart .Xc cyan/5",
-" keyword linestart .Xe cyan/5",
-" keyword linestart .Xr cyan/5",
-" keyword linestart .YN cyan/5",
-" keyword linestart .ad cyan/5",
-" keyword linestart .am cyan/5",
-" keyword linestart .bd cyan/5",
-" keyword linestart .bp cyan/5",
-" keyword linestart .br cyan/5",
-" keyword linestart .ce cyan/5",
-" keyword linestart .cs cyan/5",
-" keyword linestart .de cyan/5",
-" keyword linestart .ds cyan/5",
-" keyword linestart .ec cyan/5",
-" keyword linestart .eh cyan/5",
-" keyword linestart .el cyan/5",
-" keyword linestart .eo cyan/5",
-" keyword linestart .ev cyan/5",
-" keyword linestart .fc cyan/5",
-" keyword linestart .fi cyan/5",
-" keyword linestart .ft cyan/5",
-" keyword linestart .hy cyan/5",
-" keyword linestart .iX cyan/5",
-" keyword linestart .ie cyan/5",
-" keyword linestart .if cyan/5",
-" keyword linestart .ig cyan/5",
-" keyword linestart .in cyan/5",
-" keyword linestart .ll cyan/5",
-" keyword linestart .lp cyan/5",
-" keyword linestart .ls cyan/5",
-" keyword linestart .mk cyan/5",
-" keyword linestart .na cyan/5",
-" keyword linestart .ne cyan/5",
-" keyword linestart .nf cyan/5",
-" keyword linestart .nh cyan/5",
-" keyword linestart .nr cyan/5",
-" keyword linestart .ns cyan/5",
-" keyword linestart .oh cyan/5",
-" keyword linestart .ps cyan/5",
-" keyword linestart .re cyan/5",
-" keyword linestart .rm cyan/5",
-" keyword linestart .rn cyan/5",
-" keyword linestart .rr cyan/5",
-" keyword linestart .so cyan/5",
-" keyword linestart .sp cyan/5",
-" keyword linestart .ss cyan/5",
-" keyword linestart .ta cyan/5",
-" keyword linestart .ti cyan/5",
-" keyword linestart .tm cyan/5",
-" keyword linestart .tr cyan/5",
-" keyword linestart .ul cyan/5",
-" keyword linestart .vs cyan/5",
-" keyword linestart .zZ cyan/5",
-" keyword linestart .e cyan/5",
-" keyword linestart .d cyan/5",
-" keyword linestart .h cyan/5",
-" keyword linestart .B cyan/5",
-" keyword linestart .I cyan/5",
-" keyword linestart .R cyan/5",
-" keyword linestart .P cyan/5",
-" keyword linestart .L cyan/5",
-" keyword linestart .V cyan/5",
-" keyword linestart .F cyan/5",
-" keyword linestart .T cyan/5",
-" keyword linestart .X cyan/5",
-" keyword linestart .Y cyan/5",
-" keyword linestart .b cyan/5",
-" keyword linestart .l cyan/5",
-" keyword linestart .i cyan/5",
-"",
-"context exclusive linestart .SH \\n brightred/18",
-"context exclusive linestart .TH \\n brightred/18",
-"context exclusive linestart .B \\n magenta/23",
-"context exclusive linestart .I \\n yellow/24",
-"context exclusive linestart .nf linestart .fi green/15",
-"",
-"# font changes should end in a \\fP",
-"context exclusive \\\\fB \\\\fP magenta/23",
-"context exclusive \\\\fI \\\\fP yellow/24",
-"context linestart .\\\\\" \\n brown/22",
-"",
-"###############################################################################",
-"# Assumes you've set a dark background, e.g. navy blue.",
"file ..\\*\\\\.(htm|html|HTM|HTML)$ HTML\\sFile",
+"include html.syntax",
"",
-"context default white/25",
-" keyword whole &*; brightgreen/16",
-"context <!-- --> white/26",
-"context < > brightcyan/17",
-" keyword \"http:*\" magenta/22",
-" keyword \"ftp:*\" magenta/22",
-" keyword \"mailto:*\" magenta/22",
-" keyword \"gopher:*\" magenta/22",
-" keyword \"telnet:*\" magenta/22",
-" keyword \"file:*\" magenta/22",
-" keyword \"*.gif\" brightred/19",
-" keyword \"*.jpg\" brightred/19",
-" keyword \"*.png\" brightred/19",
-" keyword \"*\" cyan/5",
-"",
-"###############################################################################",
-"# Pascal (BP7 IDE alike)",
"file ..\\*\\\\.(pp|PP|pas|PAS)$ Pascal Program",
-"context default yellow/24",
-" keyword whole absolute white/25",
-" keyword whole and white/25",
-" keyword whole array white/25",
-" keyword whole as white/25",
-" keyword whole asm white/25",
-" keyword whole assembler white/25",
-" keyword whole begin white/25",
-" keyword whole break white/25",
-" keyword whole case white/25",
-" keyword whole class white/25",
-" keyword whole const white/25",
-" keyword whole continue white/25",
-" keyword whole constructor white/25",
-" keyword whole destructor white/25",
-" keyword whole dispose white/25",
-" keyword whole div white/25",
-" keyword whole do white/25",
-" keyword whole downto white/25",
-" keyword whole else white/25",
-" keyword whole end white/25",
-" keyword whole except white/25",
-" keyword whole exit white/25",
-" keyword whole export white/25",
-" keyword whole exports white/25",
-" keyword whole external white/25",
-" keyword whole fail white/25",
-" keyword whole far white/25",
-" keyword whole false white/25",
-" keyword whole file white/25",
-" keyword whole finally white/25",
-" keyword whole for white/25",
-" keyword whole forward white/25",
-" keyword whole function white/25",
-" keyword whole goto white/25",
-" keyword whole if white/25",
-" keyword whole implementation white/25",
-" keyword whole in white/25",
-" keyword whole inherited white/25",
-" keyword whole initialization white/25",
-" keyword whole inline white/25",
-" keyword whole interface white/25",
-" keyword whole interrupt white/25",
-" keyword whole is white/25",
-" keyword whole label white/25",
-" keyword whole library white/25",
-" keyword whole mod white/25",
-" keyword whole near white/25",
-" keyword whole new white/25",
-" keyword whole nil white/25",
-" keyword whole not white/25",
-" keyword whole object white/25",
-" keyword whole of white/25",
-" keyword whole on white/25",
-" keyword whole operator white/25",
-" keyword whole or white/25",
-" keyword whole otherwise white/25",
-" keyword whole packed white/25",
-" keyword whole procedure white/25",
-" keyword whole program white/25",
-" keyword whole property white/25",
-" keyword whole raise white/25",
-" keyword whole record white/25",
-" keyword whole repeat white/25",
-" keyword whole self white/25",
-" keyword whole set white/25",
-" keyword whole shl white/25",
-" keyword whole shr white/25",
-" keyword whole string white/25",
-" keyword whole then white/25",
-" keyword whole to white/25",
-" keyword whole true white/25",
-" keyword whole try white/25",
-" keyword whole type white/25",
-" keyword whole unit white/25",
-" keyword whole until white/25",
-" keyword whole uses white/25",
-" keyword whole var white/25",
-" keyword whole virtual white/25",
-" keyword whole while white/25",
-" keyword whole with white/25",
-" keyword whole xor white/25",
-" keyword whole .. white/25",
-" ",
-" keyword > cyan/5",
-" keyword < cyan/5",
-" keyword \\+ cyan/5",
-" keyword - cyan/5",
-" keyword / cyan/5",
-" keyword % cyan/5",
-" keyword = cyan/5",
-" keyword [ cyan/5",
-" keyword ] cyan/5",
-" keyword ( cyan/5",
-" keyword ) cyan/5",
-" keyword , cyan/5",
-" keyword . cyan/5",
-" keyword : cyan/5",
-" keyword ; cyan/5",
-" keyword {$*} brightred/19",
-"",
-"context ' ' brightcyan/22",
-"context // \\n brown/22",
-"context (\\* \\*) brown/22",
-"# context {$ } brightred/19",
-"# keyword \\[ABCDEFGHIJKLMNOPQRSTUVWXYZ\\]\\[-\\+\\] brightgreen/16",
-"# keyword $* brightgreen/16",
-"context { } lightgray/22",
+"include pascal.syntax",
"",
-"",
-"###############################################################################",
"file ..\\*\\\\.tex$ LaTeX\\s2.09\\sDocument",
-"context default",
-"wholechars left \\\\ ",
-"wholechars right abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
+"include latex.syntax",
"",
-"# type style",
-" keyword whole \\\\tiny yellow/24",
-" keyword whole \\\\scriptsize yellow/24",
-" keyword whole \\\\footnotesize yellow/24",
-" keyword whole \\\\small yellow/24",
-" keyword whole \\\\normalsize yellow/24",
-" keyword whole \\\\large yellow/24",
-" keyword whole \\\\Large yellow/24",
-" keyword whole \\\\LARGE yellow/24",
-" keyword whole \\\\huge yellow/24",
-" keyword whole \\\\Huge yellow/24",
-"",
-"# accents and symbols",
-" keyword whole \\\\`{\\[aeiouAEIOU\\]} yellow/24",
-" keyword whole \\\\'{\\[aeiouAEIOU\\]} yellow/24",
-" keyword whole \\\\^{\\[aeiouAEIOU\\]} yellow/24",
-" keyword whole \\\\\"{\\[aeiouAEIOU\\]} yellow/24",
-" keyword whole \\\\~{\\[aeiouAEIOU\\]} yellow/24",
-" keyword whole \\\\={\\[aeiouAEIOU\\]} yellow/24",
-" keyword whole \\\\.{\\[aeiouAEIOU\\]} yellow/24",
-" keyword whole \\\\u{\\[aeiouAEIOU\\]} yellow/24",
-" keyword whole \\\\v{\\[aeiouAEIOU\\]} yellow/24",
-" keyword whole \\\\H{\\[aeiouAEIOU\\]} yellow/24",
-" keyword whole \\\\t{\\[aeiouAEIOU\\]} yellow/24",
-" keyword whole \\\\c{\\[aeiouAEIOU\\]} yellow/24",
-" keyword whole \\\\d{\\[aeiouAEIOU\\]} yellow/24",
-" keyword whole \\\\b{\\[aeiouAEIOU\\]} yellow/24",
-"",
-" keyword whole \\\\dag yellow/24",
-" keyword whole \\\\ddag yellow/24",
-" keyword whole \\\\S yellow/24",
-" keyword whole \\\\P yellow/24",
-" keyword whole \\\\copyright yellow/24",
-" keyword whole \\\\pounds yellow/24",
-"",
-"# sectioning and table of contents",
-" keyword whole \\\\part[*]{*} brightred/19",
-" keyword whole \\\\part{*} brightred/19",
-" keyword whole \\\\part\\*{*} brightred/19",
-" keyword whole \\\\chapter[*]{*} brightred/19",
-" keyword whole \\\\chapter{*} brightred/19",
-" keyword whole \\\\chapter\\*{*} brightred/19",
-" keyword whole \\\\section[*]{*} brightred/19",
-" keyword whole \\\\section{*} brightred/19",
-" keyword whole \\\\section\\*{*} brightred/19",
-" keyword whole \\\\subsection[*]{*} brightred/19",
-" keyword whole \\\\subsection{*} brightred/19",
-" keyword whole \\\\subsection\\*{*} brightred/19",
-" keyword whole \\\\subsubsection[*]{*} brightred/19",
-" keyword whole \\\\subsubsection{*} brightred/19",
-" keyword whole \\\\subsubsection\\*{*} brightred/19",
-" keyword whole \\\\paragraph[*]{*} brightred/19",
-" keyword whole \\\\paragraph{*} brightred/19",
-" keyword whole \\\\paragraph\\*{*} brightred/19",
-" keyword whole \\\\subparagraph[*]{*} brightred/19",
-" keyword whole \\\\subparagraph{*} brightred/19",
-" keyword whole \\\\subparagraph\\*{*} brightred/19",
-"",
-" keyword whole \\\\appendix brightred/19",
-" keyword whole \\\\tableofcontents brightred/19",
-"",
-"# misc",
-" keyword whole \\\\item[*] yellow/24",
-" keyword whole \\\\item yellow/24",
-" keyword whole \\\\\\\\ yellow/24",
-" keyword \\\\\\s yellow/24 black/0",
-" keyword %% yellow/24",
-"",
-"# docuement and page styles ",
-" keyword whole \\\\documentstyle[*]{*} yellow/20",
-" keyword whole \\\\documentstyle{*} yellow/20",
-" keyword whole \\\\pagestyle{*} yellow/20",
-"",
-"# cross references",
-" keyword whole \\\\label{*} yellow/24",
-" keyword whole \\\\ref{*} yellow/24",
-"",
-"# bibliography and citations",
-" keyword whole \\\\bibliography{*} yellow/24",
-" keyword whole \\\\bibitem[*]{*} yellow/24",
-" keyword whole \\\\bibitem{*} yellow/24",
-" keyword whole \\\\cite[*]{*} yellow/24",
-" keyword whole \\\\cite{*} yellow/24",
-"",
-"# splitting the input",
-" keyword whole \\\\input{*} yellow/20",
-" keyword whole \\\\include{*} yellow/20",
-" keyword whole \\\\includeonly{*} yellow/20",
-"",
-"# line breaking",
-" keyword whole \\\\linebreak[\\[01234\\]] yellow/24",
-" keyword whole \\\\nolinebreak[\\[01234\\]] yellow/24",
-" keyword whole \\\\linebreak yellow/24",
-" keyword whole \\\\nolinebreak yellow/24",
-" keyword whole \\\\[+] yellow/24",
-" keyword whole \\\\- yellow/24",
-" keyword whole \\\\sloppy yellow/24",
-"",
-"# page breaking",
-" keyword whole \\\\pagebreak[\\[01234\\]] yellow/24",
-" keyword whole \\\\nopagebreak[\\[01234\\]] yellow/24",
-" keyword whole \\\\pagebreak yellow/24",
-" keyword whole \\\\nopagebreak yellow/24",
-" keyword whole \\\\samepage yellow/24",
-" keyword whole \\\\newpage yellow/24",
-" keyword whole \\\\clearpage yellow/24",
-"",
-"# defintiions",
-" keyword \\\\newcommand{*}[*] cyan/5",
-" keyword \\\\newcommand{*} cyan/5",
-" keyword \\\\newenvironment{*}[*]{*} cyan/5",
-" keyword \\\\newenvironment{*}{*} cyan/5",
-"",
-"# boxes",
-"",
-"# begins and ends",
-" keyword \\\\begin{document} brightred/14",
-" keyword \\\\begin{equation} brightred/14",
-" keyword \\\\begin{eqnarray} brightred/14",
-" keyword \\\\begin{quote} brightred/14",
-" keyword \\\\begin{quotation} brightred/14",
-" keyword \\\\begin{center} brightred/14",
-" keyword \\\\begin{verse} brightred/14",
-" keyword \\\\begin{verbatim} brightred/14",
-" keyword \\\\begin{itemize} brightred/14",
-" keyword \\\\begin{enumerate} brightred/14",
-" keyword \\\\begin{description} brightred/14",
-" keyword \\\\begin{list} brightred/14",
-" keyword \\\\begin{array} brightred/14",
-" keyword \\\\begin{tabular} brightred/14",
-" keyword \\\\begin{thebibliography}{*} brightred/14",
-" keyword \\\\begin{sloppypar} brightred/14",
-"",
-" keyword \\\\end{document} brightred/14",
-" keyword \\\\end{equation} brightred/14",
-" keyword \\\\end{eqnarray} brightred/14",
-" keyword \\\\end{quote} brightred/14",
-" keyword \\\\end{quotation} brightred/14",
-" keyword \\\\end{center} brightred/14",
-" keyword \\\\end{verse} brightred/14",
-" keyword \\\\end{verbatim} brightred/14",
-" keyword \\\\end{itemize} brightred/14",
-" keyword \\\\end{enumerate} brightred/14",
-" keyword \\\\end{description} brightred/14",
-" keyword \\\\end{list} brightred/14",
-" keyword \\\\end{array} brightred/14",
-" keyword \\\\end{tabular} brightred/14",
-" keyword \\\\end{thebibliography}{*} brightred/14",
-" keyword \\\\end{sloppypar} brightred/14",
-"",
-" keyword \\\\begin{*} brightcyan/16",
-" keyword \\\\end{*} brightcyan/16",
-"",
-" keyword \\\\theorem{*}{*} yellow/24",
-"",
-"# if all else fails",
-" keyword whole \\\\+[*]{*}{*}{*} brightcyan/17",
-" keyword whole \\\\+[*]{*}{*} brightcyan/17",
-" keyword whole \\\\+{*}{*}{*}{*} brightcyan/17",
-" keyword whole \\\\+{*}{*}{*} brightcyan/17",
-" keyword whole \\\\+{*}{*} brightcyan/17",
-" keyword whole \\\\+{*} brightcyan/17",
-" keyword \\\\\\[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\\]\\n brightcyan/17",
-" keyword \\\\\\[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\\]\\s brightcyan/17",
-" keyword \\\\\\[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\\]\\t brightcyan/17",
-"",
-"context \\\\pagenumbering{ } yellow/20",
-" keyword arabic brightcyan/17",
-" keyword roman brightcyan/17",
-" keyword alph brightcyan/17",
-" keyword Roman brightcyan/17",
-" keyword Alph brightcyan/17",
-"",
-"context % \\n brown/22",
-"",
-"# mathematical formulas",
-"context $ $ brightgreen/6",
-"context exclusive \\\\begin{equation} \\\\end{equation} brightgreen/6",
-"context exclusive \\\\begin{eqnarray} \\\\end{eqnarray} brightgreen/6",
-"",
-"",
-"###############################################################################",
"file ..\\*\\\\.([chC]|CC|cxx|cc|cpp|CPP|CXX)$ C/C\\+\\+\\sProgram",
-"context default",
-" keyword whole auto yellow/24",
-" keyword whole break yellow/24",
-" keyword whole case yellow/24",
-" keyword whole char yellow/24",
-" keyword whole const yellow/24",
-" keyword whole continue yellow/24",
-" keyword whole default yellow/24",
-" keyword whole do yellow/24",
-" keyword whole double yellow/24",
-" keyword whole else yellow/24",
-" keyword whole enum yellow/24",
-" keyword whole extern yellow/24",
-" keyword whole float yellow/24",
-" keyword whole for yellow/24",
-" keyword whole goto yellow/24",
-" keyword whole if yellow/24",
-" keyword whole int yellow/24",
-" keyword whole long yellow/24",
-" keyword whole register yellow/24",
-" keyword whole return yellow/24",
-" keyword whole short yellow/24",
-" keyword whole signed yellow/24",
-" keyword whole sizeof yellow/24",
-" keyword whole static yellow/24",
-" keyword whole struct yellow/24",
-" keyword whole switch yellow/24",
-" keyword whole typedef yellow/24",
-" keyword whole union yellow/24",
-" keyword whole unsigned yellow/24",
-" keyword whole void yellow/24",
-" keyword whole volatile yellow/24",
-" keyword whole while yellow/24",
-" keyword whole asm yellow/24",
-" keyword whole catch yellow/24",
-" keyword whole class yellow/24",
-" keyword whole friend yellow/24",
-" keyword whole delete yellow/24",
-" keyword whole inline yellow/24",
-" keyword whole new yellow/24",
-" keyword whole operator yellow/24",
-" keyword whole private yellow/24",
-" keyword whole protected yellow/24",
-" keyword whole public yellow/24",
-" keyword whole this yellow/24",
-" keyword whole throw yellow/24",
-" keyword whole template yellow/24",
-" keyword whole try yellow/24",
-" keyword whole virtual yellow/24",
-" keyword whole bool yellow/24",
-" keyword whole const_cast yellow/24",
-" keyword whole dynamic_cast yellow/24",
-" keyword whole explicit yellow/24",
-" keyword whole false yellow/24",
-" keyword whole mutable yellow/24",
-" keyword whole namespace yellow/24",
-" keyword whole reinterpret_cast yellow/24",
-" keyword whole static_cast yellow/24",
-" keyword whole true yellow/24",
-" keyword whole typeid yellow/24",
-" keyword whole typename yellow/24",
-" keyword whole using yellow/24",
-" keyword whole wchar_t yellow/24",
-" keyword whole ... yellow/24",
-"",
-" keyword /\\* brown/22",
-" keyword \\*/ brown/22",
-"",
-" keyword '\\s' brightgreen/16",
-" keyword '+' brightgreen/16",
-" keyword > yellow/24",
-" keyword < yellow/24",
-" keyword \\+ yellow/24",
-" keyword - yellow/24",
-" keyword \\* yellow/24",
-"# keyword / yellow/24",
-" keyword % yellow/24",
-" keyword = yellow/24",
-" keyword != yellow/24",
-" keyword == yellow/24",
-" keyword { brightcyan/14",
-" keyword } brightcyan/14",
-" keyword ( brightcyan/15",
-" keyword ) brightcyan/15",
-" keyword [ brightcyan/14",
-" keyword ] brightcyan/14",
-" keyword , brightcyan/14",
-" keyword : brightcyan/14",
-" keyword ; brightmagenta/19",
-"context exclusive /\\* \\*/ brown/22",
-"context // \\n brown/22",
-"context linestart # \\n brightred/18",
-" keyword \\\\\\n yellow/24",
-" keyword /\\**\\*/ brown/22",
-" keyword \"+\" red/19",
-" keyword <+> red/19",
-"context \" \" green/6",
-" keyword \\\\\" brightgreen/16",
-" keyword %% brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[L\\]e brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[L\\]E brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[L\\]f brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[L\\]g brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[L\\]G brightgreen/16",
-" keyword %\\[0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[hl\\]d brightgreen/16",
-" keyword %\\[0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[hl\\]i brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[hl\\]o brightgreen/16",
-" keyword %\\[0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[hl\\]u brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[hl\\]x brightgreen/16",
-" keyword %\\[#0\\s-\\+,\\]\\[0123456789\\]\\[.\\]\\[0123456789\\]\\[hl\\]X brightgreen/16",
-" keyword %\\[hl\\]n brightgreen/16",
-" keyword %\\[.\\]\\[0123456789\\]s brightgreen/16",
-" keyword %[*] brightgreen/16",
-" keyword %c brightgreen/16",
-" keyword \\\\\\\\ brightgreen/16",
-" keyword \\\\' brightgreen/16",
-" keyword \\\\a brightgreen/16",
-" keyword \\\\b brightgreen/16",
-" keyword \\\\t brightgreen/16",
-" keyword \\\\n brightgreen/16",
-" keyword \\\\v brightgreen/16",
-" keyword \\\\f brightgreen/16",
-" keyword \\\\r brightgreen/16",
-" keyword \\\\0 brightgreen/16",
+"include c.syntax",
"",
-"###############################################################################",
-"file .\\*ChangeLog$ GNU\\sDistribution\\sChangeLog\\sFile",
+"file ..\\*\\\\.(java|JAVA|Java|jav)$ Java\\sProgram",
+"include java.syntax",
"",
-"context default",
-" keyword \\s+() brightmagenta/23",
-" keyword \\t+() brightmagenta/23",
-"",
-"context linestart \\t\\* : brightcyan/17",
-"context linestart \\s\\s\\s\\s\\s\\s\\s\\s\\* : brightcyan/17",
+"file ..\\*\\\\.(st)$ SmallTalk\\sProgram",
+"include smalltalk.syntax",
"",
-"context linestart 19+-+\\s \\n yellow/24",
-" keyword <+@+> brightred/19",
-"context linestart 20+-+\\s \\n yellow/24",
-" keyword <+@+> brightred/19",
-"context linestart Mon\\s+\\s+\\s+\\s \\n yellow/24",
-" keyword <+@+> brightred/19",
-"context linestart Tue\\s+\\s+\\s+\\s \\n yellow/24",
-" keyword <+@+> brightred/19",
-"context linestart Wed\\s+\\s+\\s+\\s \\n yellow/24",
-" keyword <+@+> brightred/19",
-"context linestart Thu\\s+\\s+\\s+\\s \\n yellow/24",
-" keyword <+@+> brightred/19",
-"context linestart Fri\\s+\\s+\\s+\\s \\n yellow/24",
-" keyword <+@+> brightred/19",
-"context linestart Sat\\s+\\s+\\s+\\s \\n yellow/24",
-" keyword <+@+> brightred/19",
-"context linestart Sun\\s+\\s+\\s+\\s \\n yellow/24",
-" keyword <+@+> brightred/19",
+"file ..\\*\\\\.(ml|mli|mly|mll|mlp)$ ML\\sProgram",
+"include ml.syntax",
"",
+"file .\\*ChangeLog$ GNU\\sDistribution\\sChangeLog\\sFile",
+"include changelog.syntax",
"",
-"###############################################################################",
"file .\\*Makefile[\\\\\\.a-z]\\*$ Makefile",
-"",
-"context default",
-" keyword $(*) yellow/24",
-" keyword ${*} brightgreen/16",
-" keyword whole linestart include magenta",
-" keyword whole linestart endif magenta",
-" keyword whole linestart ifeq magenta",
-" keyword whole linestart ifneq magenta",
-" keyword whole linestart else magenta",
-" keyword linestart \\t lightgray/13 red",
-" keyword whole .PHONY white/25",
-" keyword whole .NOEXPORT white/25",
-" keyword = white/25",
-" keyword : yellow/24",
-" keyword \\\\\\n yellow/24",
-"# this handles strange cases like @something@@somethingelse@ properly",
-" keyword whole @+@ brightmagenta/23 black/0",
-" keyword @+@ brightmagenta/23 black/0",
-"",
-"context linestart # \\n brown/22",
-" keyword whole @+@ brightmagenta/23 black/0",
-" keyword @+@ brightmagenta/23 black/0",
-"",
-"context exclusive = \\n brightcyan/17",
-" keyword \\\\\\n yellow/24",
-" keyword $(*) yellow/24",
-" keyword ${*} brightgreen/16",
-" keyword linestart \\t lightgray/13 red",
-" keyword whole @+@ brightmagenta/23 black/0",
-" keyword @+@ brightmagenta/23 black/0",
-"",
-"context exclusive linestart \\t \\n",
-" keyword \\\\\\n yellow/24",
-" keyword $(*) yellow/24",
-" keyword ${*} brightgreen/16",
-" keyword linestart \\t lightgray/13 red",
-" keyword whole @+@ brightmagenta/23 black/0",
-" keyword @+@ brightmagenta/23 black/0",
-"",
-"###############################################################################",
+"include makefile.syntax",
"",
"file .\\*syntax$ Syntax\\sHighlighting\\sdefinitions",
"",
@@ -2952,6 +1116,7 @@
" keyword whole wh\\olechars\\[\\t\\s\\]right brightcyan/17",
" keyword whole wh\\olechars brightcyan/17",
" keyword whole f\\ile brightgreen/6",
+" keyword whole in\\clude brightred/18",
"",
" keyword whole 0 lightgray/0 blue/26",
" keyword whole 1 lightgray/1 blue/26",
@@ -3000,15 +1165,6 @@
"",
"context linestart # \\n brown/22",
"",
-"file \\.\\* Help\\ssupport\\sother\\sfile\\stypes",
-"context default",
-"file \\.\\* by\\scoding\\srules\\sin\\s~/.cedit/syntax.",
-"context default",
-"file \\.\\* See\\sman/syntax\\sin\\sthe\\ssource\\sdistribution",
-"context default",
-"file \\.\\* and\\sconsult\\sthe\\sman\\spage.",
-"context default",
-"",
0};
@@ -3103,9 +1259,12 @@
int line_error;
found_type:
line_error = edit_read_syntax_rules (edit, f);
- if (line_error)
- result = line + line_error;
- else {
+ if (line_error) {
+ if (!error_file_name) /* an included file */
+ result = line + line_error;
+ else
+ result = line_error;
+ } else {
syntax_free (edit->syntax_type);
edit->syntax_type = strdup (args[2]);
if (syntax_change_callback)
@@ -3183,8 +1342,9 @@
if (r) {
char s[80];
edit_free_syntax_rules (edit);
- sprintf (s, _ (" Syntax error in file %s on line %d "), f, r);
+ sprintf (s, _ (" Error in file %s on line %d "), error_file_name ? error_file_name : f, r);
edit_error_dialog (_ (" Load syntax file "), s);
+ syntax_free (error_file_name);
return;
}
}
@@ -3209,4 +1369,6 @@
}
#endif /* !defined(MIDNIGHT) || defined(HAVE_SYNTAXH) */
+
+
diff -ruN old/mc-4.5.27/gtkedit/wordproc.c new/mc-4.5.28/gtkedit/wordproc.c
--- old/mc-4.5.27/gtkedit/wordproc.c Thu Mar 18 20:42:28 1999
+++ new/mc-4.5.28/gtkedit/wordproc.c Fri Mar 26 15:30:40 1999
@@ -14,7 +14,8 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307, USA.
*/
#include <config.h>
diff -ruN old/mc-4.5.27/lib/Makefile.in new/mc-4.5.28/lib/Makefile.in
--- old/mc-4.5.27/lib/Makefile.in Thu Mar 18 20:42:27 1999
+++ new/mc-4.5.28/lib/Makefile.in Fri Mar 26 15:30:39 1999
@@ -15,14 +15,26 @@
LIBFILES_IN = mc.ext.in mc-gnome.ext.in
LIBFILES_OUT = mc.ext mc-gnome.ext
LIBFILES_CONST = mc.hint mc.lib mc.menu
+DESKTOP_FILES = startup.links README.desktop
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 mc.global
+
+DISTLIB = \
+ $(LIBFILES_IN) \
+ $(LIBFILES_CONST) \
+ $(TIFILES) \
+ $(DESKTOP_FILES) \
+ Makefile.in tdiff \
+ xnc.hlp ncurses.h \
+ mc.sh mc.csh \
+ mcserv.init \
+ mcserv.pamd \
+ tkmc.wmconfig \
+ mc.ext.in.qnx.diff \
+ mc.global
all: Makefile
-Makefile.in: ../config.status
+Makefile: ../config.status Makefile.in
(cd ..; CONFIG_FILES=lib/Makefile CONFIG_HEADERS= ./config.status)
check:
@@ -42,21 +54,24 @@
install:
for I in $(LIBFILES_CONST); \
- do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(libdir)/$$I; done
+ do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(mclibdir)/$$I; done
for I in $(LIBFILES_OUT); \
- do $(INSTALL_DATA) $(builddir)/lib/$$I $(DESTDIR)$(libdir)/$$I; done
+ do $(INSTALL_DATA) $(builddir)/lib/$$I $(DESTDIR)$(mclibdir)/$$I; done
for I in $(TIFILES); \
do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(tidir)/$$I; done
$(MKINSTALLDIRS) $(DESTDIR)$(confdir)
$(INSTALL_DATA) $(srcdir)/mc.global $(DESTDIR)$(confdir)
+ $(MKINSTALLDIRS) $(DESTDIR)$(desktopdir)
+ for I in $(DESKTOP_FILES); \
+ do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(desktopdir)/$$I; done
uninstall:
for I in $(LIBFILES_OUT) $(LIBFILES_CONST); \
- do $(RMF) $(DESTDIR)$(libdir)/$$I; done
+ do $(RMF) $(DESTDIR)$(mclibdir)/$$I; done
for I in $(TIFILES); \
do $(RMF) $(DESTDIR)$(tidir)/$$I; done
-rmdir $(DESTDIR)$(tidir)
- -rmdir $(DESTDIR)$(libdir)
+ -rmdir $(DESTDIR)$(mclibdir)
distcopy:
$(CP) $(DISTLIB) ../../mc-$(VERSION)/lib
diff -ruN old/mc-4.5.27/lib/README.desktop new/mc-4.5.28/lib/README.desktop
--- old/mc-4.5.27/lib/README.desktop Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/lib/README.desktop Fri Mar 26 15:30:39 1999
@@ -0,0 +1,38 @@
+
+* The Desktop startup directory
+
+The directory $(libdir)/desktop-scripts is a place holder for
+information on how to configure the default's user desktop. There are
+a number of files that can be installed in this directory:
+
+ * Link definition files: These files are used to create
+ links to web and ftp sites on the user's desktop.
+
+ * Executables: Programs or links to programs that will be
+ executed when the user requests a directory rescan.
+
+* Link definition file format
+
+The file should contain an ini-like file whose contents are as follows:
+
+[linkname]
+title=Title in english
+title[NN]=Title in language NN
+type=url
+url=some-url
+
+The linkname is the name of the file that will be created in the
+user's desktop directory.
+
+title is the caption that will be used by this file. This can be
+localized by providing one or more title[NN] entries, where NN is
+the setting that would be set by the user for the NN locale.
+
+
+* Executables
+
+Executable programs will be executed like this:
+
+ program --desktop-dir DESKTOPDIR
+
+Where DESKTOPDIR is the user's desktop directory.
\ No newline at end of file
diff -ruN old/mc-4.5.27/lib/mc.ext.in new/mc-4.5.28/lib/mc.ext.in
--- old/mc-4.5.27/lib/mc.ext.in Thu Mar 18 20:42:27 1999
+++ new/mc-4.5.28/lib/mc.ext.in Fri Mar 26 15:30:39 1999
@@ -262,6 +262,14 @@
Extract=unarj x %f '*'
Extract (with flags)=I=%{Enter any Unarj flags:}; if test -n "$I"; then unarj x $I %f; fi
+# ha
+regex/\.(ha|HA|Ha)$
+ Open=%cd %p#uha
+ View=%view{ascii} ha lf %f
+ Icon=ha.xpm
+ Extract=ha xy %f '*'
+ Extract (with flags)=I=%{Enter any HA flags:}; if test -n "$I"; then ha xy $I %f; fi
+
# ar library
regex/\.s?a$
Open=%cd %p#uar
diff -ruN old/mc-4.5.27/lib/startup.links new/mc-4.5.28/lib/startup.links
--- old/mc-4.5.27/lib/startup.links Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/lib/startup.links Fri Mar 26 15:30:39 1999
@@ -0,0 +1,9 @@
+[gnews]
+title=GNOME News
+type=url
+url=http://www.gnome.org/news
+
+[slashdot]
+title=Slashdot
+type=url
+url=http://slashdot.org
\ No newline at end of file
diff -ruN old/mc-4.5.27/mc.spec new/mc-4.5.28/mc.spec
--- old/mc-4.5.27/mc.spec Thu Mar 18 20:42:26 1999
+++ new/mc-4.5.28/mc.spec Fri Mar 26 15:30:38 1999
@@ -1,5 +1,5 @@
# Note that this is NOT a relocatable package
-%define ver 4.5.27
+%define ver 4.5.28
%define rel 1
%define prefix /usr
diff -ruN old/mc-4.5.27/po/cat-id-tbl.c new/mc-4.5.28/po/cat-id-tbl.c
--- old/mc-4.5.27/po/cat-id-tbl.c Thu Mar 18 20:42:36 1999
+++ new/mc-4.5.28/po/cat-id-tbl.c Fri Mar 26 15:30:48 1999
@@ -50,401 +50,475 @@
{"Enter a Regular Expression to filter files in the panel view.", 37},
{" Open with...", 38},
{"Enter extra arguments:", 39},
- {"Warning", 40},
- {"Could not open %s; will not have desktop icons", 41},
- {"While running the mount/umount command", 42},
- {"While running the eject command", 43},
- {"Error", 44},
- {"Home directory", 45},
- {"Could not symlink %s to %s; will not have initial desktop icons.", 46},
- {"_Terminal", 47},
- {"Launch a new terminal in the current directory", 48},
- {"_Directory...", 49},
- {"Creates a new directory", 50},
- {"Arrange Icons", 51},
- {"Create New Window", 52},
- {"Rescan Mountable Devices", 53},
- {"Rescan Desktop", 54},
- {"To: ", 55},
- {"Copying from: ", 56},
- {"Deleting file: ", 57},
- {"Files Exist", 58},
+ {"Desktop entry properties", 40},
+ {"Access Time", 41},
+ {"Creation Time", 42},
+ {"Group", 43},
+ {"Group ID", 44},
+ {"Inode Number", 45},
+ {"Mode", 46},
+ {"Modification Time", 47},
+ {"Number of Hard Links", 48},
+ {"Owner", 49},
+ {"Permission", 50},
+ {"Size (short)", 51},
+ {"Type", 52},
+ {"User ID", 53},
+ {"Possible Columns", 54},
+ {"Displayed Columns", 55},
+ {"Custom View", 56},
+ {"Warning", 57},
+ {"Could not open %s; will not have desktop icons", 58},
+ {"While running the mount/umount command", 59},
+ {"While running the eject command", 60},
+ {"Error", 61},
+ {"Home directory", 62},
+ {"Could not symlink %s to %s; will not have initial desktop icons.", 63},
+ {"\
+Unable to locate the file:\n\
+background-properties-capplet\n\
+in your path.\n\
+\n\
+We are unable to set the background.", 64},
+ {"_Terminal", 65},
+ {"Launch a new terminal in the current directory", 66},
+ {"_Directory...", 67},
+ {"Creates a new directory", 68},
+ {"_Launcher...", 69},
+ {"Creates a new launcher", 70},
+ {"Arrange Icons", 71},
+ {"Create New Window", 72},
+ {"Recreate Desktop Shortcuts", 73},
+ {"Rescan Desktop", 74},
+ {"Configure Background Image", 75},
+ {"To: ", 76},
+ {"Copying from: ", 77},
+ {"Deleting file: ", 78},
+ {"Files Exist", 79},
{"\
Some of the files you are trying to copy already exist in the destination \
-folder. Please select the action to be performed.", 59},
- {"Prompt me before overwriting any file.", 60},
- {"Don't overwrite any files.", 61},
- {"Overwrite:", 62},
- {"Older files.", 63},
- {"Files only if size differs.", 64},
- {"All files.", 65},
- {"File Exists", 66},
- {"The target file already exists: %s", 67},
- {"Replace it?", 68},
- {"Copy", 69},
- {"Move", 70},
- {"Destination", 71},
- {"Find Destination Folder", 72},
- {"Copy as a background process", 73},
- {"Advanced Options", 74},
- {"Preserve symlinks", 75},
- {"Follow links.", 76},
+folder. Please select the action to be performed.", 80},
+ {"Prompt me before overwriting any file.", 81},
+ {"Don't overwrite any files.", 82},
+ {"Overwrite:", 83},
+ {"Older files.", 84},
+ {"Files only if size differs.", 85},
+ {"All files.", 86},
+ {"File Exists", 87},
+ {"The target file already exists: %s", 88},
+ {"Replace it?", 89},
+ {"Copy", 90},
+ {"Move", 91},
+ {"Destination", 92},
+ {"Find Destination Folder", 93},
+ {"Copy as a background process", 94},
+ {"Advanced Options", 95},
+ {"Preserve symlinks", 96},
+ {"Follow links.", 97},
{"\
Selecting this will copy the files that symlinks point to instead of just \
-copying the link.", 77},
- {"Preserve file attributes.", 78},
- {"Preserves the permissions and the UID/GID if possible", 79},
- {"Recursively copy subdirectories.", 80},
- {"If set, this will copy the directories recursively", 81},
+copying the link.", 98},
+ {"Preserve file attributes.", 99},
+ {"Preserves the permissions and the UID/GID if possible", 100},
+ {"Recursively copy subdirectories.", 101},
+ {"If set, this will copy the directories recursively", 102},
{"\
%s\n\
\n\
-Directory not empty. Delete it recursively?", 82},
- {" Delete: ", 83},
- {"Do the same for the rest", 84},
- {"Move Progress", 85},
- {"Copy Progress", 86},
- {"Delete Progress", 87},
- {"File ", 88},
- {" is ", 89},
- {" Done.", 90},
- {"Password:", 91},
- {"Password", 92},
- {"Symbolic Link", 93},
- {"Existing filename (filename symlink will point to):", 94},
- {"Symbolic link filename:", 95},
- {"_Move here", 96},
- {"_Copy here", 97},
- {"_Link here", 98},
- {"Cancel drag", 99},
+Directory not empty. Delete it recursively?", 103},
+ {" Delete: ", 104},
+ {"Do the same for the rest", 105},
+ {"Move Progress", 106},
+ {"Copy Progress", 107},
+ {"Delete Progress", 108},
+ {"File ", 109},
+ {"is ", 110},
+ {"done.", 111},
+ {"Password:", 112},
+ {"Password", 113},
+ {"Symbolic Link", 114},
+ {"Existing filename (filename symlink will point to):", 115},
+ {"Symbolic link filename:", 116},
+ {"_Move here", 117},
+ {"_Copy here", 118},
+ {"_Link here", 119},
+ {"Cancel drag", 120},
{"\
Could not stat %s\n\
-%s", 100},
- {"Default set of icons not found, please check your installation", 101},
- {"_Icon View", 102},
- {"Switch view to an icon display", 103},
- {"_Brief View", 104},
- {"Switch view to show just file name and type", 105},
- {"_Detailed View", 106},
- {"Switch view to show detailed file statistics", 107},
- {"_Custom View", 108},
- {"Switch view to show user-defined statistics", 109},
- {"Icons", 110},
- {"Brief", 111},
- {"Detailed", 112},
- {"Custom", 113},
- {"Enter command to run", 114},
+%s", 121},
+ {"Default set of icons not found, please check your installation", 122},
+ {"_Icon View", 123},
+ {"Switch view to an icon display", 124},
+ {"_Brief View", 125},
+ {"Switch view to show just file name and type", 126},
+ {"_Detailed View", 127},
+ {"Switch view to show detailed file statistics", 128},
+ {"_Custom View", 129},
+ {"Switch view to show user-defined statistics", 130},
+ {"Icons", 131},
+ {"Brief", 132},
+ {"Detailed", 133},
+ {"Custom", 134},
+ {"Enter command to run", 135},
{"\
Notice that if you choose to terminate the file manager, you will\n\
also terminate the GNOME desktop handler.\n\
\n\
-Are you sure you want to exit?", 115},
+Are you sure you want to exit?", 136},
{"\
The file manager and the desktop handler are now terminating\n\
\n\
If you want to start up again the desktop handler or the file manager\n\
you can launch it from the Panel, or you can run the UNIX command `gmc'\n\
\n\
-Press OK to terminate the application, or cancel to continue using it.", 116},
- {"_Copy...", 117},
- {"Copy files", 118},
- {"_Delete...", 119},
- {"Delete files", 120},
- {"_Move...", 121},
- {"Rename or move files", 122},
- {"Show directory sizes", 123},
- {"Shows the disk space used by each directory", 124},
- {"Select _All", 125},
- {"Select all files in the current Panel", 126},
- {"_Select Files...", 127},
- {"Select a group of files", 128},
- {"_Invert Selection", 129},
- {"Reverses the list of tagged files", 130},
- {"_Rescan Directory", 131},
- {"Rescan the directory contents", 132},
- {"_Sort By...", 133},
- {"Confirmation settings", 134},
- {"_Filter View...", 135},
- {"Global option settings", 136},
- {"_Find File...", 137},
- {"Locate files on disk", 138},
- {"_Run Command...", 139},
- {"Runs a command", 140},
- {"_Run Command in panel...", 141},
- {"Run a command and put the results in a panel", 142},
- {"_Background jobs...", 143},
- {"List of background operations", 144},
- {"Exit", 145},
- {"Terminates the file manager and the desktop", 146},
- {"Rescan System Devices", 147},
- {"_Layout", 148},
- {"_Commands", 149},
- {"_Desktop", 150},
- {"_Help", 151},
- {"File/New/Directory...", 152},
- {"Properties", 153},
- {"Delete", 154},
- {"Mount device", 155},
- {"Unmount device", 156},
- {"Eject device", 157},
- {"Open", 158},
- {"Open with", 159},
- {"View", 160},
- {"View unfiltered", 161},
- {"Edit", 162},
- {"Move/rename...", 163},
- {"Copy...", 164},
- {"Link...", 165},
- {"Symlink...", 166},
- {"Edit symlink...", 167},
- {"Show backup files", 168},
- {"Show hidden files", 169},
- {"Mix files and directories", 170},
- {"Use shell patterns instead of regular expressions", 171},
- {"Confirm when deleting file", 172},
- {"Confirm when overwriting files", 173},
- {"Confirm when executing files", 174},
- {"Show progress while operations are being performed", 175},
- {"VFS Timeout:", 176},
- {"Seconds", 177},
- {"Anonymous FTP password:", 178},
- {"Always use FTP proxy", 179},
- {"Fast directory reload", 180},
- {"Compute totals before copying files", 181},
- {"FTP directory cache timeout :", 182},
- {"Allow customization of icons in icon view", 183},
- {"File display", 184},
- {"Confirmation", 185},
- {"VFS", 186},
- {"Caching", 187},
- {"Preferences", 188},
- {"Filename", 189},
- {"Full name: ", 190},
- {"Command", 191},
- {"Command:", 192},
- {"Use terminal", 193},
- {"File mode (permissions)", 194},
- {"Current mode: ", 195},
- {"Read", 196},
- {"Write", 197},
- {"Exec", 198},
- {"Special", 199},
- {"User", 200},
- {"Group", 201},
- {"Other", 202},
- {"Set UID", 203},
- {"Set GID", 204},
- {"Sticky", 205},
- {"<Unknown>", 206},
- {"Owner", 207},
- {"General", 208},
- {"Title", 209},
- {"Icon", 210},
- {"Select icon", 211},
- {"Rescan Directory", 212},
- {"Reloads the current directory", 213},
- {"New folder", 214},
- {"Creates a new folder here", 215},
- {"All files", 216},
- {"Archives and compressed files", 217},
- {"RPM/DEB files", 218},
- {"Text/Document files", 219},
- {"HTML and SGML files", 220},
- {"Postscript and PDF files", 221},
- {"Spreadsheet files", 222},
- {"Image files", 223},
- {"Video/animation files", 224},
- {"Audio files", 225},
- {"C program files", 226},
- {"C++ program files", 227},
- {"Objective-C program files", 228},
- {"Scheme program files", 229},
- {"Assembler program files", 230},
- {"Misc. program files", 231},
- {"Font files", 232},
- {"Search: %s", 233},
- {"%s bytes in %d file", 234},
- {"%s bytes in %d files", 235},
- {"<readlink failed>", 236},
- {"Filter", 237},
- {"Back", 238},
- {"Go to the previously visited directory", 239},
- {"Up", 240},
- {"Go up a level in the directory heirarchy", 241},
- {"Forward", 242},
- {"Go to the next directory", 243},
- {"Rescan", 244},
- {"Rescan the current directory", 245},
- {"Home", 246},
- {"Go to your home directory", 247},
- {"Location:", 248},
- {"&Ok", 249},
- {"Offset 0x%08x", 250},
- {"Col %d", 251},
- {"%s bytes", 252},
- {"_Goto line", 253},
- {"Jump to a specified line number", 254},
- {"_Monitor file", 255},
- {"Monitor file growing", 256},
- {"Regexp search", 257},
- {"Regular expression search", 258},
- {"_Wrap", 259},
- {"Wrap the text", 260},
- {"_Parsed view", 261},
- {"_Formatted", 262},
- {"_Hex", 263},
- {"_Search", 264},
- {"ok", 265},
- {"cancel", 266},
- {"help", 267},
- {"yes", 268},
- {"no", 269},
- {"exit", 270},
- {"abort", 271},
- {" Error ", 272},
- {" Failed trying to open file for reading: ", 273},
- {" Cannot get size/permissions info on file: ", 274},
- {" Not an ordinary file: ", 275},
- {" File is too large: ", 276},
+Press OK to terminate the application, or cancel to continue using it.", 137},
+ {"_Copy...", 138},
+ {"Copy files", 139},
+ {"_Delete...", 140},
+ {"Delete files", 141},
+ {"_Move...", 142},
+ {"Rename or move files", 143},
+ {"Show directory sizes", 144},
+ {"Shows the disk space used by each directory", 145},
+ {"Select _All", 146},
+ {"Select all files in the current Panel", 147},
+ {"_Select Files...", 148},
+ {"Select a group of files", 149},
+ {"_Invert Selection", 150},
+ {"Reverses the list of tagged files", 151},
+ {"_Rescan Directory", 152},
+ {"Rescan the directory contents", 153},
+ {"_Sort By...", 154},
+ {"Confirmation settings", 155},
+ {"_Filter View...", 156},
+ {"Global option settings", 157},
+ {"_Find File...", 158},
+ {"Locate files on disk", 159},
+ {"_Edit mime types...", 160},
+ {"Edits the MIME type bindings", 161},
+ {"_Run Command...", 162},
+ {"Runs a command", 163},
+ {"_Run Command in panel...", 164},
+ {"Run a command and put the results in a panel", 165},
+ {"_Background jobs...", 166},
+ {"List of background operations", 167},
+ {"Exit", 168},
+ {"Terminates the file manager and the desktop", 169},
+ {"Rescan System Devices", 170},
+ {"_Layout", 171},
+ {"_Commands", 172},
+ {"_Desktop", 173},
+ {"_Help", 174},
+ {"File/New/Directory...", 175},
+ {"Full Name: ", 176},
+ {"File Name", 177},
+ {"File Type: ", 178},
+ {"File Type: Symbolic Link", 179},
+ {"Target Name: INVALID LINK", 180},
+ {"Target Name: ", 181},
+ {"File Type: Directory", 182},
+ {"File Type: Character Device", 183},
+ {"File Type: Block Device", 184},
+ {"File Type: Socket", 185},
+ {"File Type: FIFO", 186},
+ {"File Size: ", 187},
+ {" bytes", 188},
+ {" KBytes (", 189},
+ {" bytes)", 190},
+ {" MBytes (", 191},
+ {"File Size: N/A", 192},
+ {"File Created on: ", 193},
+ {"Last Modified on: ", 194},
+ {"Last Accessed on: ", 195},
+ {"URL:", 196},
+ {"Caption:", 197},
+ {"Open", 198},
+ {"Use default Open action", 199},
+ {"Drop Action", 200},
+ {"View", 201},
+ {"Use default Drop action", 202},
+ {"Use default View action", 203},
+ {"Edit", 204},
+ {"Use default Edit action", 205},
+ {"Icon", 206},
+ {"File Actions", 207},
+ {"Open action", 208},
+ {"Needs terminal to run", 209},
+ {"File Permissions", 210},
+ {"Current mode: ", 211},
+ {"Read", 212},
+ {"Write", 213},
+ {"Exec", 214},
+ {"Special", 215},
+ {"User", 216},
+ {"Other", 217},
+ {"Set UID", 218},
+ {"Set GID", 219},
+ {"Sticky", 220},
+ {"URL", 221},
+ {"Statistics", 222},
+ {"Options", 223},
+ {"Permissions", 224},
+ {" Properties", 225},
+ {"You entered an invalid username", 226},
+ {"You must rename your file to something", 227},
+ {"You cannot rename a file to something containing a '/' character", 228},
+ {"Select an application to open \"", 229},
+ {"Select a file to run with", 230},
+ {"Applications", 231},
+ {"Program to run", 232},
+ {"Mount device", 233},
+ {"Unmount device", 234},
+ {"Eject device", 235},
+ {"Open with...", 236},
+ {"View Unfiltered", 237},
+ {"Copy...", 238},
+ {"Delete", 239},
+ {"Move...", 240},
+ {"Hard Link...", 241},
+ {"Symlink...", 242},
+ {"Edit Symlink...", 243},
+ {"Properties...", 244},
+ {"Show backup files", 245},
+ {"Show hidden files", 246},
+ {"Mix files and directories", 247},
+ {"Use shell patterns instead of regular expressions", 248},
+ {"Confirm when deleting file", 249},
+ {"Confirm when overwriting files", 250},
+ {"Confirm when executing files", 251},
+ {"Show progress while operations are being performed", 252},
+ {"VFS Timeout:", 253},
+ {"Seconds", 254},
+ {"Anonymous FTP password:", 255},
+ {"Always use FTP proxy", 256},
+ {"Fast directory reload", 257},
+ {"Compute totals before copying files", 258},
+ {"FTP directory cache timeout :", 259},
+ {"Allow customization of icons in icon view", 260},
+ {"File display", 261},
+ {"Confirmation", 262},
+ {"VFS", 263},
+ {"Caching", 264},
+ {"Preferences", 265},
+ {"Filename", 266},
+ {"Full name: ", 267},
+ {"Command", 268},
+ {"Command:", 269},
+ {"Use terminal", 270},
+ {"File mode (permissions)", 271},
+ {"<Unknown>", 272},
+ {"General", 273},
+ {"Title", 274},
+ {"Select icon", 275},
+ {"Rescan Directory", 276},
+ {"Reloads the current directory", 277},
+ {"New folder", 278},
+ {"Creates a new folder here", 279},
+ {"All files", 280},
+ {"Archives and compressed files", 281},
+ {"RPM/DEB files", 282},
+ {"Text/Document files", 283},
+ {"HTML and SGML files", 284},
+ {"Postscript and PDF files", 285},
+ {"Spreadsheet files", 286},
+ {"Image files", 287},
+ {"Video/animation files", 288},
+ {"Audio files", 289},
+ {"C program files", 290},
+ {"C++ program files", 291},
+ {"Objective-C program files", 292},
+ {"Scheme program files", 293},
+ {"Assembler program files", 294},
+ {"Misc. program files", 295},
+ {"Font files", 296},
+ {"Search: %s", 297},
+ {"%s bytes in %d file", 298},
+ {"%s bytes in %d files", 299},
+ {"<readlink failed>", 300},
+ {"Filter", 301},
+ {"Back", 302},
+ {"Go to the previously visited directory", 303},
+ {"Up", 304},
+ {"Go up a level in the directory heirarchy", 305},
+ {"Forward", 306},
+ {"Go to the next directory", 307},
+ {"Rescan", 308},
+ {"Rescan the current directory", 309},
+ {"Home", 310},
+ {"Go to your home directory", 311},
+ {"Location:", 312},
+ {"&Ok", 313},
+ {"Offset 0x%08x", 314},
+ {"Col %d", 315},
+ {"%s bytes", 316},
+ {"_Goto line", 317},
+ {"Jump to a specified line number", 318},
+ {"_Monitor file", 319},
+ {"Monitor file growing", 320},
+ {"Regexp search", 321},
+ {"Regular expression search", 322},
+ {"_Wrap", 323},
+ {"Wrap the text", 324},
+ {"_Parsed view", 325},
+ {"_Formatted", 326},
+ {"_Hex", 327},
+ {"_Search", 328},
+ {"ok", 329},
+ {"cancel", 330},
+ {"help", 331},
+ {"yes", 332},
+ {"no", 333},
+ {"exit", 334},
+ {"abort", 335},
+ {" Error ", 336},
+ {" Failed trying to open file for reading: ", 337},
+ {" Cannot get size/permissions info on file: ", 338},
+ {" Not an ordinary file: ", 339},
+ {" File is too large: ", 340},
{"\
\n\
- Increase edit.h:MAXBUF and recompile the editor. ", 277},
- {" Error allocating memory ", 278},
- {"Quick save ", 279},
- {"Safe save ", 280},
- {"Do backups -->", 281},
- {"&Cancel", 282},
- {"Extension:", 283},
- {" Edit Save Mode ", 284},
- {" Save As ", 285},
- {" Warning ", 286},
- {" A file already exists with this name. ", 287},
- {"Overwrite", 288},
- {"Cancel", 289},
- {" Save as ", 290},
- {" Error trying to save file. ", 291},
- {" Delete macro ", 292},
- {" Error trying to open temp file ", 293},
- {" Error trying to open macro file ", 294},
- {"key '%d 0': ", 295},
- {" Error trying to overwrite macro file ", 296},
- {" Macro ", 297},
- {" Press the macro's new hotkey: ", 298},
- {" Save macro ", 299},
- {" Delete Macro ", 300},
- {" Load macro ", 301},
- {" Confirm save file? : ", 302},
- {" Save file ", 303},
- {"Save", 304},
+ Increase edit.h:MAXBUF and recompile the editor. ", 341},
+ {" Error allocating memory ", 342},
+ {"Quick save ", 343},
+ {"Safe save ", 344},
+ {"Do backups -->", 345},
+ {"&Cancel", 346},
+ {"Extension:", 347},
+ {" Edit Save Mode ", 348},
+ {" Save As ", 349},
+ {" Warning ", 350},
+ {" A file already exists with this name. ", 351},
+ {"Overwrite", 352},
+ {"Cancel", 353},
+ {" Save as ", 354},
+ {" Error trying to save file. ", 355},
+ {" Delete macro ", 356},
+ {" Error trying to open temp file ", 357},
+ {" Error trying to open macro file ", 358},
+ {"key '%d 0': ", 359},
+ {" Error trying to overwrite macro file ", 360},
+ {" Macro ", 361},
+ {" Press the macro's new hotkey: ", 362},
+ {" Save macro ", 363},
+ {" Delete Macro ", 364},
+ {" Load macro ", 365},
+ {" Confirm save file? : ", 366},
+ {" Save file ", 367},
+ {"Save", 368},
{"\
Current text was modified without a file save. \n\
- Continue discards these changes. ", 305},
- {"Continue", 306},
- {" Load ", 307},
- {" Error trying to open file for reading ", 308},
- {" Block is large, you may not be able to undo this action. ", 309},
- {" Continue ", 310},
- {" Cancel ", 311},
- {"al&L", 312},
- {"&Skip", 313},
- {"&Replace", 314},
- {" Replace with: ", 315},
- {" Confirm replace ", 316},
- {"scanf &Expression", 317},
- {"replace &All", 318},
- {"pr&Ompt on replace", 319},
- {"&Backwards", 320},
- {"&Regular expression", 321},
- {"&Whole words only", 322},
- {"case &Sensitive", 323},
- {" Enter replacement argument order eg. 3,2,1,4 ", 324},
- {" Enter replacement string:", 325},
- {" Enter search string:", 326},
- {" Replace ", 327},
- {" Search ", 328},
- {" Enter search text : ", 329},
- {" Enter replace text : ", 330},
- {" Enter argument order : ", 331},
- {"Enter the order of replacement of your scanf format specifiers", 332},
- {" Whole words only ", 333},
- {" Case sensitive ", 334},
- {" Regular expression ", 335},
- {"See the regex man page for how to compose a regular expression", 336},
- {" Backwards ", 337},
- {"Warning: Searching backward can be slow", 338},
- {" Prompt on replace ", 339},
- {"Ask before making each replacement", 340},
- {" Replace all ", 341},
- {" Scanf expression ", 342},
- {"Allows entering of a C format string, see the scanf man page", 343},
- {"Begin search, Enter", 344},
- {"Abort this dialog, Esc", 345},
- {"Replace", 346},
- {"Skip", 347},
- {"Replace all", 348},
- {"\
- Invalid regular expression, or scanf expression with to many conversions ", 349},
- {" Error in replacement format string. ", 350},
- {" %ld replacements made. ", 351},
- {" Search string not found. ", 352},
- {" Quit ", 353},
+ Continue discards these changes. ", 369},
+ {"Continue", 370},
+ {" Load ", 371},
+ {" Error trying to open file for reading ", 372},
+ {" Block is large, you may not be able to undo this action. ", 373},
+ {" Continue ", 374},
+ {" Cancel ", 375},
+ {"al&L", 376},
+ {"&Skip", 377},
+ {"&Replace", 378},
+ {" Replace with: ", 379},
+ {" Confirm replace ", 380},
+ {"scanf &Expression", 381},
+ {"replace &All", 382},
+ {"pr&Ompt on replace", 383},
+ {"&Backwards", 384},
+ {"&Regular expression", 385},
+ {"&Whole words only", 386},
+ {"case &Sensitive", 387},
+ {" Enter replacement argument order eg. 3,2,1,4 ", 388},
+ {" Enter replacement string:", 389},
+ {" Enter search string:", 390},
+ {" Replace ", 391},
+ {" Search ", 392},
+ {" Enter search text : ", 393},
+ {" Enter replace text : ", 394},
+ {"\
+You can enter regexp substrings with %s (not \\1, \\2 like sed) then use \
+\"Enter...order\"", 395},
+ {" Enter argument (or substring) order : ", 396},
+ {"\
+Enter the order of replacement of your scanf format specifiers or regexp \
+substrings", 397},
+ {" Whole words only ", 398},
+ {" Case sensitive ", 399},
+ {" Regular expression ", 400},
+ {"See the regex man page for how to compose a regular expression", 401},
+ {" Backwards ", 402},
+ {"Warning: Searching backward can be slow", 403},
+ {" Prompt on replace ", 404},
+ {"Ask before making each replacement", 405},
+ {" Replace all ", 406},
+ {" Scanf expression ", 407},
+ {"Allows entering of a C format string, see the scanf man page", 408},
+ {"Begin search, Enter", 409},
+ {"Abort this dialog, Esc", 410},
+ {"Replace", 411},
+ {"Skip", 412},
+ {"Replace all", 413},
+ {"\
+ Invalid regular expression, or scanf expression with to many conversions ", 414},
+ {" Error in replacement format string. ", 415},
+ {" %ld replacements made. ", 416},
+ {" Search string not found. ", 417},
+ {" Quit ", 418},
{"\
Current text was modified without a file save. \n\
- Save with exit? ", 354},
- {" File was modified, Save with exit? ", 355},
- {"Cancel quit", 356},
- {" &Cancel quit ", 357},
- {" &Yes ", 358},
- {" &No ", 359},
- {" Copy to clipboard ", 360},
- {" Unable to save to file. ", 361},
- {" Cut to clipboard ", 362},
- {" Goto line ", 363},
- {" Enter line: ", 364},
- {" Save Block ", 365},
- {" Insert File ", 366},
- {" Insert file ", 367},
- {" Error trying to insert file. ", 368},
- {" Sort block ", 369},
- {" You must first highlight a block of text. ", 370},
- {" Run Sort ", 371},
- {" Enter sort options (see manpage) separated by whitespace: ", 372},
- {" Sort ", 373},
- {" Error trying to execute sort command ", 374},
- {" Sort returned non-zero: ", 375},
- {" Process block ", 376},
- {" Error trying to stat file ", 377},
- {" Mail ", 378},
- {" Copies to", 379},
- {" Subject", 380},
- {" To", 381},
- {" mail -s <subject> -c <cc> <to>", 382},
- {"Intuitive", 383},
- {"Emacs", 384},
- {"None", 385},
- {"Dynamic paragraphing", 386},
- {"Type writer wrap", 387},
- {"Word wrap line length : ", 388},
- {"Tab spacing : ", 389},
- {"synta&X highlighting", 390},
- {"confir&M before saving", 391},
- {"fill tabs with &Spaces", 392},
- {"&Return does autoindent", 393},
- {"&Backspace through tabs", 394},
- {"&Fake half tabs", 395},
- {"Wrap mode", 396},
- {"Key emulation", 397},
- {" Editor options ", 398},
- {"Error initialising editor.\n", 399},
- {"Help", 400},
- {"Mark", 401},
- {"Replac", 402},
- {"Search", 403},
- {"PullDn", 404},
- {"Quit", 405},
- {" Word wrap ", 406},
- {" Enter line length, 0 for off: ", 407},
- {" About ", 408},
+ Save with exit? ", 419},
+ {" File was modified, Save with exit? ", 420},
+ {"Cancel quit", 421},
+ {" &Cancel quit ", 422},
+ {" &Yes ", 423},
+ {" &No ", 424},
+ {" Copy to clipboard ", 425},
+ {" Unable to save to file. ", 426},
+ {" Cut to clipboard ", 427},
+ {" Goto line ", 428},
+ {" Enter line: ", 429},
+ {" Save Block ", 430},
+ {" Insert File ", 431},
+ {" Insert file ", 432},
+ {" Error trying to insert file. ", 433},
+ {" Sort block ", 434},
+ {" You must first highlight a block of text. ", 435},
+ {" Run Sort ", 436},
+ {" Enter sort options (see manpage) separated by whitespace: ", 437},
+ {" Sort ", 438},
+ {" Error trying to execute sort command ", 439},
+ {" Sort returned non-zero: ", 440},
+ {" Process block ", 441},
+ {" Error trying to stat file ", 442},
+ {" Mail ", 443},
+ {" Copies to", 444},
+ {" Subject", 445},
+ {" To", 446},
+ {" mail -s <subject> -c <cc> <to>", 447},
+ {"Intuitive", 448},
+ {"Emacs", 449},
+ {"None", 450},
+ {"Dynamic paragraphing", 451},
+ {"Type writer wrap", 452},
+ {"Word wrap line length : ", 453},
+ {"Tab spacing : ", 454},
+ {"synta&X highlighting", 455},
+ {"confir&M before saving", 456},
+ {"fill tabs with &Spaces", 457},
+ {"&Return does autoindent", 458},
+ {"&Backspace through tabs", 459},
+ {"&Fake half tabs", 460},
+ {"Wrap mode", 461},
+ {"Key emulation", 462},
+ {" Editor options ", 463},
+ {"Error initialising editor.\n", 464},
+ {"Help", 465},
+ {"Mark", 466},
+ {"Replac", 467},
+ {"Search", 468},
+ {"PullDn", 469},
+ {"Quit", 470},
+ {" Word wrap ", 471},
+ {" Enter line length, 0 for off: ", 472},
+ {" About ", 473},
{"\
\n\
Cooledit v2.1\n\
@@ -452,613 +526,616 @@
Copyright (C) 1996 the Free Software Foundation\n\
\n\
A user friendly text editor written\n\
- for the Midnight Commander.\n", 409},
- {"&Open/load... C-o", 410},
- {"&New C-n", 411},
- {"&Save F2", 412},
- {"save &As... F12", 413},
- {"&Insert file... F15", 414},
- {"copy to &File... C-f", 415},
- {"a&Bout... ", 416},
- {"&Quit F10", 417},
- {"&New C-x k", 418},
- {"copy to &File... ", 419},
- {"&Toggle Mark F3", 420},
- {"&Mark Columns S-F3", 421},
- {"toggle &Ins/overw Ins", 422},
- {"&Copy F5", 423},
- {"&Move F6", 424},
- {"&Delete F8", 425},
- {"&Undo C-u", 426},
- {"&Beginning C-PgUp", 427},
- {"&End C-PgDn", 428},
- {"&Search... F7", 429},
- {"search &Again F17", 430},
- {"&Replace... F4", 431},
- {"&Goto line... M-l", 432},
- {"insert &Literal... C-q", 433},
- {"&Refresh screen C-l", 434},
- {"&Start record macro C-r", 435},
- {"&Finish record macro... C-r", 436},
- {"&Execute macro... C-a, KEY", 437},
- {"delete macr&O... ", 438},
- {"insert &Date/time ", 439},
- {"format p&Aragraph M-p", 440},
- {"'ispell' s&Pell check C-p", 441},
- {"sor&T... M-t", 442},
- {"'indent' &C Formatter F19", 443},
- {"&Mail... ", 444},
- {"&Execute macro... C-x e, KEY", 445},
- {"'ispell' s&Pell check M-$", 446},
- {"&General... ", 447},
- {"&Save mode...", 448},
- {"&Layout...", 449},
- {" File ", 450},
- {" Edit ", 451},
- {" Sear/Repl ", 452},
- {" Command ", 453},
- {" Options ", 454},
- {"Open...\tC-o", 455},
- {"New\tC-n", 456},
- {"Save\tF2", 457},
- {"Save as...\tF12", 458},
- {"Insert file...\tF15", 459},
- {"Copy to file...\tC-f", 460},
- {"Disk operations", 461},
- {"Toggle mark\tF3", 462},
- {"Toggle mark columns\tC-b", 463},
- {"Toggle insert/overwrite\tIns", 464},
- {"Copy block to cursor\tF5", 465},
- {"Move block to cursor\tF6", 466},
- {"Delete block\tF8/C-Del", 467},
- {"Copy block to clipbrd\tC-Ins", 468},
- {"Cut block to clipbrd\tS-Del", 469},
- {"Paste block from clipbrd\tS-Ins", 470},
- {"Selection history\tM-Ins", 471},
- {"Undo\tC-BackSpace", 472},
- {"Manipulating blocks of text", 473},
- {" Srch/Replce ", 474},
- {"Search...\tF7", 475},
- {"Search again\tF17", 476},
- {"Replace...\tF4", 477},
- {"Replace again\tF14", 478},
- {"Search for and replace text", 479},
- {"Goto line...\tM-l", 480},
- {"Start record macro\tC-r", 481},
- {"Finish record macro...\tC-r", 482},
- {"Execute macro...\tC-a, KEY", 483},
- {"Delete macro...\t", 484},
- {"Insert date/time\tC-d", 485},
- {"Format paragraph\tM-p", 486},
- {"Refresh display\tC-l", 487},
- {"Macros and internal commands", 488},
- {"&Dismiss", 489},
- {" Enter file name: ", 490},
- {"The Quick Brown Fox Jumps Over The Lazy Dog", 491},
- {"\
-gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n", 492},
- {"Clear the edit buffer", 493},
- {"Insert File", 494},
- {"Insert text from a file", 495},
- {"Copy to file", 496},
- {"copy a block to a file", 497},
- {"Search/Replace", 498},
- {" Load syntax file ", 499},
- {" File access error ", 500},
- {" Syntax error in file %s on line %d ", 501},
- {"&Set", 502},
- {"S&kip", 503},
- {"Set &all", 504},
- {"owner", 505},
- {"group", 506},
- {"other", 507},
- {"On", 508},
- {"Flag", 509},
- {"Mode", 510},
- {"%6d of %d", 511},
- {" Chown advanced command ", 512},
+ for the Midnight Commander.\n", 474},
+ {"&Open/load... C-o", 475},
+ {"&New C-n", 476},
+ {"&Save F2", 477},
+ {"save &As... F12", 478},
+ {"&Insert file... F15", 479},
+ {"copy to &File... C-f", 480},
+ {"a&Bout... ", 481},
+ {"&Quit F10", 482},
+ {"&New C-x k", 483},
+ {"copy to &File... ", 484},
+ {"&Toggle Mark F3", 485},
+ {"&Mark Columns S-F3", 486},
+ {"toggle &Ins/overw Ins", 487},
+ {"&Copy F5", 488},
+ {"&Move F6", 489},
+ {"&Delete F8", 490},
+ {"&Undo C-u", 491},
+ {"&Beginning C-PgUp", 492},
+ {"&End C-PgDn", 493},
+ {"&Search... F7", 494},
+ {"search &Again F17", 495},
+ {"&Replace... F4", 496},
+ {"&Goto line... M-l", 497},
+ {"insert &Literal... C-q", 498},
+ {"&Refresh screen C-l", 499},
+ {"&Start record macro C-r", 500},
+ {"&Finish record macro... C-r", 501},
+ {"&Execute macro... C-a, KEY", 502},
+ {"delete macr&O... ", 503},
+ {"insert &Date/time ", 504},
+ {"format p&Aragraph M-p", 505},
+ {"'ispell' s&Pell check C-p", 506},
+ {"sor&T... M-t", 507},
+ {"'indent' &C Formatter F19", 508},
+ {"&Mail... ", 509},
+ {"&Execute macro... C-x e, KEY", 510},
+ {"'ispell' s&Pell check M-$", 511},
+ {"&General... ", 512},
+ {"&Save mode...", 513},
+ {"&Layout...", 514},
+ {" File ", 515},
+ {" Edit ", 516},
+ {" Sear/Repl ", 517},
+ {" Command ", 518},
+ {" Options ", 519},
+ {"Open...\tC-o", 520},
+ {"New\tC-n", 521},
+ {"Save\tF2", 522},
+ {"Save as...\tF12", 523},
+ {"Insert file...\tF15", 524},
+ {"Copy to file...\tC-f", 525},
+ {"Disk operations", 526},
+ {"Toggle mark\tF3", 527},
+ {"Toggle mark columns\tC-b", 528},
+ {"Toggle book mark\tC-M-Ins", 529},
+ {"Previous book mark\tC-M-Up", 530},
+ {"Next book mark\tC-M-Down", 531},
+ {"Flush book marks", 532},
+ {"Toggle insert/overwrite\tIns", 533},
+ {"Copy block to cursor\tF5", 534},
+ {"Move block to cursor\tF6", 535},
+ {"Delete block\tF8/C-Del", 536},
+ {"Copy block to clipbrd\tC-Ins", 537},
+ {"Cut block to clipbrd\tS-Del", 538},
+ {"Paste block from clipbrd\tS-Ins", 539},
+ {"Selection history\tM-Ins", 540},
+ {"Undo\tC-BackSpace", 541},
+ {"Manipulating blocks of text", 542},
+ {" Srch/Replce ", 543},
+ {"Search...\tF7", 544},
+ {"Search again\tF17", 545},
+ {"Replace...\tF4", 546},
+ {"Replace again\tF14", 547},
+ {"Search for and replace text", 548},
+ {"Goto line...\tM-l", 549},
+ {"Start record macro\tC-r", 550},
+ {"Finish record macro...\tC-r", 551},
+ {"Execute macro...\tC-a, KEY", 552},
+ {"Delete macro...\t", 553},
+ {"Insert date/time\tC-d", 554},
+ {"Format paragraph\tM-p", 555},
+ {"Refresh display\tC-l", 556},
+ {"Macros and internal commands", 557},
+ {"&Dismiss", 558},
+ {" Enter file name: ", 559},
+ {"The Quick Brown Fox Jumps Over The Lazy Dog", 560},
+ {"\
+gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n", 561},
+ {"Clear the edit buffer", 562},
+ {"Insert File", 563},
+ {"Insert text from a file", 564},
+ {"Copy to file", 565},
+ {"copy a block to a file", 566},
+ {"Search/Replace", 567},
+ {" Load syntax file ", 568},
+ {" File access error ", 569},
+ {" Error in file %s on line %d ", 570},
+ {"&Set", 571},
+ {"S&kip", 572},
+ {"Set &all", 573},
+ {"owner", 574},
+ {"group", 575},
+ {"other", 576},
+ {"On", 577},
+ {"Flag", 578},
+ {"%6d of %d", 579},
+ {" Chown advanced command ", 580},
{"\
Couldn't chmod \"%s\" \n\
- %s ", 513},
+ %s ", 581},
{"\
Couldn't chown \"%s\" \n\
- %s ", 514},
- {" Oops... ", 515},
- {" I can't run the Advanced Chown command on an extfs ", 516},
- {" I can't run the Advanced Chown command on a tarfs ", 517},
- {"Background process:", 518},
- {" Background process error ", 519},
- {" Child died unexpectedly ", 520},
- {" Unknown error in child ", 521},
- {" Background protocol error ", 522},
+ %s ", 582},
+ {" Oops... ", 583},
+ {" I can't run the Advanced Chown command on an extfs ", 584},
+ {" I can't run the Advanced Chown command on a tarfs ", 585},
+ {"Background process:", 586},
+ {" Background process error ", 587},
+ {" Child died unexpectedly ", 588},
+ {" Unknown error in child ", 589},
+ {" Background protocol error ", 590},
{"\
Background process sent us a request for more arguments \n\
- than we can handle. \n", 523},
- {" Listing mode ", 524},
- {"&Full file list", 525},
- {"&Brief file list", 526},
- {"&Long file list", 527},
- {"&User defined:", 528},
- {"&Icon view", 529},
- {"user &Mini status", 530},
- {"Listing mode", 531},
- {"&Reverse", 532},
- {"case sensi&tive", 533},
- {"Sort order", 534},
- {" confirm &Exit ", 535},
- {" confirm e&Xecute ", 536},
- {" confirm o&Verwrite ", 537},
- {" confirm &Delete ", 538},
- {" Confirmation ", 539},
- {"Full 8 bits output", 540},
- {"ISO 8859-1", 541},
- {"7 bits", 542},
- {"F&ull 8 bits input", 543},
- {" Display bits ", 544},
- {"&Always use ftp proxy", 545},
- {"sec", 546},
- {"ftpfs directory cache timeout:", 547},
- {"ftp anonymous password:", 548},
- {"Timeout for freeing VFSs:", 549},
- {" Virtual File System Setting ", 550},
- {"Quick cd", 551},
- {"cd", 552},
- {"Symbolic link", 553},
- {"Running ", 554},
- {"Stopped", 555},
- {"&Stop", 556},
- {"&Resume", 557},
- {"&Kill", 558},
- {"Background Jobs", 559},
- {"execute/search by others", 560},
- {"write by others", 561},
- {"read by others", 562},
- {"execute/search by group", 563},
- {"write by group", 564},
- {"read by group", 565},
- {"execute/search by owner", 566},
- {"write by owner", 567},
- {"read by owner", 568},
- {"sticky bit", 569},
- {"set group ID on execution", 570},
- {"set user ID on execution", 571},
- {"C&lear marked", 572},
- {"S&et marked", 573},
- {"&Marked all", 574},
- {"Permissions (Octal)", 575},
- {"Owner name", 576},
- {"Group name", 577},
- {" Chmod command ", 578},
- {" Permission ", 579},
- {"Use SPACE to change", 580},
- {"an option, ARROW KEYS", 581},
- {"to move between options", 582},
- {"and T or INS to mark", 583},
- {"Chmod command", 584},
- {" I can't run the Chmod command on an extfs ", 585},
- {"Set &users", 586},
- {"Set &groups", 587},
- {" Name ", 588},
- {" Owner name ", 589},
- {" Group name ", 590},
- {" Size ", 591},
- {" Chown command ", 592},
- {" User name ", 593},
- {"<Unknown user>", 594},
- {"<Unknown group>", 595},
- {" I can't run the Chown command on an extfs ", 596},
- {" I can't run the Chown command on a tarfs ", 597},
- {" Can not fetch a local copy of %s ", 598},
- {" CD ", 599},
- {"Files tagged, want to cd?", 600},
- {"Could not change directory", 601},
- {" View file ", 602},
- {" Filename:", 603},
- {" Filtered view ", 604},
- {" Filter command and arguments:", 605},
- {"Create a new Directory", 606},
- {" Enter directory name:", 607},
- {" Filter ", 608},
- {" Set expression for filtering filenames", 609},
- {" Select ", 610},
- {" Malformed regular expression ", 611},
- {" Unselect ", 612},
- {"Extension file edit", 613},
- {" Which extension file you want to edit? ", 614},
- {"&User", 615},
- {"&System Wide", 616},
- {"Menu file edit", 617},
- {" Which menu file will you edit? ", 618},
- {"&Local", 619},
- {"&Home", 620},
- {" Compare directories ", 621},
- {" Select compare method: ", 622},
- {"&Quick", 623},
- {"&Size only", 624},
- {"&Thorough", 625},
- {" Both panels should be on the listing view mode to use this command ", 626},
- {" The command history is empty ", 627},
- {" Command history ", 628},
+ than we can handle. \n", 591},
+ {" Listing mode ", 592},
+ {"&Full file list", 593},
+ {"&Brief file list", 594},
+ {"&Long file list", 595},
+ {"&User defined:", 596},
+ {"&Icon view", 597},
+ {"user &Mini status", 598},
+ {"Listing mode", 599},
+ {"&Reverse", 600},
+ {"case sensi&tive", 601},
+ {"Sort order", 602},
+ {" confirm &Exit ", 603},
+ {" confirm e&Xecute ", 604},
+ {" confirm o&Verwrite ", 605},
+ {" confirm &Delete ", 606},
+ {" Confirmation ", 607},
+ {"Full 8 bits output", 608},
+ {"ISO 8859-1", 609},
+ {"7 bits", 610},
+ {"F&ull 8 bits input", 611},
+ {" Display bits ", 612},
+ {"&Always use ftp proxy", 613},
+ {"sec", 614},
+ {"ftpfs directory cache timeout:", 615},
+ {"ftp anonymous password:", 616},
+ {"Timeout for freeing VFSs:", 617},
+ {" Virtual File System Setting ", 618},
+ {"Quick cd", 619},
+ {"cd", 620},
+ {"Symbolic link", 621},
+ {"Running ", 622},
+ {"Stopped", 623},
+ {"&Stop", 624},
+ {"&Resume", 625},
+ {"&Kill", 626},
+ {"Background Jobs", 627},
+ {"execute/search by others", 628},
+ {"write by others", 629},
+ {"read by others", 630},
+ {"execute/search by group", 631},
+ {"write by group", 632},
+ {"read by group", 633},
+ {"execute/search by owner", 634},
+ {"write by owner", 635},
+ {"read by owner", 636},
+ {"sticky bit", 637},
+ {"set group ID on execution", 638},
+ {"set user ID on execution", 639},
+ {"C&lear marked", 640},
+ {"S&et marked", 641},
+ {"&Marked all", 642},
+ {"Permissions (Octal)", 643},
+ {"Owner name", 644},
+ {"Group name", 645},
+ {" Chmod command ", 646},
+ {" Permission ", 647},
+ {"Use SPACE to change", 648},
+ {"an option, ARROW KEYS", 649},
+ {"to move between options", 650},
+ {"and T or INS to mark", 651},
+ {"Chmod command", 652},
+ {" I can't run the Chmod command on an extfs ", 653},
+ {"Set &users", 654},
+ {"Set &groups", 655},
+ {" Name ", 656},
+ {" Owner name ", 657},
+ {" Group name ", 658},
+ {" Size ", 659},
+ {" Chown command ", 660},
+ {" User name ", 661},
+ {"<Unknown user>", 662},
+ {"<Unknown group>", 663},
+ {" I can't run the Chown command on an extfs ", 664},
+ {" I can't run the Chown command on a tarfs ", 665},
+ {" Can not fetch a local copy of %s ", 666},
+ {" CD ", 667},
+ {"Files tagged, want to cd?", 668},
+ {"Could not change directory", 669},
+ {" View file ", 670},
+ {" Filename:", 671},
+ {" Filtered view ", 672},
+ {" Filter command and arguments:", 673},
+ {"Create a new Directory", 674},
+ {" Enter directory name:", 675},
+ {" Filter ", 676},
+ {" Set expression for filtering filenames", 677},
+ {" Select ", 678},
+ {" Malformed regular expression ", 679},
+ {" Unselect ", 680},
+ {"Extension file edit", 681},
+ {" Which extension file you want to edit? ", 682},
+ {"&User", 683},
+ {"&System Wide", 684},
+ {"Menu file edit", 685},
+ {" Which menu file will you edit? ", 686},
+ {"&Local", 687},
+ {"&Home", 688},
+ {" Compare directories ", 689},
+ {" Select compare method: ", 690},
+ {"&Quick", 691},
+ {"&Size only", 692},
+ {"&Thorough", 693},
+ {" Both panels should be on the listing view mode to use this command ", 694},
+ {" The command history is empty ", 695},
+ {" Command history ", 696},
{"\
Not an xterm or Linux console; \n\
- the panels cannot be toggled. ", 629},
- {"Type `exit' to return to the Midnight Commander", 630},
+ the panels cannot be toggled. ", 697},
+ {"Type `exit' to return to the Midnight Commander", 698},
{"\
Couldn't stat %s \n\
- %s ", 631},
- {" Link ", 632},
- {" to:", 633},
- {" link: %s ", 634},
- {" symlink: %s ", 635},
- {" Symlink `%s' points to: ", 636},
- {" Edit symlink ", 637},
- {" edit symlink, unable to remove %s: %s ", 638},
- {" edit symlink: %s ", 639},
- {" Link symbolically ", 640},
- {" Relative symlink ", 641},
- {" relative symlink: %s ", 642},
- {" Enter machine name (F1 for details): ", 643},
- {" Could not chdir to %s ", 644},
- {" Link to a remote machine ", 645},
- {" FTP to machine ", 646},
- {" Socket source routing setup ", 647},
- {" Enter host name to use as a source routing hop: ", 648},
- {" Host name ", 649},
- {" Error while looking up IP address ", 650},
- {" Undelete files on an ext2 file system ", 651},
+ %s ", 699},
+ {" Link ", 700},
+ {" to:", 701},
+ {" link: %s ", 702},
+ {" symlink: %s ", 703},
+ {" Symlink `%s' points to: ", 704},
+ {" Edit symlink ", 705},
+ {" edit symlink, unable to remove %s: %s ", 706},
+ {" edit symlink: %s ", 707},
+ {" Link symbolically ", 708},
+ {" Relative symlink ", 709},
+ {" relative symlink: %s ", 710},
+ {" Enter machine name (F1 for details): ", 711},
+ {" Could not chdir to %s ", 712},
+ {" Link to a remote machine ", 713},
+ {" FTP to machine ", 714},
+ {" Socket source routing setup ", 715},
+ {" Enter host name to use as a source routing hop: ", 716},
+ {" Host name ", 717},
+ {" Error while looking up IP address ", 718},
+ {" Undelete files on an ext2 file system ", 719},
{"\
Enter device (without /dev/) to undelete\n\
- files on: (F1 for details)", 652},
- {" Setup saved to ~/", 653},
- {" Setup ", 654},
+ files on: (F1 for details)", 720},
+ {" Setup saved to ~/", 721},
+ {" Setup ", 722},
{"\
Can't chdir to '%s' \n\
- %s ", 655},
- {" You can not execute commands on non-local filesystems", 656},
+ %s ", 723},
+ {" You can not execute commands on non-local filesystems", 724},
{"\
\n\
\n\
\n\
refresh stack underflow!\n\
\n\
-\n", 657},
- {"&Unsorted", 658},
- {"&Name", 659},
- {"&Extension", 660},
- {"&Modify time", 661},
- {"&Access time", 662},
- {"&Change time", 663},
- {"&Size", 664},
- {"&Inode", 665},
- {"&Type", 666},
- {"&Links", 667},
- {"N&GID", 668},
- {"N&UID", 669},
- {"&Owner", 670},
- {"&Group", 671},
- {"File exists but can not be stat-ed: %s %s", 672},
- {"Unknown", 673},
+\n", 725},
+ {"&Unsorted", 726},
+ {"&Name", 727},
+ {"&Extension", 728},
+ {"&Modify time", 729},
+ {"&Access time", 730},
+ {"&Change time", 731},
+ {"&Size", 732},
+ {"&Inode", 733},
+ {"&Type", 734},
+ {"&Links", 735},
+ {"N&GID", 736},
+ {"N&UID", 737},
+ {"&Owner", 738},
+ {"&Group", 739},
+ {"File exists but can not be stat-ed: %s %s", 740},
+ {"Unknown", 741},
{"\
Can't create temporary command file \n\
- %s ", 674},
- {" Parameter ", 675},
- {" Can't execute commands on a Virtual File System directory ", 676},
- {" file error", 677},
- {"Format of the ", 678},
- {" file error ", 679},
- {"Format of the ~/", 680},
+ %s ", 742},
+ {" Parameter ", 743},
+ {" Can't execute commands on a Virtual File System directory ", 744},
+ {" file error", 745},
+ {"Format of the ", 746},
+ {" file error ", 747},
+ {"Format of the ~/", 748},
{"\
file has changed\n\
with version 3.0. You may want either to\n\
-copy it from ", 681},
+copy it from ", 749},
{"\
mc.ext or use that\n\
-file as an example of how to write it.\n", 682},
- {"mc.ext will be used for this moment.", 683},
- {" Copy ", 684},
- {" Move ", 685},
- {" Delete ", 686},
- {" Invalid target mask ", 687},
- {" Could not make the hardlink ", 688},
+file as an example of how to write it.\n", 750},
+ {"mc.ext will be used for this moment.", 751},
+ {" Copy ", 752},
+ {" Move ", 753},
+ {" Delete ", 754},
+ {" Invalid target mask ", 755},
+ {" Could not make the hardlink ", 756},
{"\
Cannot read source link \"%s\" \n\
- %s ", 689},
+ %s ", 757},
{"\
Cannot make stable symlinks across non-local filesystems: \n\
\n\
- Option Stable Symlinks will be disabled ", 690},
+ Option Stable Symlinks will be disabled ", 758},
{"\
Cannot create target symlink \"%s\" \n\
- %s ", 691},
+ %s ", 759},
{"\
Cannot overwrite directory \"%s\" \n\
- %s ", 692},
+ %s ", 760},
{"\
Cannot stat source file \"%s\" \n\
- %s ", 693},
- {" `%s' and `%s' are the same file. ", 694},
+ %s ", 761},
+ {" `%s' and `%s' are the same file. ", 762},
{"\
Cannot create special file \"%s\" \n\
- %s ", 695},
+ %s ", 763},
{"\
Cannot chown target file \"%s\" \n\
- %s ", 696},
+ %s ", 764},
{"\
Cannot chmod target file \"%s\" \n\
- %s ", 697},
+ %s ", 765},
{"\
Cannot open source file \"%s\" \n\
- %s ", 698},
- {" Reget failed, about to overwrite file ", 699},
+ %s ", 766},
+ {" Reget failed, about to overwrite file ", 767},
{"\
Cannot fstat source file \"%s\" \n\
- %s ", 700},
+ %s ", 768},
{"\
Cannot create target file \"%s\" \n\
- %s ", 701},
+ %s ", 769},
{"\
Cannot fstat target file \"%s\" \n\
- %s ", 702},
+ %s ", 770},
{"\
Cannot read source file \"%s\" \n\
- %s ", 703},
+ %s ", 771},
{"\
Cannot write target file \"%s\" \n\
- %s ", 704},
- {"(stalled)", 705},
+ %s ", 772},
+ {"(stalled)", 773},
{"\
Cannot close source file \"%s\" \n\
- %s ", 706},
+ %s ", 774},
{"\
Cannot close target file \"%s\" \n\
- %s ", 707},
- {"Incomplete file was retrieved. Keep it?", 708},
- {"&Delete", 709},
- {"&Keep", 710},
+ %s ", 775},
+ {"Incomplete file was retrieved. Keep it?", 776},
+ {"&Delete", 777},
+ {"&Keep", 778},
{"\
Cannot stat source directory \"%s\" \n\
- %s ", 711},
+ %s ", 779},
{"\
Source directory \"%s\" is not a directory \n\
- %s ", 712},
+ %s ", 780},
{"\
Cannot copy cyclic symbolic link \n\
- `%s' ", 713},
+ `%s' ", 781},
{"\
Cannot create target directory \"%s\" \n\
- %s ", 714},
+ %s ", 782},
{"\
Cannot chown target directory \"%s\" \n\
- %s ", 715},
+ %s ", 783},
{"\
Cannot stat file \"%s\" \n\
- %s ", 716},
- {" `%s' and `%s' are the same file ", 717},
- {" Cannot overwrite directory `%s' ", 718},
+ %s ", 784},
+ {" `%s' and `%s' are the same file ", 785},
+ {" Cannot overwrite directory `%s' ", 786},
{"\
Cannot move file \"%s\" to \"%s\" \n\
- %s ", 719},
+ %s ", 787},
{"\
Cannot remove file \"%s\" \n\
- %s ", 720},
- {" Cannot overwrite directory \"%s\" %s ", 721},
- {" Cannot overwrite file \"%s\" %s ", 722},
+ %s ", 788},
+ {" Cannot overwrite directory \"%s\" %s ", 789},
+ {" Cannot overwrite file \"%s\" %s ", 790},
{"\
Cannot move directory \"%s\" to \"%s\" \n\
- %s ", 723},
+ %s ", 791},
{"\
Cannot delete file \"%s\" \n\
- %s ", 724},
+ %s ", 792},
{"\
Cannot remove directory \"%s\" \n\
- %s ", 725},
- {" Internal error: get_file \n", 726},
- {"1Copy", 727},
- {"1Move", 728},
- {"1Delete", 729},
- {"%o %f \"%s\"%m", 730},
- {"%o %d %f%m", 731},
- {"%o %f \"%s\"%e", 732},
- {"%o %d %f%e", 733},
- {"file", 734},
- {"files", 735},
- {"directory", 736},
- {"directories", 737},
- {"files/directories", 738},
- {" with source mask:", 739},
- {" Can't operate on \"..\"! ", 740},
- {"Yes", 741},
- {"No", 742},
- {" Sorry, I could not put the job in background ", 743},
- {" Internal failure ", 744},
- {" Unknown file operation ", 745},
+ %s ", 793},
+ {" Internal error: get_file \n", 794},
+ {"1Copy", 795},
+ {"1Move", 796},
+ {"1Delete", 797},
+ {"%o %f \"%s\"%m", 798},
+ {"%o %d %f%m", 799},
+ {"%o %f \"%s\"%e", 800},
+ {"%o %d %f%e", 801},
+ {"file", 802},
+ {"files", 803},
+ {"directory", 804},
+ {"directories", 805},
+ {"files/directories", 806},
+ {" with source mask:", 807},
+ {" Can't operate on \"..\"! ", 808},
+ {"Yes", 809},
+ {"No", 810},
+ {" Sorry, I could not put the job in background ", 811},
+ {" Internal failure ", 812},
+ {" Unknown file operation ", 813},
{"\
Destination \"%s\" must be a directory \n\
- %s ", 746},
- {"&Retry", 747},
- {"&Abort", 748},
+ %s ", 814},
+ {"&Retry", 815},
+ {"&Abort", 816},
{"\
\n\
Directory not empty. \n\
- Delete it recursively? ", 749},
+ Delete it recursively? ", 817},
{"\
\n\
Background process: Directory not empty \n\
- Delete it recursively? ", 750},
- {"a&ll", 751},
- {"non&E", 752},
- {" Type 'yes' if you REALLY want to delete ", 753},
- {"all the directories ", 754},
- {" Recursive Delete ", 755},
- {" Background process: Recursive Delete ", 756},
- {"File", 757},
- {"Count", 758},
- {"Bytes", 759},
- {"Source", 760},
- {"Target", 761},
- {"Deleting", 762},
- {"Target file \"%s\" already exists!", 763},
- {"if &Size differs", 764},
- {"&Update", 765},
- {"Overwrite all targets?", 766},
- {"&Reget", 767},
- {"ap&Pend", 768},
- {"Overwrite this target?", 769},
- {"Target date: %s, size %d", 770},
- {"Source date: %s, size %d", 771},
- {" File exists ", 772},
- {" Background process: File exists ", 773},
- {"preserve &Attributes", 774},
- {"follow &Links", 775},
- {"to:", 776},
- {"&Using shell patterns", 777},
- {"&Background", 778},
- {"&Stable Symlinks", 779},
- {"&Dive into subdir if exists", 780},
+ Delete it recursively? ", 818},
+ {"a&ll", 819},
+ {"non&E", 820},
+ {" Type 'yes' if you REALLY want to delete ", 821},
+ {"all the directories ", 822},
+ {" Recursive Delete ", 823},
+ {" Background process: Recursive Delete ", 824},
+ {"File", 825},
+ {"Count", 826},
+ {"Bytes", 827},
+ {"Source", 828},
+ {"Target", 829},
+ {"Deleting", 830},
+ {"Target file \"%s\" already exists!", 831},
+ {"if &Size differs", 832},
+ {"&Update", 833},
+ {"Overwrite all targets?", 834},
+ {"&Reget", 835},
+ {"ap&Pend", 836},
+ {"Overwrite this target?", 837},
+ {"Target date: %s, size %d", 838},
+ {"Source date: %s, size %d", 839},
+ {" File exists ", 840},
+ {" Background process: File exists ", 841},
+ {"preserve &Attributes", 842},
+ {"follow &Links", 843},
+ {"to:", 844},
+ {"&Using shell patterns", 845},
+ {"&Background", 846},
+ {"&Stable Symlinks", 847},
+ {"&Dive into subdir if exists", 848},
{"\
Invalid source pattern `%s' \n\
- %s ", 781},
- {"&Suspend", 782},
- {"Con&tinue", 783},
- {"&Chdir", 784},
- {"&Again", 785},
- {"&Quit", 786},
- {"Pane&lize", 787},
- {"&View - F3", 788},
- {"&Edit - F4", 789},
- {"Start at:", 790},
- {"Filename:", 791},
- {"Content: ", 792},
- {"&Tree", 793},
- {"Find File", 794},
- {"Grepping in %s", 795},
- {" Find/read ", 796},
- {" Problem reading from child ", 797},
- {"Finished", 798},
- {"Searching %s", 799},
- {"Suspend", 800},
- {"Restart", 801},
- {"Searching", 802},
- {"Find file", 803},
- {"Change to this directory", 804},
- {"Search again", 805},
- {"View this file", 806},
- {"Edit this file", 807},
- {"Send the results to a Panel", 808},
- {"Usage: fixhlp <width> <tocname>\n", 809},
- {"fixhlp: Cannot open toc for writing", 810},
+ %s ", 849},
+ {"&Suspend", 850},
+ {"Con&tinue", 851},
+ {"&Chdir", 852},
+ {"&Again", 853},
+ {"&Quit", 854},
+ {"Pane&lize", 855},
+ {"&View - F3", 856},
+ {"&Edit - F4", 857},
+ {"Start at:", 858},
+ {"Filename:", 859},
+ {"Content: ", 860},
+ {"&Tree", 861},
+ {"Find File", 862},
+ {"Grepping in %s", 863},
+ {" Find/read ", 864},
+ {" Problem reading from child ", 865},
+ {"Finished", 866},
+ {"Searching %s", 867},
+ {"Suspend", 868},
+ {"Restart", 869},
+ {"Searching", 870},
+ {"Find file", 871},
+ {"Change to this directory", 872},
+ {"Search again", 873},
+ {"View this file", 874},
+ {"Edit this file", 875},
+ {"Send the results to a Panel", 876},
+ {"Usage: fixhlp <width> <tocname>\n", 877},
+ {"fixhlp: Cannot open toc for writing", 878},
{"\
[Contents]\n\
Topics:\n\
-\n", 811},
+\n", 879},
{"\
Help file format error\n\
-", 812},
- {" Internal bug: Double start of link area ", 813},
- {" Can't find node [Contents] in help file ", 814},
- {" Help ", 815},
+", 880},
+ {" Internal bug: Double start of link area ", 881},
+ {" Can't find node [Contents] in help file ", 882},
+ {" Help ", 883},
{"\
Can't open file %s \n\
- %s ", 816},
- {" Can't find node %s in help file ", 817},
- {"Index", 818},
- {"Prev", 819},
- {"&Move", 820},
- {"&Remove", 821},
- {"&Append", 822},
- {"&Insert", 823},
- {"New &Entry", 824},
- {"New &Group", 825},
- {"&Up", 826},
- {"&Add current", 827},
- {"Change &To", 828},
- {"Subgroup - press ENTER to see list", 829},
- {"Active VFS directories", 830},
- {"Directory hotlist", 831},
- {" Directory path ", 832},
- {" Directory label ", 833},
- {"Moving ", 834},
- {"New hotlist entry", 835},
- {"Directory label", 836},
- {"Directory path", 837},
- {" New hotlist group ", 838},
- {"Name of new group", 839},
- {"Label for \"%s\":", 840},
- {" Add to hotlist ", 841},
- {" Remove: ", 842},
+ %s ", 884},
+ {" Can't find node %s in help file ", 885},
+ {"Index", 886},
+ {"Prev", 887},
+ {"&Move", 888},
+ {"&Remove", 889},
+ {"&Append", 890},
+ {"&Insert", 891},
+ {"New &Entry", 892},
+ {"New &Group", 893},
+ {"&Up", 894},
+ {"&Add current", 895},
+ {"Change &To", 896},
+ {"Subgroup - press ENTER to see list", 897},
+ {"Active VFS directories", 898},
+ {"Directory hotlist", 899},
+ {" Directory path ", 900},
+ {" Directory label ", 901},
+ {"Moving ", 902},
+ {"New hotlist entry", 903},
+ {"Directory label", 904},
+ {"Directory path", 905},
+ {" New hotlist group ", 906},
+ {"Name of new group", 907},
+ {"Label for \"%s\":", 908},
+ {" Add to hotlist ", 909},
+ {" Remove: ", 910},
{"\
\n\
Group not empty.\n\
- Remove it?", 843},
- {" Top level group ", 844},
- {"Hotlist is now kept in file ~/", 845},
- {"MC will load hotlist from ~/", 846},
- {"and then delete [Hotlist] section there", 847},
- {" Hotlist Load ", 848},
- {"MC was unable to write ~/", 849},
- {" file, your old hotlist entries were not deleted", 850},
- {"You have ~/", 851},
- {" file and [Hotlist] section in ~/", 852},
- {"Your ~/", 853},
- {" most probably was created\n", 854},
+ Remove it?", 911},
+ {" Top level group ", 912},
+ {"Hotlist is now kept in file ~/", 913},
+ {"MC will load hotlist from ~/", 914},
+ {"and then delete [Hotlist] section there", 915},
+ {" Hotlist Load ", 916},
+ {"MC was unable to write ~/", 917},
+ {" file, your old hotlist entries were not deleted", 918},
+ {"You have ~/", 919},
+ {" file and [Hotlist] section in ~/", 920},
+ {"Your ~/", 921},
+ {" most probably was created\n", 922},
{"\
by an earlier development version of MC\n\
-and is more actual than ~/", 855},
+and is more actual than ~/", 923},
{"\
entries\n\
-\n", 856},
+\n", 924},
{"\
You can choose between\n\
\n\
- Remove - remove old hotlist entries from ~/", 857},
+ Remove - remove old hotlist entries from ~/", 925},
{"\
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 ~/", 858},
- {"&Merge", 859},
- {" Entries from ~/", 860},
- {" file your old hotlist entries were not deleted", 861},
- {"Midnight Commander %s", 862},
- {"Free nodes %d (%d%%) of %d", 863},
- {"No node information", 864},
- {"Free space ", 865},
- {" (%d%%) of ", 866},
- {"No space information", 867},
- {"Type: %s ", 868},
- {"non-local vfs", 869},
- {"Device: %s", 870},
- {"Filesystem: %s", 871},
- {"Accessed: %s", 872},
- {"Modified: %s", 873},
- {"Created: %s", 874},
- {"Size: ", 875},
- {" (%d blocks)", 876},
- {"Owner: %s/%s", 877},
- {"Links: %d", 878},
- {"Mode: %s (%04o)", 879},
- {"Location: %Xh:%Xh", 880},
- {"File: %s", 881},
- {"File: None", 882},
- {"&Vertical", 883},
- {"&Horizontal", 884},
- {"&Xterm hintbar", 885},
- {"h&Intbar visible", 886},
- {"&Keybar visible", 887},
- {"command &Prompt", 888},
- {"show &Mini status", 889},
- {"menu&Bar visible", 890},
- {"&Equal split", 891},
- {"pe&Rmissions", 892},
- {"&File types", 893},
- {"&Save", 894},
- {" Layout ", 895},
- {" Panel split ", 896},
- {" Highlight... ", 897},
- {" Other options ", 898},
- {"output lines", 899},
- {"Layout", 900},
- {" Learn keys ", 901},
- {" Teach me a key ", 902},
+ Merge - add old entries to hotlist as group \"Entries from ~/", 926},
+ {"&Merge", 927},
+ {" Entries from ~/", 928},
+ {" file your old hotlist entries were not deleted", 929},
+ {"Midnight Commander %s", 930},
+ {"Free nodes %d (%d%%) of %d", 931},
+ {"No node information", 932},
+ {"Free space ", 933},
+ {" (%d%%) of ", 934},
+ {"No space information", 935},
+ {"Type: %s ", 936},
+ {"non-local vfs", 937},
+ {"Device: %s", 938},
+ {"Filesystem: %s", 939},
+ {"Accessed: %s", 940},
+ {"Modified: %s", 941},
+ {"Created: %s", 942},
+ {"Size: ", 943},
+ {" (%d blocks)", 944},
+ {"Owner: %s/%s", 945},
+ {"Links: %d", 946},
+ {"Mode: %s (%04o)", 947},
+ {"Location: %Xh:%Xh", 948},
+ {"File: %s", 949},
+ {"File: None", 950},
+ {"&Vertical", 951},
+ {"&Horizontal", 952},
+ {"&Xterm hintbar", 953},
+ {"h&Intbar visible", 954},
+ {"&Keybar visible", 955},
+ {"command &Prompt", 956},
+ {"show &Mini status", 957},
+ {"menu&Bar visible", 958},
+ {"&Equal split", 959},
+ {"pe&Rmissions", 960},
+ {"&File types", 961},
+ {"&Save", 962},
+ {" Layout ", 963},
+ {" Panel split ", 964},
+ {" Highlight... ", 965},
+ {" Other options ", 966},
+ {"output lines", 967},
+ {"Layout", 968},
+ {" Learn keys ", 969},
+ {" Teach me a key ", 970},
{"\
Please press the %s\n\
and then wait until this message disappears.\n\
@@ -1067,350 +1144,383 @@
next to its button.\n\
\n\
If you want to escape, press a single Escape key\n\
-and wait as well.", 903},
- {" Cannot accept this key ", 904},
- {" You have entered \"%s\"", 905},
- {"OK", 906},
+and wait as well.", 971},
+ {" Cannot accept this key ", 972},
+ {" You have entered \"%s\"", 973},
+ {"OK", 974},
{"\
It seems that all your keys already\n\
-work fine. That's great.", 907},
- {"&Discard", 908},
+work fine. That's great.", 975},
+ {"&Discard", 976},
{"\
Great! You have a complete terminal database!\n\
-All your keys work well.", 909},
- {"Learn keys", 910},
- {"Press all the keys mentioned here. After you have done it, check", 911},
- {"which keys are not marked with OK. Press space on the missing", 912},
- {"key, or click with the mouse to define it. Move around with Tab.", 913},
+All your keys work well.", 977},
+ {"Learn keys", 978},
+ {"Press all the keys mentioned here. After you have done it, check", 979},
+ {"which keys are not marked with OK. Press space on the missing", 980},
+ {"key, or click with the mouse to define it. Move around with Tab.", 981},
{"\
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? ", 914},
- {"Press any key to continue...", 915},
- {" The shell is already running a command ", 916},
- {"&Listing mode...", 917},
- {"&Quick view C-x q", 918},
- {"&Info C-x i", 919},
- {"&Sort order...", 920},
- {"&Filter...", 921},
- {"&Network link...", 922},
- {"FT&P link...", 923},
- {"&Drive... M-d", 924},
- {"&Rescan C-r", 925},
- {"&User menu F2", 926},
- {"&View F3", 927},
- {"Vie&w file... ", 928},
- {"&Filtered view M-!", 929},
- {"&Edit F4", 930},
- {"&Copy F5", 931},
- {"c&Hmod C-x c", 932},
- {"&Link C-x l", 933},
- {"&SymLink C-x s", 934},
- {"edit s&Ymlink C-x C-s", 935},
- {"ch&Own C-x o", 936},
- {"&Advanced chown ", 937},
- {"&Rename/Move F6", 938},
- {"&Mkdir F7", 939},
- {"&Delete F8", 940},
- {"&Quick cd M-c", 941},
- {"select &Group M-+", 942},
- {"u&Nselect group M-\\", 943},
- {"reverse selec&Tion M-*", 944},
- {"e&Xit F10", 945},
- {"&Directory tree", 946},
- {"&Find file M-?", 947},
- {"s&Wap panels C-u", 948},
- {"switch &Panels on/off C-o", 949},
- {"&Compare directories C-x d", 950},
- {"e&Xternal panelize C-x !", 951},
- {"show directory s&Izes", 952},
- {"command &History", 953},
- {"di&Rectory hotlist C-\\", 954},
- {"&Active VFS list C-x a", 955},
- {"&Background jobs C-x j", 956},
- {"&Undelete files (ext2fs only)", 957},
- {"&Listing format edit", 958},
- {"&Extension file edit", 959},
- {"&Menu file edit", 960},
- {"&Configuration...", 961},
- {"c&Onfirmation...", 962},
- {"&Display bits...", 963},
- {"learn &Keys...", 964},
- {"&Virtual FS...", 965},
- {"&Save setup", 966},
- {" &Left ", 967},
- {" &Above ", 968},
- {" &File ", 969},
- {" &Command ", 970},
- {" &Options ", 971},
- {" &Right ", 972},
- {" &Below ", 973},
- {" Information ", 974},
+ extra access permissions with the \"su\" command? ", 982},
+ {"Press any key to continue...", 983},
+ {" The shell is already running a command ", 984},
+ {"&Listing mode...", 985},
+ {"&Quick view C-x q", 986},
+ {"&Info C-x i", 987},
+ {"&Sort order...", 988},
+ {"&Filter...", 989},
+ {"&Network link...", 990},
+ {"FT&P link...", 991},
+ {"&Drive... M-d", 992},
+ {"&Rescan C-r", 993},
+ {"&User menu F2", 994},
+ {"&View F3", 995},
+ {"Vie&w file... ", 996},
+ {"&Filtered view M-!", 997},
+ {"&Edit F4", 998},
+ {"&Copy F5", 999},
+ {"c&Hmod C-x c", 1000},
+ {"&Link C-x l", 1001},
+ {"&SymLink C-x s", 1002},
+ {"edit s&Ymlink C-x C-s", 1003},
+ {"ch&Own C-x o", 1004},
+ {"&Advanced chown ", 1005},
+ {"&Rename/Move F6", 1006},
+ {"&Mkdir F7", 1007},
+ {"&Delete F8", 1008},
+ {"&Quick cd M-c", 1009},
+ {"select &Group M-+", 1010},
+ {"u&Nselect group M-\\", 1011},
+ {"reverse selec&Tion M-*", 1012},
+ {"e&Xit F10", 1013},
+ {"&Directory tree", 1014},
+ {"&Find file M-?", 1015},
+ {"s&Wap panels C-u", 1016},
+ {"switch &Panels on/off C-o", 1017},
+ {"&Compare directories C-x d", 1018},
+ {"e&Xternal panelize C-x !", 1019},
+ {"show directory s&Izes", 1020},
+ {"command &History", 1021},
+ {"di&Rectory hotlist C-\\", 1022},
+ {"&Active VFS list C-x a", 1023},
+ {"&Background jobs C-x j", 1024},
+ {"&Undelete files (ext2fs only)", 1025},
+ {"&Listing format edit", 1026},
+ {"&Extension file edit", 1027},
+ {"&Menu file edit", 1028},
+ {"&Configuration...", 1029},
+ {"c&Onfirmation...", 1030},
+ {"&Display bits...", 1031},
+ {"learn &Keys...", 1032},
+ {"&Virtual FS...", 1033},
+ {"&Save setup", 1034},
+ {" &Left ", 1035},
+ {" &Above ", 1036},
+ {" &File ", 1037},
+ {" &Command ", 1038},
+ {" &Options ", 1039},
+ {" &Right ", 1040},
+ {" &Below ", 1041},
+ {" Information ", 1042},
{"\
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. ", 975},
- {"Menu", 976},
- {"Thank you for using GNU Midnight Commander", 977},
- {"with mouse support on xterm%s.\n", 978},
- {" and the Linux console", 979},
- {"The TERM environment variable is unset!\n", 980},
- {"Library directory for the Midnight Commander: %s\n", 981},
- {"\
-Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 982},
- {"Use to debug the background code", 983},
- {"Request to run in color mode", 984},
- {"Specifies a color configuration", 985},
- {"Edits one file", 986},
- {"Displays this help message", 987},
- {"Displays a help screen on how to change the color scheme", 988},
- {"Log ftp dialog to specified file", 989},
- {"Obsolete", 990},
- {"Requests to run in black and white", 991},
- {"Disable mouse support in text version", 992},
- {"Disables subshell support", 993},
- {"Prints working directory at program exit", 994},
- {"Resets soft keys on HP terminals", 995},
- {"To run on slow terminals", 996},
- {"Use stickchars to draw", 997},
- {"Enables subshell support (default)", 998},
- {"Tries to use termcap instead of terminfo", 999},
- {"Displays the current version", 1000},
- {"Launches the file viewer on a file", 1001},
- {"Forces xterm features", 1002},
- {"Geometry for the window", 1003},
- {"GEOMETRY", 1004},
- {"No windows opened at startup", 1005},
- {"Force activation even if a server is already running", 1006},
+ the details. ", 1043},
+ {"Menu", 1044},
+ {"Thank you for using GNU Midnight Commander", 1045},
+ {"with mouse support on xterm%s.\n", 1046},
+ {" and the Linux console", 1047},
+ {"The TERM environment variable is unset!\n", 1048},
+ {"Library directory for the Midnight Commander: %s\n", 1049},
+ {"\
+Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 1050},
+ {"Use to debug the background code", 1051},
+ {"Request to run in color mode", 1052},
+ {"Specifies a color configuration", 1053},
+ {"Edits one file", 1054},
+ {"Displays this help message", 1055},
+ {"Displays a help screen on how to change the color scheme", 1056},
+ {"Log ftp dialog to specified file", 1057},
+ {"Obsolete", 1058},
+ {"Requests to run in black and white", 1059},
+ {"Disable mouse support in text version", 1060},
+ {"Disables subshell support", 1061},
+ {"Prints working directory at program exit", 1062},
+ {"Resets soft keys on HP terminals", 1063},
+ {"To run on slow terminals", 1064},
+ {"Use stickchars to draw", 1065},
+ {"Enables subshell support (default)", 1066},
+ {"Tries to use termcap instead of terminfo", 1067},
+ {"Displays the current version", 1068},
+ {"Launches the file viewer on a file", 1069},
+ {"Forces xterm features", 1070},
+ {"Geometry for the window", 1071},
+ {"GEOMETRY", 1072},
+ {"No windows opened at startup", 1073},
+ {"Force activation even if a server is already running", 1074},
+ {"Displays the directory that holds the .links startup files", 1075},
{"\
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", 1007},
+On some systems you may want to run # `which mc`\n", 1076},
{"\
You are running the GNOME Midnight Commander as root. \n\
\n\
You will not be protected from severly damaging your system\n\
-if you continue.", 1008},
- {" Notice ", 1009},
+if you continue.", 1077},
+ {" Notice ", 1078},
{"\
The Midnight Commander configuration files \n\
are now stored in the ~/.mc directory, the \n\
- files have been moved now\n", 1010},
- {"safe de&Lete", 1011},
- {"cd follows lin&Ks", 1012},
- {"advanced cho&Wn", 1013},
- {"l&Ynx-like motion", 1014},
- {"Animation", 1015},
- {"rotatin&G dash", 1016},
- {"co&Mplete: show all", 1017},
- {"&Use internal view", 1018},
- {"use internal ed&It", 1019},
- {"auto m&Enus", 1020},
- {"&Auto save setup", 1021},
- {"shell &Patterns", 1022},
- {"Compute &Totals", 1023},
- {"&Verbose operation", 1024},
- {"&Fast dir reload", 1025},
- {"mi&X all files", 1026},
- {"&Drop down menus", 1027},
- {"ma&Rk moves down", 1028},
- {"show &Hidden files", 1029},
- {"show &Backup files", 1030},
- {"&Never", 1031},
- {"on dumb &Terminals", 1032},
- {"alwa&Ys", 1033},
- {" Configure options ", 1034},
- {" Panel options ", 1035},
- {" Pause after run... ", 1036},
- {"Configure options", 1037},
- {"&Add new", 1038},
- {" External panelize ", 1039},
- {"External panelize", 1040},
- {"Other command", 1041},
- {" Add to external panelize ", 1042},
- {" Enter command label: ", 1043},
- {" I can't run external panelize while logged on a non local directory ", 1044},
- {"Find *.orig after patching", 1045},
- {"Find SUID and SGID programs", 1046},
- {"Cannot invoke command.", 1047},
- {"Pipe close failed", 1048},
- {"Show this help message", 1049},
- {"Display brief usage message", 1050},
- {"MTime", 1051},
- {"ATime", 1052},
- {"CTime", 1053},
- {"Permission", 1054},
- {"Perm", 1055},
- {"Nl", 1056},
- {"Inode", 1057},
- {"UID", 1058},
- {"GID", 1059},
- {" %s bytes in %d file%s", 1060},
- {"Unknow tag on display format: ", 1061},
- {" Do you really want to execute? ", 1062},
- {" No action taken ", 1063},
- {"RenMov", 1064},
- {"Mkdir", 1065},
+ files have been moved now\n", 1079},
+ {"safe de&Lete", 1080},
+ {"cd follows lin&Ks", 1081},
+ {"advanced cho&Wn", 1082},
+ {"l&Ynx-like motion", 1083},
+ {"Animation", 1084},
+ {"rotatin&G dash", 1085},
+ {"co&Mplete: show all", 1086},
+ {"&Use internal view", 1087},
+ {"use internal ed&It", 1088},
+ {"auto m&Enus", 1089},
+ {"&Auto save setup", 1090},
+ {"shell &Patterns", 1091},
+ {"Compute &Totals", 1092},
+ {"&Verbose operation", 1093},
+ {"&Fast dir reload", 1094},
+ {"mi&X all files", 1095},
+ {"&Drop down menus", 1096},
+ {"ma&Rk moves down", 1097},
+ {"show &Hidden files", 1098},
+ {"show &Backup files", 1099},
+ {"&Never", 1100},
+ {"on dumb &Terminals", 1101},
+ {"alwa&Ys", 1102},
+ {" Configure options ", 1103},
+ {" Panel options ", 1104},
+ {" Pause after run... ", 1105},
+ {"Configure options", 1106},
+ {"&Add new", 1107},
+ {" External panelize ", 1108},
+ {"External panelize", 1109},
+ {"Other command", 1110},
+ {" Add to external panelize ", 1111},
+ {" Enter command label: ", 1112},
+ {" I can't run external panelize while logged on a non local directory ", 1113},
+ {"Find *.orig after patching", 1114},
+ {"Find SUID and SGID programs", 1115},
+ {"Cannot invoke command.", 1116},
+ {"Pipe close failed", 1117},
+ {"Show this help message", 1118},
+ {"Display brief usage message", 1119},
+ {"MTime", 1120},
+ {"ATime", 1121},
+ {"CTime", 1122},
+ {"Perm", 1123},
+ {"Nl", 1124},
+ {"Inode", 1125},
+ {"UID", 1126},
+ {"GID", 1127},
+ {" %s bytes in %d file%s", 1128},
+ {"Unknow tag on display format: ", 1129},
+ {" Do you really want to execute? ", 1130},
+ {" No action taken ", 1131},
+ {"RenMov", 1132},
+ {"Mkdir", 1133},
{"\
Can't chdir to %s \n\
- %s ", 1066},
- {"Couldn't open named pipe %s\n", 1067},
- {" The shell is still active. Quit anyway? ", 1068},
- {" There are stopped jobs.", 1069},
- {" Quit anyway? ", 1070},
- {"Warning: Couldn't change to %s.\n", 1071},
+ %s ", 1134},
+ {"Couldn't open named pipe %s\n", 1135},
+ {" The shell is still active. Quit anyway? ", 1136},
+ {" There are stopped jobs.", 1137},
+ {" Quit anyway? ", 1138},
+ {"Warning: Couldn't change to %s.\n", 1139},
{"\
Can't open the %s file for writing:\n\
-%s\n", 1072},
- {"Copy \"%s\" directory to:", 1073},
- {"Move \"%s\" directory to:", 1074},
+%s\n", 1140},
+ {"Copy \"%s\" directory to:", 1141},
+ {"Move \"%s\" directory to:", 1142},
{"\
Can't stat the destination \n\
- %s ", 1075},
- {" The destination isn't a directory ", 1076},
- {" Delete %s? ", 1077},
- {"Static", 1078},
- {"Dynamc", 1079},
+ %s ", 1143},
+ {" The destination isn't a directory ", 1144},
+ {" Delete %s? ", 1145},
+ {"Static", 1146},
+ {"Dynamc", 1147},
{"\
Can't chdir to \"%s\" \n\
- %s ", 1080},
- {"Forget", 1081},
- {"Rmdir", 1082},
+ %s ", 1148},
+ {"Forget", 1149},
+ {"Rmdir", 1150},
{"\
Can't write to the %s file:\n\
-%s\n", 1083},
- {" Invalid shell pattern defination \"%c\". ", 1084},
- {" Debug ", 1085},
- {" ERROR: ", 1086},
- {" True: ", 1087},
- {" False: ", 1088},
- {" Warning -- ignoring file ", 1089},
+%s\n", 1151},
+ {" Invalid shell pattern defination \"%c\". ", 1152},
+ {" Debug ", 1153},
+ {" ERROR: ", 1154},
+ {" True: ", 1155},
+ {" False: ", 1156},
+ {" Warning -- ignoring file ", 1157},
{"\
File %s is not owned by root or you or is world writable.\n\
-Using it may compromise your security", 1090},
- {" I can't run programs while logged on a non local directory ", 1091},
- {" User menu ", 1092},
- {"name_trunc: too big", 1093},
- {" Pipe failed ", 1094},
- {" Dup failed ", 1095},
+Using it may compromise your security", 1158},
+ {" I can't run programs while logged on a non local directory ", 1159},
+ {" User menu ", 1160},
+ {"name_trunc: too big", 1161},
+ {" Pipe failed ", 1162},
+ {" Dup failed ", 1163},
{"\
File: \n\
\n\
- ", 1096},
+ ", 1164},
{"\
\n\
\n\
-has been modified, do you want to save the changes?\n", 1097},
- {" Save changes ", 1098},
- {" Can't spawn child program ", 1099},
- {" Empty output from child filter ", 1100},
- {" Could not open file ", 1101},
- {" Can't open file \"", 1102},
+has been modified, do you want to save the changes?\n", 1165},
+ {" Save changes ", 1166},
+ {" Can't spawn child program ", 1167},
+ {" Empty output from child filter ", 1168},
+ {" Could not open file ", 1169},
+ {" Can't open file \"", 1170},
{"\
Can't stat file \n\
- ", 1103},
- {" Can't view: not a regular file ", 1104},
- {"File: %s", 1105},
- {" [grow]", 1106},
- {"Searching for `%s'", 1107},
- {" Search string not found ", 1108},
- {" Invalid regular expression ", 1109},
+ ", 1171},
+ {" Can't view: not a regular file ", 1172},
+ {"File: %s", 1173},
+ {" [grow]", 1174},
+ {"Searching for `%s'", 1175},
+ {" Search string not found ", 1176},
+ {" Invalid regular expression ", 1177},
{"\
The current line number is %d.\n\
- Enter the new line number:", 1110},
- {" Enter regexp:", 1111},
- {"Ascii", 1112},
- {"Hex", 1113},
- {"Line", 1114},
- {"RxSrch", 1115},
- {"EdText", 1116},
- {"EdHex", 1117},
- {"UnWrap", 1118},
- {"Wrap", 1119},
- {"HxSrch", 1120},
- {"Raw", 1121},
- {"Parse", 1122},
- {"Unform", 1123},
- {"Format", 1124},
- {"Function key 1", 1125},
- {"Function key 2", 1126},
- {"Function key 3", 1127},
- {"Function key 4", 1128},
- {"Function key 5", 1129},
- {"Function key 6", 1130},
- {"Function key 7", 1131},
- {"Function key 8", 1132},
- {"Function key 9", 1133},
- {"Function key 10", 1134},
- {"Function key 11", 1135},
- {"Function key 12", 1136},
- {"Function key 13", 1137},
- {"Function key 14", 1138},
- {"Function key 15", 1139},
- {"Function key 16", 1140},
- {"Function key 17", 1141},
- {"Function key 18", 1142},
- {"Function key 19", 1143},
- {"Function key 20", 1144},
- {"Backspace key", 1145},
- {"End key", 1146},
- {"Up arrow key", 1147},
- {"Down arrow key", 1148},
- {"Left arrow key", 1149},
- {"Right arrow key", 1150},
- {"Home key", 1151},
- {"Page Down key", 1152},
- {"Page Up key", 1153},
- {"Insert key", 1154},
- {"Delete key", 1155},
- {"Completion/M-tab", 1156},
- {"+ on keypad", 1157},
- {"- on keypad", 1158},
- {"* on keypad", 1159},
- {"Left arrow keypad", 1160},
- {"Right arrow keypad", 1161},
- {"Up arrow keypad", 1162},
- {"Down arrow keypad", 1163},
- {"Home on keypad", 1164},
- {"End on keypad", 1165},
- {"Page Down keypad", 1166},
- {"Page Up keypad", 1167},
- {"Insert on keypad", 1168},
- {"Delete on keypad", 1169},
- {"Enter on keypad", 1170},
- {"Slash on keypad", 1171},
- {"NumLock on keypad", 1172},
+ Enter the new line number:", 1178},
+ {" Enter regexp:", 1179},
+ {"Ascii", 1180},
+ {"Hex", 1181},
+ {"Line", 1182},
+ {"RxSrch", 1183},
+ {"EdText", 1184},
+ {"EdHex", 1185},
+ {"UnWrap", 1186},
+ {"Wrap", 1187},
+ {"HxSrch", 1188},
+ {"Raw", 1189},
+ {"Parse", 1190},
+ {"Unform", 1191},
+ {"Format", 1192},
+ {"Function key 1", 1193},
+ {"Function key 2", 1194},
+ {"Function key 3", 1195},
+ {"Function key 4", 1196},
+ {"Function key 5", 1197},
+ {"Function key 6", 1198},
+ {"Function key 7", 1199},
+ {"Function key 8", 1200},
+ {"Function key 9", 1201},
+ {"Function key 10", 1202},
+ {"Function key 11", 1203},
+ {"Function key 12", 1204},
+ {"Function key 13", 1205},
+ {"Function key 14", 1206},
+ {"Function key 15", 1207},
+ {"Function key 16", 1208},
+ {"Function key 17", 1209},
+ {"Function key 18", 1210},
+ {"Function key 19", 1211},
+ {"Function key 20", 1212},
+ {"Backspace key", 1213},
+ {"End key", 1214},
+ {"Up arrow key", 1215},
+ {"Down arrow key", 1216},
+ {"Left arrow key", 1217},
+ {"Right arrow key", 1218},
+ {"Home key", 1219},
+ {"Page Down key", 1220},
+ {"Page Up key", 1221},
+ {"Insert key", 1222},
+ {"Delete key", 1223},
+ {"Completion/M-tab", 1224},
+ {"+ on keypad", 1225},
+ {"- on keypad", 1226},
+ {"* on keypad", 1227},
+ {"Left arrow keypad", 1228},
+ {"Right arrow keypad", 1229},
+ {"Up arrow keypad", 1230},
+ {"Down arrow keypad", 1231},
+ {"Home on keypad", 1232},
+ {"End on keypad", 1233},
+ {"Page Down keypad", 1234},
+ {"Page Up keypad", 1235},
+ {"Insert on keypad", 1236},
+ {"Delete on keypad", 1237},
+ {"Enter on keypad", 1238},
+ {"Slash on keypad", 1239},
+ {"NumLock on keypad", 1240},
{"\
Couldn't open %s archive\n\
-%s", 1173},
- {"Inconsistent extfs archive", 1174},
- {"Sorry, we can not do password authenticated connections for now.", 1175},
- {" Could not set source routing (%s)", 1176},
+%s", 1241},
+ {"Inconsistent extfs archive", 1242},
+ {"Sorry, we can not do password authenticated connections for now.", 1243},
+ {"ftpfs: Disconnecting from %s", 1244},
+ {" FTP: Password required for ", 1245},
+ {" Proxy: Password required for ", 1246},
+ {"ftpfs: sending proxy login name", 1247},
+ {"ftpfs: sending proxy user password", 1248},
+ {"ftpfs: proxy authentication succeeded", 1249},
+ {"ftpfs: connected to %s", 1250},
+ {"ftpfs: sending login name", 1251},
+ {"ftpfs: sending user password", 1252},
+ {"ftpfs: logged in", 1253},
+ {"ftpfs: Login incorrect for user %s ", 1254},
+ {" Could not set source routing (%s)", 1255},
+ {"ftpfs: Invalid host name.", 1256},
+ {"ftpfs: Invalid host address.", 1257},
+ {"ftpfs: making connection to %s", 1258},
+ {"ftpfs: connection interrupted by user", 1259},
+ {"ftpfs: connection to server failed: %s", 1260},
+ {"Waiting to retry... %d (Control-C to cancel)", 1261},
+ {"ftpfs: could not setup passive mode for source routing", 1262},
+ {"ftpfs: could not setup passive mode", 1263},
+ {"ftpfs: aborting transfer.", 1264},
+ {"ftpfs: abort error: %s", 1265},
+ {"ftpfs: abort failed", 1266},
+ {"ftpfs: CWD failed.", 1267},
+ {"ftpfs: couldn't resolve symlink", 1268},
+ {"Resolving symlink...", 1269},
+ {"ftpfs: Reading FTP directory %s... (don't use UNIX ls options)", 1270},
+ {"ftpfs: Reading FTP directory %s...", 1271},
+ {"ftpfs: FAIL", 1272},
+ {"ftpfs: reading FTP directory interrupt by user", 1273},
+ {"ftpfs: got listing", 1274},
+ {"ftpfs: failed", 1275},
+ {"ftpfs: failed; nowhere to fallback to", 1276},
+ {"ftpfs: storing file %d (%d)", 1277},
{"\
~/.netrc file has not correct mode.\n\
-Remove password or correct mode.", 1177},
- {" MCFS ", 1178},
- {" The server does not support this version ", 1179},
+Remove password or correct mode.", 1278},
+ {" MCFS ", 1279},
+ {" The server does not support this version ", 1280},
{"\
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", 1180},
- {" Yes ", 1181},
- {" No ", 1182},
- {" The remote server is running on strange port. Giving up.\n", 1183},
- {" MCFS Password required ", 1184},
- {" Invalid password ", 1185},
- {" Too many open connections ", 1186},
+ not be safe on the remote side. Continue? \n", 1281},
+ {" Yes ", 1282},
+ {" No ", 1283},
+ {" The remote server is running on strange port. Giving up.\n", 1284},
+ {" MCFS Password required ", 1285},
+ {" Invalid password ", 1286},
+ {" Too many open connections ", 1287},
{"\
Couldn't open tar archive\n\
-%s", 1187},
- {"Unexpected EOF on archive file", 1188},
- {"Inconsistent tar archive", 1189},
+%s", 1288},
+ {"Unexpected EOF on archive file", 1289},
+ {"Inconsistent tar archive", 1290},
{"\
Hmm,...\n\
%s\n\
-doesn't look like a tar archive.", 1190},
+doesn't look like a tar archive.", 1291},
};
-int _msg_tbl_length = 1190;
+int _msg_tbl_length = 1291;
Binary files old/mc-4.5.27/po/es.gmo and new/mc-4.5.28/po/es.gmo differ
diff -ruN old/mc-4.5.27/po/es.po new/mc-4.5.28/po/es.po
--- old/mc-4.5.27/po/es.po Thu Mar 18 20:42:35 1999
+++ new/mc-4.5.28/po/es.po Fri Mar 26 15:30:47 1999
@@ -2,6 +2,13 @@
# Copyright (C) 1999 Free Software Foundation, Inc.
# David Mart�n <dmartina@mailexcite.com>, 1998.
#
+# DHMA 19990320
+# Merged to include new strings in gmc-4.5.27 (beta). Ftpfs translations.
+#
+# DHMA 19990314:
+# Done first translations for ALL gmc "fuzzy" messages. Some
+# tweaking might be needed.
+#
# DHMA 19990307:
# Added last messages in editcmd.c. Some refinements as file dates and
# translated "stat" as "identificar"
@@ -18,9 +25,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 4.5.23\n"
-"POT-Creation-Date: 1999-03-07 15:56+0100\n"
-"PO-Revision-Date: 1999-03-07 15:56+0100\n"
+"Project-Id-Version: 4.5.28\n"
+"POT-Creation-Date: 1999-03-20 12:17+0100\n"
+"PO-Revision-Date: 1999-03-19 22:56+0100\n"
"Last-Translator: David Mart�n <dmartina@mailexcite.com>\n"
"Language-Team: Spanish <es@li.org>\n"
"MIME-Version: 1.0\n"
@@ -31,14 +38,15 @@
msgid " Emacs key: "
msgstr " Tecla Emacs: "
-#: edit/edit_key_translator.c:133
+#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148
msgid " Execute Macro "
-msgstr " Ejecuta macro "
+msgstr " Ejecutar macro "
#. Input line for a single key press follows the ':'
-#: edit/edit_key_translator.c:133 gtkedit/editcmd.c:707 gtkedit/editcmd.c:716
+#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148
+#: gtkedit/editcmd.c:707 gtkedit/editcmd.c:716
msgid " Press macro hotkey: "
-msgstr " Teclee la tecla de macro: "
+msgstr " Pulse la tecla de macro: "
#: edit/edit_key_translator.c:144
msgid " Insert Literal "
@@ -52,384 +60,478 @@
msgid " There is no other panel to compare contents to "
msgstr " No existe otro panel para comparar el contenido "
-#: gnome/gcmd.c:106
+#: gnome/gcmd.c:112
msgid "GNU Midnight Commander"
msgstr "GNU Midnight Commander"
-#: gnome/gcmd.c:109
+#: gnome/gcmd.c:115
msgid "The GNOME edition of the Midnight Commander file manager."
msgstr "La edici�n GNOME del manejador de archivos Midnight Commander."
-#: gnome/gcmd.c:121 src/main.c:827 src/screen.c:2047
+#: gnome/gcmd.c:127 src/main.c:844 src/screen.c:2067
msgid " The Midnight Commander "
msgstr " The Midnight Commander "
-#: gnome/gcmd.c:122 src/main.c:828
+#: gnome/gcmd.c:128 src/main.c:845
msgid " Do you really want to quit the Midnight Commander? "
msgstr " �Realmente quiere salir del Midnight Commander? "
-#: gnome/gcmd.c:123 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1813
-#: src/file.c:2195 src/filegui.c:573 src/hotlist.c:1035 src/main.c:829
-#: src/screen.c:2049 src/subshell.c:701 src/subshell.c:727 src/tree.c:755
+#: gnome/gcmd.c:129 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1859
+#: src/file.c:2231 src/filegui.c:602 src/hotlist.c:1035 src/main.c:846
+#: src/screen.c:2069 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
#: src/view.c:404
msgid "&Yes"
msgstr "&S�"
-#: gnome/gcmd.c:123 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1813
-#: src/file.c:2195 src/filegui.c:572 src/hotlist.c:1035 src/main.c:829
-#: src/screen.c:2049 src/subshell.c:701 src/subshell.c:727 src/tree.c:755
+#: gnome/gcmd.c:129 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1859
+#: src/file.c:2231 src/filegui.c:601 src/hotlist.c:1035 src/main.c:846
+#: src/screen.c:2069 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
#: src/view.c:404
msgid "&No"
msgstr "&No"
-#: gnome/gcmd.c:220
+#: gnome/gcmd.c:268
msgid "Sort By"
msgstr "Ordenar"
#. we define this up here so we can pass it in to our callback
-#: gnome/gcmd.c:225
+#: gnome/gcmd.c:273
msgid "Ignore case sensitivity."
msgstr "No distinguir ma&Y�sculas."
-#: gnome/gcmd.c:233 src/chmod.c:150 src/screen.c:425
+#: gnome/gcmd.c:281 gnome/gcustom-layout.c:42 src/chmod.c:150 src/screen.c:425
msgid "Name"
msgstr "Nombre"
-#: gnome/gcmd.c:240
+#: gnome/gcmd.c:288
msgid "File Type"
msgstr "Tipo de Archivo"
-#: gnome/gcmd.c:246 src/screen.c:426 src/screen.c:427
+#: gnome/gcmd.c:294 gnome/gcustom-layout.c:46 src/screen.c:426
+#: src/screen.c:427
msgid "Size"
msgstr "Tama�o"
-#: gnome/gcmd.c:252
+#: gnome/gcmd.c:300
msgid "Time Last Accessed"
msgstr "Fecha de Acceso"
-#: gnome/gcmd.c:258
+#: gnome/gcmd.c:306
msgid "Time Last Modified"
msgstr "Fecha de Modificaci�n"
-#: gnome/gcmd.c:264
+#: gnome/gcmd.c:312
msgid "Time Last Changed"
msgstr "Fecha de Cambio"
-#: gnome/gcmd.c:278
+#: gnome/gcmd.c:326
msgid "Reverse the order."
msgstr "Invertir el orden."
-#: gnome/gcmd.c:340
-#, fuzzy
+#: gnome/gcmd.c:389
msgid "Enter name."
-msgstr "Due�o"
+msgstr "Teclee nombre."
-#: gnome/gcmd.c:346
-#, fuzzy
+#: gnome/gcmd.c:395
msgid "Enter label for command:"
-msgstr " Etiqueta del comando: "
+msgstr "Teclee etiqueta del comando:"
-#: gnome/gcmd.c:441
-#, fuzzy
+#: gnome/gcmd.c:494
msgid "Find all core files"
-msgstr "me&Zclar todos los archivos"
+msgstr "Buscar ficheros \"core\""
-#: gnome/gcmd.c:444 src/panelize.c:350
+#: gnome/gcmd.c:497 src/panelize.c:350
msgid "Find rejects after patching"
msgstr "Buscar archivos rechazados despu�s de aplicar parches"
-#: gnome/gcmd.c:486
+#: gnome/gcmd.c:541
msgid "Run Command"
msgstr "Ejecutar Comando"
#. Frame 1
-#: gnome/gcmd.c:491
+#: gnome/gcmd.c:546
msgid "Preset Commands"
msgstr "Comandos Predefinidos"
-#: gnome/gcmd.c:508
+#. add add/remove buttons in center
+#: gnome/gcmd.c:563 gnome/gcustom-layout.c:181
msgid "Add"
msgstr "A�adir"
-#: gnome/gcmd.c:512
+#: gnome/gcmd.c:567 gnome/gcustom-layout.c:182
msgid "Remove"
msgstr "Quitar"
#. Frame 2
-#: gnome/gcmd.c:520
+#: gnome/gcmd.c:575
msgid "Run this Command"
msgstr "Ejecutar este Comando"
-#: gnome/gcmd.c:527
+#: gnome/gcmd.c:582
msgid "Command: "
msgstr "Comando: "
-#: gnome/gcmd.c:588
-#, fuzzy
+#: gnome/gcmd.c:645
msgid "Set Filter"
-msgstr " Filtro "
+msgstr "Activar Filtro"
-#: gnome/gcmd.c:593 gnome/gcmd.c:634 gnome/gcmd.c:639 gnome/gcmd.c:643
-#: gnome/gscreen.c:2582
-#, fuzzy
+#: gnome/gcmd.c:650 gnome/gcmd.c:691 gnome/gcmd.c:696 gnome/gcmd.c:700
+#: gnome/gscreen.c:2516
msgid "Show all files"
-msgstr "me&Zclar todos los archivos"
+msgstr "Mostrar todos los archivos"
-#: gnome/gcmd.c:600
+#: gnome/gcmd.c:657
msgid "."
-msgstr ""
+msgstr "."
-#: gnome/gcmd.c:616
+#: gnome/gcmd.c:673
msgid ""
"Enter a filter here for files in the panel view.\n"
"\n"
"For example:\n"
"*.gif will show just gif images"
msgstr ""
+"Indique un filtro para escoger los ficheros del panel.\n"
+"\n"
+"As�, por ejemplo:\n"
+"*.gif mostrar� s�lo im�genes tipo GIF"
-#: gnome/gcmd.c:618
+#: gnome/gcmd.c:675
msgid "Enter a Regular Expression to filter files in the panel view."
-msgstr ""
+msgstr "Indique una expresi�n regular para escoger los ficheros del panel."
-#: gnome/gcmd.c:675 gnome/gpopup.c:53
+#: gnome/gcmd.c:732
msgid " Open with..."
msgstr " Abrir con..."
-#: gnome/gcmd.c:676 gnome/gpopup.c:54
+#: gnome/gcmd.c:733
msgid "Enter extra arguments:"
msgstr "Teclee argumentos extras:"
-#: gnome/gdesktop.c:392 gnome/gdesktop.c:1841
+#: gnome/gcustom-layout.c:35
+msgid "Access Time"
+msgstr "Fecha de Acceso"
+
+#: gnome/gcustom-layout.c:36
+msgid "Creation Time"
+msgstr "Fecha de Cambio"
+
+#. Group
+#: gnome/gcustom-layout.c:37 gnome/gnome-file-property-dialog.c:776
+#: gnome/gnome-file-property-dialog.c:940 gnome/gprop.c:280 gnome/gprop.c:405
+#: src/screen.c:439
+msgid "Group"
+msgstr "Grupo"
+
+#: gnome/gcustom-layout.c:38
+msgid "Group ID"
+msgstr "ID Grupo"
+
+#: gnome/gcustom-layout.c:39
+msgid "Inode Number"
+msgstr "N�mero de Inodo"
+
+#: gnome/gcustom-layout.c:40 src/achown.c:378
+msgid "Mode"
+msgstr "Modo"
+
+#: gnome/gcustom-layout.c:41
+msgid "Modification Time"
+msgstr "Fecha de Modificaci�n"
+
+#: gnome/gcustom-layout.c:43
+msgid "Number of Hard Links"
+msgstr "N�mero de Enlaces"
+
+#. Owner
+#: gnome/gcustom-layout.c:44 gnome/gnome-file-property-dialog.c:925
+#: gnome/gprop.c:390 src/screen.c:438
+msgid "Owner"
+msgstr "Due�o"
+
+#: gnome/gcustom-layout.c:45 src/screen.c:432
+msgid "Permission"
+msgstr "Permisos"
+
+#: gnome/gcustom-layout.c:47
+msgid "Size (short)"
+msgstr "Tama�o (corto)"
+
+#: gnome/gcustom-layout.c:48
+msgid "Type"
+msgstr "Tipo"
+
+#: gnome/gcustom-layout.c:49
+msgid "User ID"
+msgstr "ID Usuario"
+
+#: gnome/gcustom-layout.c:140
+msgid "Possible Columns"
+msgstr "Columnas Posibles"
+
+#: gnome/gcustom-layout.c:160
+msgid "Displayed Columns"
+msgstr "Columnas Visibles"
+
+#: gnome/gcustom-layout.c:299
+msgid "Custom View"
+msgstr "Vista Personalizada"
+
+#: gnome/gdesktop.c:420 gnome/gdesktop.c:2070
msgid "Warning"
msgstr "� Atenci�n !"
-#: gnome/gdesktop.c:393
-#, fuzzy, c-format
+#: gnome/gdesktop.c:421
+#, c-format
msgid "Could not open %s; will not have desktop icons"
-msgstr "No pude abrir %s; no habr� iconos en el escritorio al arrancar"
+msgstr "No pude abrir %s; no habr� iconos en el escritorio"
-#: gnome/gdesktop.c:983
+#: gnome/gdesktop.c:1014
msgid "While running the mount/umount command"
-msgstr ""
+msgstr "Al ejecutar mount/umount"
-#: gnome/gdesktop.c:1032
+#: gnome/gdesktop.c:1083
msgid "While running the eject command"
-msgstr ""
+msgstr "Al ejecutar eject"
-#: gnome/gdesktop.c:1072 gnome/gicon.c:154 gnome/gtools.c:52
+#: gnome/gdesktop.c:1136 gnome/gicon.c:154 gnome/gtools.c:52
msgid "Error"
msgstr "Error"
#. Create the link to the user's home directory so that he will have an icon
-#: gnome/gdesktop.c:1837
+#: gnome/gdesktop.c:2066
msgid "Home directory"
msgstr "Directorio personal"
-#: gnome/gdesktop.c:1842
+#: gnome/gdesktop.c:2071
#, c-format
msgid "Could not symlink %s to %s; will not have initial desktop icons."
msgstr ""
"No pude enlazar simb�licamente %s a %s; no habr� iconos en el escritorio al "
"arrancar"
-#: gnome/gdesktop.c:2173 gnome/glayout.c:410
-#, fuzzy
+#: gnome/gdesktop.c:2400 gnome/glayout.c:355
+msgid "_Terminal"
+msgstr "_Terminal"
+
+#: gnome/gdesktop.c:2400 gnome/glayout.c:355
+msgid "Launch a new terminal in the current directory"
+msgstr "Abre un nuevo terminal en el directorio actual"
+
+#. If this ever changes, make sure you update create_new_menu accordingly.
+#: gnome/gdesktop.c:2402 gnome/glayout.c:357
+msgid "_Directory..."
+msgstr "_Directorio..."
+
+#: gnome/gdesktop.c:2402 gnome/glayout.c:357
+msgid "Creates a new directory"
+msgstr "Crea un directorio nuevo"
+
+#: gnome/gdesktop.c:2410 gnome/glayout.c:440
msgid "Arrange Icons"
-msgstr "Ordenar iconos"
+msgstr "Ordena iconos"
-#: gnome/gdesktop.c:2175
-#, fuzzy
+#: gnome/gdesktop.c:2411
msgid "Create New Window"
-msgstr "Ventana _nueva"
+msgstr "Abre una ventana nueva"
-#: gnome/gdesktop.c:2177
+#: gnome/gdesktop.c:2413
msgid "Rescan Mountable Devices"
-msgstr ""
+msgstr "Recuenta dispositivos montables"
-#: gnome/gdesktop.c:2178 gnome/glayout.c:413
-#, fuzzy
+#: gnome/gdesktop.c:2414 gnome/glayout.c:443
msgid "Rescan Desktop"
-msgstr "_Refrescar Directorio"
+msgstr "Relee escritorio"
-#: gnome/gdialogs.c:58
+#: gnome/gdialogs.c:59
msgid "To: "
-msgstr ""
+msgstr "A: "
-#: gnome/gdialogs.c:59
+#: gnome/gdialogs.c:60
msgid "Copying from: "
-msgstr ""
+msgstr "Copiando de: "
-#: gnome/gdialogs.c:60
-#, fuzzy
+#: gnome/gdialogs.c:61
msgid "Deleting file: "
-msgstr "Borrando"
+msgstr "Borrando fichero: "
-#: gnome/gdialogs.c:340
+#: gnome/gdialogs.c:368
msgid "Files Exist"
msgstr "El archivo ya existe"
-#: gnome/gdialogs.c:352
+#: gnome/gdialogs.c:383
msgid ""
"Some of the files you are trying to copy already exist in the destination "
-"folder."
+"folder. Please select the action to be performed."
msgstr ""
-"Algunos de los ficheros que intenta copiar existen ya en la carpeta destino"
+"Algunos de los ficheros que intenta copiar existen ya en la carpeta "
+"destino.Por favor, escoja la acci�n a realizar."
-#: gnome/gdialogs.c:361
+#: gnome/gdialogs.c:396
msgid "Prompt me before overwriting any file."
msgstr "Confirmar ante de sobrescribir ning�n archivo."
-#: gnome/gdialogs.c:368
+#: gnome/gdialogs.c:403
msgid "Don't overwrite any files."
msgstr "No sobrescribir ning�n archivo."
-#: gnome/gdialogs.c:380
+#: gnome/gdialogs.c:419
msgid "Overwrite:"
msgstr "Sobrescribir:"
-#: gnome/gdialogs.c:387
+#: gnome/gdialogs.c:426
msgid "Older files."
msgstr "Archivos m�s antiguos."
-#: gnome/gdialogs.c:393
+#: gnome/gdialogs.c:432
msgid "Files only if size differs."
msgstr "S�lo si el tama�o difiere."
-#: gnome/gdialogs.c:399
+#: gnome/gdialogs.c:438
msgid "All files."
msgstr "Todos los archivos."
-#: gnome/gdialogs.c:448
-#, fuzzy
+#: gnome/gdialogs.c:478
msgid "File Exists"
msgstr "El archivo ya existe"
-#: gnome/gdialogs.c:454
-#, fuzzy, c-format
+#: gnome/gdialogs.c:484
+#, c-format
msgid "The target file already exists: %s"
-msgstr "�El archivo destino \"%s\" ya existe!"
+msgstr "El archivo destino ya existe: %s"
-#: gnome/gdialogs.c:461
-#, fuzzy
+#: gnome/gdialogs.c:491
msgid "Replace it?"
-msgstr " Reemplazar "
+msgstr " �Reemplazarlo? "
-#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1067 src/file.c:789
-#: src/screen.c:2288 src/screen.c:2318 src/tree.c:1024
+#: gnome/gdialogs.c:565 gtkedit/editwidget.c:1067 src/file.c:802
+#: src/screen.c:2308 src/screen.c:2338 src/tree.c:1024
msgid "Copy"
msgstr "Copiar"
-#: gnome/gdialogs.c:535 gtkedit/editwidget.c:1068
+#: gnome/gdialogs.c:568 gtkedit/editwidget.c:1068
msgid "Move"
msgstr "Mover"
-#: gnome/gdialogs.c:552
+#: gnome/gdialogs.c:585
msgid "Destination"
msgstr "Destino"
-#: gnome/gdialogs.c:556
+#: gnome/gdialogs.c:589
msgid "Find Destination Folder"
msgstr "Buscar Carpeta Destino"
-#: gnome/gdialogs.c:561
+#: gnome/gdialogs.c:594
msgid "Copy as a background process"
msgstr "Copiar en 2� plano"
-#: gnome/gdialogs.c:581
+#: gnome/gdialogs.c:614
msgid "Advanced Options"
msgstr "Opciones Avanzadas"
-#: gnome/gdialogs.c:585
+#: gnome/gdialogs.c:618
msgid "Preserve symlinks"
msgstr "Preservar enlaces simb�licos"
-#: gnome/gdialogs.c:595
+#: gnome/gdialogs.c:628
msgid "Follow links."
msgstr "Seguir los enlaces."
-#: gnome/gdialogs.c:600
+#: gnome/gdialogs.c:634
msgid ""
"Selecting this will copy the files that symlinks point to instead of just "
"copying the link."
-msgstr ""
+msgstr "Esto har� que realmente se copie el fichero y no el enlace simb�lico"
-#: gnome/gdialogs.c:604
+#: gnome/gdialogs.c:639
msgid "Preserve file attributes."
msgstr "Preservar atributos de archivo."
-#: gnome/gdialogs.c:608
+#: gnome/gdialogs.c:644
msgid "Preserves the permissions and the UID/GID if possible"
-msgstr ""
+msgstr "Preserva permisos y los bits UID/GID cuando sea posible"
-#: gnome/gdialogs.c:613
+#: gnome/gdialogs.c:650
msgid "Recursively copy subdirectories."
msgstr "Copiar subdirectorios recursivamente."
-#: gnome/gdialogs.c:617
+#: gnome/gdialogs.c:655
msgid "If set, this will copy the directories recursively"
-msgstr ""
+msgstr "Esto hara que se copien los subdirectorios"
-#: gnome/gdialogs.c:720
-#, fuzzy, c-format
+#: gnome/gdialogs.c:759
+#, c-format
msgid ""
"%s\n"
"\n"
"Directory not empty. Delete it recursively?"
msgstr ""
-"\n"
-" El directorio no est� vac�o.\n"
-" �Borrarlo recursivamente? "
+"%s\n"
+"El directorio no est� vac�o.\n"
+"�Desea borrarlo recursivamente?"
-#: gnome/gdialogs.c:729 src/file.c:2190
+#: gnome/gdialogs.c:768 src/file.c:2226
msgid " Delete: "
msgstr " Borrar: "
-#: gnome/gdialogs.c:733
-#, fuzzy
+#: gnome/gdialogs.c:772
msgid "Do the same for the rest"
-msgstr "Cambia el modo de listado"
+msgstr "Hace lo misno con el resto"
-#: gnome/gdialogs.c:802
-#, fuzzy
+#: gnome/gdialogs.c:841
msgid "Move Progress"
-msgstr "Mover aqu�"
+msgstr "Progreso al mover"
-#: gnome/gdialogs.c:805
-#, fuzzy
+#: gnome/gdialogs.c:844
msgid "Copy Progress"
-msgstr "Copiar aqu�"
+msgstr "Progreso al copiar"
-#: gnome/gdialogs.c:808
-#, fuzzy
+#: gnome/gdialogs.c:847
msgid "Delete Progress"
-msgstr "Tecla Eliminar"
+msgstr "Progreso al borrar"
-#: gnome/gdialogs.c:853
+#: gnome/gdialogs.c:892
msgid "File "
msgstr "Archivo "
-#: gnome/gdialogs.c:857
+#: gnome/gdialogs.c:896
msgid " is "
msgstr " es "
-#: gnome/gdialogs.c:860
+#: gnome/gdialogs.c:899
msgid " Done."
msgstr " Hecho."
+#. Translators should take care as "Password" or its translations
+#. are used to identify password boxes and hide characters with "*"
+#: gnome/gdialogs.c:959 src/wtools.c:587 vfs/vfs.c:1762
+msgid "Password:"
+msgstr "Contrase�a:"
+
+#. Create the dialog
+#: gnome/gdialogs.c:991
+msgid "Symbolic Link"
+msgstr "Enlace Simb�lico "
+
+#: gnome/gdialogs.c:1007 src/boxes.c:803
+msgid "Existing filename (filename symlink will point to):"
+msgstr "Apuntando a:"
+
+#: gnome/gdialogs.c:1021 src/boxes.c:801
+msgid "Symbolic link filename:"
+msgstr "Nombre del nuevo enlace simb�lico:"
+
#: gnome/gdnd.c:51
-#, fuzzy
msgid "_Move here"
-msgstr "Mover aqu�"
+msgstr "_Mover aqu�"
#: gnome/gdnd.c:52
-#, fuzzy
msgid "_Copy here"
-msgstr "Copiar aqu�"
+msgstr "_Copiar aqu�"
#: gnome/gdnd.c:53
-#, fuzzy
msgid "_Link here"
-msgstr "Crear enlace aqu�"
+msgstr "Crear en_lace aqu�"
#: gnome/gdnd.c:55
msgid "Cancel drag"
@@ -442,28 +544,78 @@
"Could not stat %s\n"
"%s"
msgstr ""
-"No puedo identificar archivo %s\n"
+"No puedo identificar %s\n"
"%s"
#: gnome/gicon.c:154
-#, fuzzy
msgid "Default set of icons not found, please check your installation"
msgstr "Los iconos b�sicos no fueron encontrados, revise su instalaci�n"
-#: gnome/glayout.c:264
-#, fuzzy
+#: gnome/glayout.c:40
+msgid "_Icon View"
+msgstr "_Iconos"
+
+#: gnome/glayout.c:41 gnome/glayout.c:57
+msgid "Switch view to an icon display"
+msgstr "Muestra iconos"
+
+#: gnome/glayout.c:43
+msgid "_Brief View"
+msgstr "Listado _breve"
+
+#: gnome/glayout.c:44 gnome/glayout.c:60
+msgid "Switch view to show just file name and type"
+msgstr "Muestrs s�lo nombre y tipo de fichero"
+
+#: gnome/glayout.c:46
+msgid "_Detailed View"
+msgstr "Listado _detallado"
+
+#: gnome/glayout.c:47 gnome/glayout.c:63
+msgid "Switch view to show detailed file statistics"
+msgstr "Muestar informaci�n detallada de los ficheros"
+
+#: gnome/glayout.c:49
+msgid "_Custom View"
+msgstr "Listado Personalizado"
+
+#: gnome/glayout.c:50 gnome/glayout.c:66
+msgid "Switch view to show user-defined statistics"
+msgstr "Muestra m�s o menos detalles, a gusto del usuario"
+
+#: gnome/glayout.c:56
+msgid "Icons"
+msgstr "Iconos"
+
+#: gnome/glayout.c:59
+msgid "Brief"
+msgstr "Breve"
+
+#: gnome/glayout.c:62
+msgid "Detailed"
+msgstr "Detallado"
+
+#: gnome/glayout.c:65
+msgid "Custom"
+msgstr "Personalizado"
+
+#: gnome/glayout.c:302
msgid "Enter command to run"
-msgstr " Etiqueta del comando: "
+msgstr "Teclee el comando a ejecutar"
-#: gnome/glayout.c:277
+#: gnome/glayout.c:315
msgid ""
"Notice that if you choose to terminate the file manager, you will\n"
"also terminate the GNOME desktop handler.\n"
"\n"
-"Are you sure you want to quit?"
+"Are you sure you want to exit?"
msgstr ""
+"Observe que si cierra el gestor de archivos, tambi�n acabar�\n"
+"con el gestor del escritorio GNOME.\n"
+"\n"
+"�Desea realmente salir del programa?"
-#: gnome/glayout.c:289
+#: gnome/glayout.c:327
msgid ""
"The file manager and the desktop handler are now terminating\n"
"\n"
@@ -472,293 +624,484 @@
"\n"
"Press OK to terminate the application, or cancel to continue using it."
msgstr ""
+"El gestor de archivos y el escritorio se van a cerrar\n"
+"\n"
+"Para activarlos de nuevo puede usar el Panel\n"
+"o ejecutar el comando UNIX `gmc'\n"
+"\n"
+"Pulse Aceptar para acabar el programa o Cancelar para seguir con �l."
-#: gnome/glayout.c:317
-msgid "_Terminal"
-msgstr "_Terminal"
-
-#: gnome/glayout.c:317
-#, fuzzy
-msgid "Launch a new terminal in the current directory"
-msgstr "Pega ficheros del almac�n en el directorio actual."
-
-#. If this ever changes, make sure you update create_new_menu accordingly.
-#: gnome/glayout.c:319
-msgid "_Directory..."
-msgstr "_Directorio..."
-
-#: gnome/glayout.c:319
-msgid "Creates a new directory"
-msgstr "Crea un directorio nuevo"
-
-#. GNOMEUIINFO_ITEM_NONE( N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd },
-#: gnome/glayout.c:340
+#. GNOMEUIINFO_ITEM_NONE(N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd },
+#: gnome/glayout.c:378
msgid "_Copy..."
msgstr "_Copiar..."
-#: gnome/glayout.c:340
+#: gnome/glayout.c:378
msgid "Copy files"
msgstr "Copia archivos"
-#: gnome/glayout.c:341
+#: gnome/glayout.c:379
msgid "_Delete..."
msgstr "_Borrar..."
-#: gnome/glayout.c:341
+#: gnome/glayout.c:379
msgid "Delete files"
msgstr "Elimina archivos"
-#: gnome/glayout.c:342
+#: gnome/glayout.c:380
msgid "_Move..."
msgstr "_Mover..."
-#: gnome/glayout.c:342
+#: gnome/glayout.c:380
msgid "Rename or move files"
msgstr "Renombra o mueve archivos"
-#: gnome/glayout.c:344
+#: gnome/glayout.c:382
msgid "Show directory sizes"
-msgstr "Muestra el tama�o de los directorios"
+msgstr "Mostar tama�o directorios"
-#: gnome/glayout.c:344
+#: gnome/glayout.c:382
msgid "Shows the disk space used by each directory"
-msgstr ""
+msgstr "Muestra el espacio en disco usado por cada directorio"
-#: gnome/glayout.c:351
+#: gnome/glayout.c:389
msgid "Select _All"
msgstr "Seleccion_ar Todo"
-#: gnome/glayout.c:351
+#: gnome/glayout.c:389
msgid "Select all files in the current Panel"
msgstr "Selecciona todos los ficheros del panel"
-#: gnome/glayout.c:353
+#: gnome/glayout.c:391
msgid "_Select Files..."
msgstr "_Seleccionar Archivos..."
-#: gnome/glayout.c:353
+#: gnome/glayout.c:391
msgid "Select a group of files"
msgstr "Selecciona un grupo de archivos."
-#: gnome/glayout.c:354
+#: gnome/glayout.c:392
msgid "_Invert Selection"
msgstr "_Invertir Selecci�n"
-#: gnome/glayout.c:354
+#: gnome/glayout.c:392
msgid "Reverses the list of tagged files"
msgstr "Selecciona los archivos desmarcados y viceversa."
-#: gnome/glayout.c:356
+#: gnome/glayout.c:394
msgid "_Rescan Directory"
msgstr "_Refrescar Directorio"
-#: gnome/glayout.c:356
+#: gnome/glayout.c:394
msgid "Rescan the directory contents"
msgstr "Relee el contenido del directorio"
-#: gnome/glayout.c:363
-msgid "Icon View"
-msgstr "Iconos"
-
-#: gnome/glayout.c:364
-msgid "Partial View"
-msgstr "Listado Breve"
-
-#: gnome/glayout.c:365
-msgid "Full View"
-msgstr "Listado Completo"
-
-#: gnome/glayout.c:366
-msgid "Custom View"
-msgstr "Listado Personalizado"
-
-#: gnome/glayout.c:371
+#: gnome/glayout.c:401
msgid "_Sort By..."
msgstr "_Ordenar..."
-#: gnome/glayout.c:371
+#: gnome/glayout.c:401
msgid "Confirmation settings"
msgstr "Opciones de confirmaci�n"
-#: gnome/glayout.c:372
+#: gnome/glayout.c:402
msgid "_Filter View..."
msgstr "Ver _Filtrado..."
-#: gnome/glayout.c:372
+#: gnome/glayout.c:402
msgid "Global option settings"
msgstr "Opciones generales"
-#: gnome/glayout.c:379
+#: gnome/glayout.c:409
msgid "_Find File..."
msgstr "_Buscar archivos..."
-#: gnome/glayout.c:379
+#: gnome/glayout.c:409
msgid "Locate files on disk"
msgstr "Busca archivos en disco"
#. { GNOME_APP_UI_ITEM, N_("_Compare panels..."), N_("Compare two panel contents"), gnome_compare_panels },
-#: gnome/glayout.c:382
+#: gnome/glayout.c:412
msgid "_Run Command..."
msgstr "Ejecuta_r Comando..."
-#: gnome/glayout.c:382
-#, fuzzy
+#: gnome/glayout.c:412
msgid "Runs a command"
-msgstr "Ejecutar Comando"
+msgstr "Ejecuta un comando"
-#: gnome/glayout.c:384
+#: gnome/glayout.c:414
msgid "_Run Command in panel..."
msgstr "Ejecuta_r Comando en panel..."
-#: gnome/glayout.c:384
+#: gnome/glayout.c:414
msgid "Run a command and put the results in a panel"
-msgstr "Ejecutar un comando y mostrar resultados en un panel"
+msgstr "Ejecut un comando y muestra los resultados en un panel"
-#: gnome/glayout.c:394
+#: gnome/glayout.c:424
msgid "_Background jobs..."
msgstr "Procesos en 2� plano..."
-#: gnome/glayout.c:394
+#: gnome/glayout.c:424
msgid "List of background operations"
msgstr "Lista de procesos en 2� plano"
-#: gnome/glayout.c:397
+#: gnome/glayout.c:427
msgid "Exit"
msgstr "Salir"
-#: gnome/glayout.c:397
-#, fuzzy
+#: gnome/glayout.c:427
msgid "Terminates the file manager and the desktop"
-msgstr "Ordena los iconos del escritorio"
+msgstr "Finaliza el getor de archivos y cierra el escritorio"
-#: gnome/glayout.c:412
+#: gnome/glayout.c:442
msgid "Rescan System Devices"
-msgstr ""
+msgstr "Recontar dispositivos del sistema"
-#: gnome/glayout.c:420 gnome/glayout.c:430
+#: gnome/glayout.c:450 gnome/glayout.c:460
msgid "_Layout"
msgstr "_Presentaci�n"
-#: gnome/glayout.c:421 gnome/glayout.c:431
+#: gnome/glayout.c:451 gnome/glayout.c:461
msgid "_Commands"
msgstr "_Comandos"
-#: gnome/glayout.c:422
-#, fuzzy
+#: gnome/glayout.c:452
msgid "_Desktop"
msgstr "Escritorio"
-#: gnome/glayout.c:423 gnome/glayout.c:432
+#: gnome/glayout.c:453 gnome/glayout.c:462
msgid "_Help"
msgstr "A_yuda"
-#: gnome/glayout.c:484
-#, fuzzy
+#: gnome/glayout.c:600
msgid "File/New/Directory..."
-msgstr "Directorio nuevo..."
+msgstr "Archivo/Nuevo/Directorio..."
-#: gnome/gpopup.c:258 gnome/gpopup.c:259
-msgid "Properties"
-msgstr "Propiedades..."
-
-#: gnome/gpopup.c:260
-msgid "Mount device"
-msgstr ""
+#. we set the file part
+#: gnome/gnome-file-property-dialog.c:170
+msgid "Full Name: "
+msgstr "Nombre Completo: "
+
+#: gnome/gnome-file-property-dialog.c:178
+msgid "File Name"
+msgstr "Nombre de Archivo"
+
+#: gnome/gnome-file-property-dialog.c:201
+msgid "File Type: "
+msgstr "Tipo de Archivo: "
+
+#: gnome/gnome-file-property-dialog.c:207
+msgid "File Type: Symbolic Link"
+msgstr "Tipo de Fichero: Enlace Simb�lico "
+
+#: gnome/gnome-file-property-dialog.c:212
+msgid "Target Name: INVALID LINK"
+msgstr "Nombre Destino: ENLACE NO VALIDO"
+
+#: gnome/gnome-file-property-dialog.c:215
+msgid "Target Name: "
+msgstr "Nombre Destino: "
+
+#: gnome/gnome-file-property-dialog.c:220
+msgid "File Type: Directory"
+msgstr "Tipo de Fichero: Directorio"
+
+#: gnome/gnome-file-property-dialog.c:222
+msgid "File Type: Character Device"
+msgstr "Tipo de Fichero: Dispositivo (Car�cter)"
+
+#: gnome/gnome-file-property-dialog.c:224
+msgid "File Type: Block Device"
+msgstr "Tipo de Fichero: Dispositivo (Bloque)"
+
+#: gnome/gnome-file-property-dialog.c:226
+msgid "File Type: Socket"
+msgstr "Tipo de Fichero: Socket"
+
+#: gnome/gnome-file-property-dialog.c:228
+msgid "File Type: FIFO"
+msgstr "Tipo de Archivo: Tuber�a"
+
+#: gnome/gnome-file-property-dialog.c:238
+#: gnome/gnome-file-property-dialog.c:242
+#: gnome/gnome-file-property-dialog.c:248
+msgid "File Size: "
+msgstr "Tama�o: "
+
+#: gnome/gnome-file-property-dialog.c:238
+msgid " bytes"
+msgstr "% bytes"
+
+#: gnome/gnome-file-property-dialog.c:242
+msgid " KBytes ("
+msgstr " KBytes ("
+
+#: gnome/gnome-file-property-dialog.c:243
+#: gnome/gnome-file-property-dialog.c:249
+msgid " bytes)"
+msgstr " bytes)"
+
+#: gnome/gnome-file-property-dialog.c:248
+msgid " MBytes ("
+msgstr " MBytes ("
+
+#: gnome/gnome-file-property-dialog.c:256
+msgid "File Size: N/A"
+msgstr "Tama�o: No disponible"
+
+#: gnome/gnome-file-property-dialog.c:267
+msgid "File Created on: "
+msgstr "Fecha de Cambio: "
+
+#: gnome/gnome-file-property-dialog.c:276
+msgid "Last Modified on: "
+msgstr "Fecha de Modificaci�n: "
+
+#: gnome/gnome-file-property-dialog.c:285
+msgid "Last Accessed on: "
+msgstr "Fecha de Acceso: "
+
+#: gnome/gnome-file-property-dialog.c:303
+msgid "URL:"
+msgstr "URL:"
+
+#: gnome/gnome-file-property-dialog.c:310
+msgid "Caption:"
+msgstr "R�tulo:"
-#: gnome/gpopup.c:261
-msgid "Unmount device"
-msgstr ""
-
-#: gnome/gpopup.c:262
-msgid "Eject device"
-msgstr ""
-
-#: gnome/gpopup.c:264 gnome/gpopup.c:265
+#. we do open first
+#: gnome/gnome-file-property-dialog.c:469 gnome/gpopup2.c:187
msgid "Open"
msgstr "Abrir"
-#: gnome/gpopup.c:266
-msgid "Open with"
-msgstr "Abrir con..."
+#: gnome/gnome-file-property-dialog.c:479
+msgid "Use default Open action"
+msgstr "Realiza la acci�n predefinida para Abrir"
+
+#: gnome/gnome-file-property-dialog.c:489
+msgid "Drop Action"
+msgstr "Arrastrar"
-#: gnome/gpopup.c:267 src/screen.c:2286 src/screen.c:2316
+#: gnome/gnome-file-property-dialog.c:491 gnome/gpopup2.c:194
+#: src/screen.c:2306 src/screen.c:2336
msgid "View"
msgstr "Ver"
-#: gnome/gpopup.c:268
-msgid "View unfiltered"
-msgstr "Ver sin procesar"
+#: gnome/gnome-file-property-dialog.c:502
+msgid "Use default Drop action"
+msgstr "Realiza la acci�n predefinida para Arrastrar"
+
+#: gnome/gnome-file-property-dialog.c:504
+msgid "Use default View action"
+msgstr "Realiza la acci�n predefinida para Ver"
-#: gnome/gpopup.c:269 src/screen.c:2287 src/screen.c:2317 src/view.c:1996
+#: gnome/gnome-file-property-dialog.c:513 gnome/gpopup2.c:196
+#: src/screen.c:2307 src/screen.c:2337 src/view.c:1991
msgid "Edit"
msgstr "Editar"
-#: gnome/gpopup.c:271
-msgid "Link..."
-msgstr "Enlace..."
+#: gnome/gnome-file-property-dialog.c:523
+msgid "Use default Edit action"
+msgstr "Realiza la acci�n predefinida para Editar"
-#: gnome/gpopup.c:272
-msgid "Symlink..."
-msgstr "Enlace simb�lico..."
+#: gnome/gnome-file-property-dialog.c:577 gnome/gprop.c:521
+msgid "Icon"
+msgstr "Icono"
-#: gnome/gpopup.c:273
-msgid "Edit symlink..."
-msgstr "Editar enlace simb�lico..."
+#. We must be a file or a link to a file.
+#: gnome/gnome-file-property-dialog.c:611
+msgid "File Actions"
+msgstr "Acciones sobre Ficheros"
+
+#: gnome/gnome-file-property-dialog.c:616
+msgid "Open action"
+msgstr "Acci�n de abrir"
+
+#: gnome/gnome-file-property-dialog.c:617
+msgid "Needs terminal to run"
+msgstr "Requiere un terminal"
+
+#: gnome/gnome-file-property-dialog.c:742
+msgid "File Permissions"
+msgstr "Permisos"
+
+#: gnome/gnome-file-property-dialog.c:753 gnome/gprop.c:259
+msgid "Current mode: "
+msgstr "Modo actual: "
+
+#. Headings
+#: gnome/gnome-file-property-dialog.c:768 gnome/gprop.c:272
+msgid "Read"
+msgstr "Lectura"
+
+#: gnome/gnome-file-property-dialog.c:769 gnome/gprop.c:273
+msgid "Write"
+msgstr "Escritura"
+
+#: gnome/gnome-file-property-dialog.c:770 gnome/gprop.c:274
+msgid "Exec"
+msgstr "Ejecuci�n"
+
+#: gnome/gnome-file-property-dialog.c:771 gnome/gprop.c:275
+msgid "Special"
+msgstr "Especial"
+
+#. Permissions
+#: gnome/gnome-file-property-dialog.c:775 gnome/gprop.c:279
+msgid "User"
+msgstr "Usuario"
+
+#: gnome/gnome-file-property-dialog.c:777 gnome/gprop.c:281
+msgid "Other"
+msgstr "Otros"
+
+#. Special
+#: gnome/gnome-file-property-dialog.c:781 gnome/gprop.c:285
+msgid "Set UID"
+msgstr "Set UID"
+
+#: gnome/gnome-file-property-dialog.c:782 gnome/gprop.c:286
+msgid "Set GID"
+msgstr "Set GID"
+
+#: gnome/gnome-file-property-dialog.c:783 gnome/gprop.c:287
+msgid "Sticky"
+msgstr "Sticky"
+
+#: gnome/gnome-file-property-dialog.c:1074
+msgid "URL"
+msgstr "URL"
+
+#: gnome/gnome-file-property-dialog.c:1077
+msgid "Statistics"
+msgstr "Estad�sticas"
+
+#: gnome/gnome-file-property-dialog.c:1083
+msgid "Options"
+msgstr "Opciones"
+
+#: gnome/gnome-file-property-dialog.c:1086
+msgid "Permissions"
+msgstr "Permisos"
+
+#: gnome/gnome-file-property-dialog.c:1089
+msgid " Properties"
+msgstr " Propiedades"
+
+#: gnome/gnome-file-property-dialog.c:1140
+msgid "You entered an invalid username"
+msgstr "Nombre de usuario no v�lido"
+
+#: gnome/gnome-file-property-dialog.c:1185
+msgid "You must rename your file to something"
+msgstr "Debe renombrar su fichero"
+
+#: gnome/gnome-file-property-dialog.c:1191
+msgid "You cannot rename a file to something containing a '/' character"
+msgstr "No puede utilizar el car�cter '/' en un nombre de fichero"
+
+#. the first label
+#: gnome/gnome-open-dialog.c:379
+msgid "Select an application to open \""
+msgstr "Escoja una aplicaci�n para abrir \""
+
+#: gnome/gnome-open-dialog.c:390
+msgid "Select a file to run with"
+msgstr "Escoja un fichero con el que ejecutar"
+
+#. the file tree
+#: gnome/gnome-open-dialog.c:401
+msgid "Applications"
+msgstr "Aplicaciones"
+
+#: gnome/gnome-open-dialog.c:417
+msgid "Program to run"
+msgstr "Programa a ejecutar"
+
+#: gnome/gpopup2.c:188
+msgid "Mount device"
+msgstr "Montar dispositivo"
+
+#: gnome/gpopup2.c:189
+msgid "Unmount device"
+msgstr "Desmontar dispositivo"
+
+#: gnome/gpopup2.c:190
+msgid "Eject device"
+msgstr "Expulsar dispositivo"
+
+#: gnome/gpopup2.c:193
+msgid "Open with..."
+msgstr "Abrir con..."
-#: gnome/gpopup.c:280 gnome/gpopup.c:291
-msgid "Move/rename..."
-msgstr "Mover/Renombrar..."
+#: gnome/gpopup2.c:195
+msgid "View Unfiltered"
+msgstr "Ver sin Filtrar"
-#: gnome/gpopup.c:281 gnome/gpopup.c:292
+#: gnome/gpopup2.c:198
msgid "Copy..."
msgstr "Copiar..."
-#: gnome/gpopup.c:282 gnome/gpopup.c:294 gtkedit/editwidget.c:1070
-#: src/screen.c:2291 src/screen.c:2321
+#: gnome/gpopup2.c:199 gtkedit/editwidget.c:1070 src/screen.c:2311
+#: src/screen.c:2341
msgid "Delete"
msgstr "Borrar"
+#: gnome/gpopup2.c:200
+msgid "Move..."
+msgstr "Mover..."
+
+#: gnome/gpopup2.c:201
+msgid "Hard Link..."
+msgstr "Enlace..."
+
+#: gnome/gpopup2.c:202
+msgid "Symlink..."
+msgstr "Enlace simb�lico..."
+
+#: gnome/gpopup2.c:203
+msgid "Edit Symlink..."
+msgstr "Editar enlace simb�lico..."
+
+#: gnome/gpopup2.c:205
+msgid "Properties..."
+msgstr "Propiedades..."
+
#: gnome/gprefs.c:81
-#, fuzzy
msgid "Show backup files"
-msgstr "mostrar &Archivos de respaldo"
+msgstr "Mostrar archivos de respaldo"
#: gnome/gprefs.c:85
-#, fuzzy
msgid "Show hidden files"
-msgstr "mostrar archivos &Ocultos"
+msgstr "Mostrar archivos ocultos"
#: gnome/gprefs.c:89
-#, fuzzy
msgid "Mix files and directories"
-msgstr "archivos/directorios"
+msgstr "Mezclar archivos y directorios"
#: gnome/gprefs.c:93
-#, fuzzy
msgid "Use shell patterns instead of regular expressions"
-msgstr " La expresi�n regular es err�nea "
+msgstr "Usar patrones shell en vez de expresiones regulares"
#: gnome/gprefs.c:102
msgid "Confirm when deleting file"
-msgstr ""
+msgstr "Confirmar eliminaci�n de archivos"
#: gnome/gprefs.c:106
-#, fuzzy
msgid "Confirm when overwriting files"
-msgstr "No sobrescribir ning�n archivo."
+msgstr "Confirmar sobreescritura de archivos"
#: gnome/gprefs.c:110
-#, fuzzy
msgid "Confirm when executing files"
-msgstr "Opciones de confirmaci�n"
+msgstr "Confirmar ejecuci�n de archivos"
#: gnome/gprefs.c:114
msgid "Show progress while operations are being performed"
-msgstr ""
+msgstr "Mostrar indicadores de progreso de las operaciones"
#: gnome/gprefs.c:123
msgid "VFS Timeout:"
-msgstr ""
+msgstr "Caducidad de los VFS:"
#: gnome/gprefs.c:124 gnome/gprefs.c:149
msgid "Seconds"
@@ -769,52 +1112,44 @@
msgstr "Contrase�a FTP an�nimo:"
#: gnome/gprefs.c:131
-#, fuzzy
msgid "Always use FTP proxy"
-msgstr "usar siempre pro&Xy"
+msgstr "Usar siempre proxy para FTP"
#: gnome/gprefs.c:140
-#, fuzzy
msgid "Fast directory reload"
-msgstr "carga r�pida de contenido"
+msgstr "Recarga r�pida de directorios"
#: gnome/gprefs.c:144
-#, fuzzy
msgid "Compute totals before copying files"
-msgstr "Confirmar ante de sobrescribir ning�n archivo."
+msgstr "Calcular totales antes de copiar archivos"
#: gnome/gprefs.c:148
-#, fuzzy
msgid "FTP directory cache timeout :"
msgstr "Descartar el cach� de ftpfs tras: "
#: gnome/gprefs.c:152
msgid "Allow customization of icons in icon view"
-msgstr ""
+msgstr "Permitir iconos personalizados"
#: gnome/gprefs.c:161
-#, fuzzy
msgid "File display"
-msgstr "El archivo ya existe"
+msgstr "Mostrar archivo"
#: gnome/gprefs.c:165
-#, fuzzy
msgid "Confirmation"
-msgstr " Confirmaci�n "
+msgstr "Confirmaci�n"
#: gnome/gprefs.c:169
msgid "VFS"
-msgstr ""
+msgstr "VFS"
#: gnome/gprefs.c:173
-#, fuzzy
msgid "Caching"
-msgstr "Buscando"
+msgstr "Guardando en cach�"
#: gnome/gprefs.c:452
-#, fuzzy
msgid "Preferences"
-msgstr "Preferencias..."
+msgstr "Preferencias"
#: gnome/gprop.c:58 gnome/gprop.c:75
msgid "Filename"
@@ -840,63 +1175,10 @@
msgid "File mode (permissions)"
msgstr "Modo del archivo (permisos)"
-#: gnome/gprop.c:259
-msgid "Current mode: "
-msgstr "Modo actual:"
-
-#. Headings
-#: gnome/gprop.c:272
-msgid "Read"
-msgstr "Lectura"
-
-#: gnome/gprop.c:273
-msgid "Write"
-msgstr "Escritura"
-
-#: gnome/gprop.c:274
-msgid "Exec"
-msgstr "Ejecuci�n"
-
-#: gnome/gprop.c:275
-msgid "Special"
-msgstr "Especial"
-
-#. Permissions
-#: gnome/gprop.c:279
-msgid "User"
-msgstr "Usuario"
-
-#. Group
-#: gnome/gprop.c:280 gnome/gprop.c:405 src/screen.c:439
-msgid "Group"
-msgstr "Grupo"
-
-#: gnome/gprop.c:281
-msgid "Other"
-msgstr "Otros"
-
-#. Special
-#: gnome/gprop.c:285
-msgid "Set UID"
-msgstr "Set UID"
-
-#: gnome/gprop.c:286
-msgid "Set GID"
-msgstr "Set GID"
-
-#: gnome/gprop.c:287
-msgid "Sticky"
-msgstr "Sticky"
-
#: gnome/gprop.c:321 gnome/gprop.c:347
msgid "<Unknown>"
msgstr "<Desconocido>"
-#. Owner
-#: gnome/gprop.c:390 src/screen.c:438
-msgid "Owner"
-msgstr "Due�o"
-
#: gnome/gprop.c:494
msgid "General"
msgstr "General"
@@ -905,272 +1187,232 @@
msgid "Title"
msgstr "T�tulo"
-#: gnome/gprop.c:521 gnome/gscreen.c:2369
-msgid "Icon"
-msgstr "Icono"
-
#: gnome/gprop.c:535
msgid "Select icon"
msgstr "Seleccionar icono"
-#: gnome/gscreen.c:1452
+#: gnome/gscreen.c:1468
msgid "Rescan Directory"
msgstr "Releer Directorio"
-#: gnome/gscreen.c:1452
-#, fuzzy
+#: gnome/gscreen.c:1468
msgid "Reloads the current directory"
-msgstr "No puedo cambiar de directorio"
+msgstr "Actualiza el directorio actual"
-#: gnome/gscreen.c:1454
+#: gnome/gscreen.c:1470
msgid "New folder"
msgstr "Carpeta nueva"
-#: gnome/gscreen.c:1454
+#: gnome/gscreen.c:1470
msgid "Creates a new folder here"
msgstr "Crea una carpeta nueva"
-#: gnome/gscreen.c:1632
+#: gnome/gscreen.c:1648
msgid "All files"
msgstr "Todos los archivos"
-#: gnome/gscreen.c:1634
+#: gnome/gscreen.c:1650
msgid "Archives and compressed files"
msgstr "Archivos y archivos comprimidos"
-#: gnome/gscreen.c:1636
+#: gnome/gscreen.c:1652
msgid "RPM/DEB files"
msgstr "RPM/DEB"
-#: gnome/gscreen.c:1638
+#: gnome/gscreen.c:1654
msgid "Text/Document files"
msgstr "Textos/documentos"
-#: gnome/gscreen.c:1640
+#: gnome/gscreen.c:1656
msgid "HTML and SGML files"
msgstr "HTML y SGML"
-#: gnome/gscreen.c:1642
+#: gnome/gscreen.c:1658
msgid "Postscript and PDF files"
msgstr "Postscript y PDF"
-#: gnome/gscreen.c:1644
+#: gnome/gscreen.c:1660
msgid "Spreadsheet files"
msgstr "Hojas de c�lculo"
-#: gnome/gscreen.c:1646
+#: gnome/gscreen.c:1662
msgid "Image files"
msgstr "Im�genes"
-#: gnome/gscreen.c:1649
+#: gnome/gscreen.c:1665
msgid "Video/animation files"
msgstr "Video/animaciones"
-#: gnome/gscreen.c:1651
+#: gnome/gscreen.c:1667
msgid "Audio files"
msgstr "Audio"
-#: gnome/gscreen.c:1653
+#: gnome/gscreen.c:1669
msgid "C program files"
msgstr "Fuentes de C"
-#: gnome/gscreen.c:1655
+#: gnome/gscreen.c:1671
msgid "C++ program files"
msgstr "Fuentes de C++"
-#: gnome/gscreen.c:1657
+#: gnome/gscreen.c:1673
msgid "Objective-C program files"
msgstr "Fuentes de Objective-C"
-#: gnome/gscreen.c:1659
+#: gnome/gscreen.c:1675
msgid "Scheme program files"
msgstr "Fuentes de Scheme"
-#: gnome/gscreen.c:1661
+#: gnome/gscreen.c:1677
msgid "Assembler program files"
msgstr "Fuentes de ensamblador"
-#: gnome/gscreen.c:1663
+#: gnome/gscreen.c:1679
msgid "Misc. program files"
msgstr "Fuentes varios"
-#: gnome/gscreen.c:1665
+#: gnome/gscreen.c:1681
msgid "Font files"
msgstr "Archivos de tipos de letra"
-#: gnome/gscreen.c:1792
+#: gnome/gscreen.c:1808
#, c-format
msgid "Search: %s"
msgstr "Buscar: %s"
-#: gnome/gscreen.c:1802
+#: gnome/gscreen.c:1818
#, c-format
msgid "%s bytes in %d file"
msgstr "%s bytes en %d archivo"
-#: gnome/gscreen.c:1802
+#: gnome/gscreen.c:1818
#, c-format
msgid "%s bytes in %d files"
msgstr "%s bytes en %d archivos"
-#: gnome/gscreen.c:1828 src/screen.c:677
+#: gnome/gscreen.c:1844 src/screen.c:677
msgid "<readlink failed>"
msgstr "<readlink fall�>"
-#: gnome/gscreen.c:1882
+#: gnome/gscreen.c:1898
msgid "Filter"
msgstr "Filtro"
-#: gnome/gscreen.c:2369
-msgid "Switch view to an Icon view"
-msgstr ""
-
-#: gnome/gscreen.c:2371
-msgid "Brief"
-msgstr "Breve"
-
-#: gnome/gscreen.c:2371
-msgid "Switch view to show just file name and type"
-msgstr ""
-
-#: gnome/gscreen.c:2373
-msgid "Detailed"
-msgstr "Detallado"
-
-#: gnome/gscreen.c:2373
-msgid "Switch view to show detailed file statistics"
-msgstr ""
-
-#: gnome/gscreen.c:2375
-#, fuzzy
-msgid "Custom"
-msgstr "Listado Personalizado"
-
-#: gnome/gscreen.c:2375
-msgid "Switch view to show custom determined statistics."
-msgstr ""
-
-#: gnome/gscreen.c:2383
+#: gnome/gscreen.c:2338
msgid "Back"
msgstr "Atr�s"
-#: gnome/gscreen.c:2383
+#: gnome/gscreen.c:2338
msgid "Go to the previously visited directory"
-msgstr ""
+msgstr "Volver al �ltimo directorio visitado"
-#: gnome/gscreen.c:2385
+#: gnome/gscreen.c:2340
msgid "Up"
msgstr "Arriba"
-#: gnome/gscreen.c:2385
+#: gnome/gscreen.c:2340
msgid "Go up a level in the directory heirarchy"
-msgstr ""
+msgstr "Subir un nivel en la jerarqu�a de directorios"
-#: gnome/gscreen.c:2387
-#, fuzzy
+#: gnome/gscreen.c:2342
msgid "Forward"
-msgstr "Formateado"
+msgstr "Avanzar"
-#: gnome/gscreen.c:2387
-#, fuzzy
+#: gnome/gscreen.c:2342
msgid "Go to the next directory"
-msgstr "No puedo cambiar de directorio"
+msgstr "Pasar al siguiente directorio"
-#: gnome/gscreen.c:2390 src/tree.c:1020
+#: gnome/gscreen.c:2345 src/tree.c:1020
msgid "Rescan"
msgstr "Releer"
-#: gnome/gscreen.c:2390
-#, fuzzy
+#: gnome/gscreen.c:2345
msgid "Rescan the current directory"
-msgstr "Relee el contenido del directorio."
+msgstr "Relee el contenido del directorio actual"
-#: gnome/gscreen.c:2393
+#: gnome/gscreen.c:2348
msgid "Home"
msgstr "Directorio Personal"
-#: gnome/gscreen.c:2393
+#: gnome/gscreen.c:2348
msgid "Go to your home directory"
msgstr "Ir al Directorio Personal"
-#: gnome/gscreen.c:2527
+#: gnome/gscreen.c:2494
msgid "Location:"
msgstr "Ubicaci�n:"
#. 1
#: gnome/gtools.c:110 gtkedit/editcmd.c:342 gtkedit/editcmd.c:1185
-#: gtkedit/editcmd.c:1270 gtkedit/editcmd.c:2847 gtkedit/editoptions.c:68
+#: gtkedit/editcmd.c:1270 gtkedit/editcmd.c:2847 gtkedit/editoptions.c:69
#: src/boxes.c:138 src/boxes.c:278 src/boxes.c:378 src/boxes.c:466
-#: src/boxes.c:646 src/boxes.c:728 src/boxes.c:783 src/boxes.c:897
-#: src/filegui.c:807 src/find.c:171 src/layout.c:369 src/option.c:144
-#: src/wtools.c:289 src/wtools.c:561
+#: src/boxes.c:646 src/boxes.c:728 src/boxes.c:783 src/boxes.c:898
+#: src/filegui.c:838 src/find.c:171 src/layout.c:369 src/option.c:144
+#: src/wtools.c:289 src/wtools.c:563
msgid "&Ok"
msgstr "&Aceptar"
-#: gnome/gview.c:122 src/view.c:683
+#: gnome/gview.c:135 src/view.c:683
#, c-format
msgid "Offset 0x%08x"
msgstr "Offset 0x%08x"
-#: gnome/gview.c:124 src/view.c:685
+#: gnome/gview.c:137 src/view.c:685
#, c-format
msgid "Col %d"
msgstr "Col %d"
-#: gnome/gview.c:128 src/view.c:689
+#: gnome/gview.c:141 src/view.c:689
#, c-format
msgid "%s bytes"
msgstr "%s bytes"
-#: gnome/gview.c:292
-#, fuzzy
+#: gnome/gview.c:305
msgid "_Goto line"
msgstr "Ir a la l�nea"
-#: gnome/gview.c:293
+#: gnome/gview.c:306
msgid "Jump to a specified line number"
msgstr "Salta a una l�nea espec�fica"
-#: gnome/gview.c:295
-#, fuzzy
+#: gnome/gview.c:308
msgid "_Monitor file"
-msgstr "Monitorear el archivo"
+msgstr "_Monitorizar archivo"
-#: gnome/gview.c:295
+#: gnome/gview.c:308
msgid "Monitor file growing"
-msgstr "Monitorea el crecimiento de un archivo"
+msgstr "Ver un archivo en crecimiento"
-#: gnome/gview.c:302
+#: gnome/gview.c:315
msgid "Regexp search"
msgstr "Buscar expresi�n regular..."
-#: gnome/gview.c:303
+#: gnome/gview.c:316
msgid "Regular expression search"
msgstr "Busca una expresi�n regular"
-#: gnome/gview.c:312
-#, fuzzy
+#: gnome/gview.c:325
msgid "_Wrap"
msgstr "Plegar"
-#: gnome/gview.c:313
+#: gnome/gview.c:326
msgid "Wrap the text"
msgstr "Plegar l�neas de texto largas"
#. Can not use this one yet, as it destroys the viewer, need to fix that
-#: gnome/gview.c:316
+#: gnome/gview.c:329
msgid "_Parsed view"
msgstr ""
-#: gnome/gview.c:319
+#: gnome/gview.c:332
msgid "_Formatted"
msgstr "_Formateado"
-#: gnome/gview.c:321
+#: gnome/gview.c:334
msgid "_Hex"
msgstr "_Hex"
-#: gnome/gview.c:327
+#: gnome/gview.c:340
msgid "_Search"
msgstr "Bu_scar"
@@ -1186,11 +1428,11 @@
msgid "help"
msgstr "ayuda"
-#: gnome/gwidget.c:96 src/file.c:2214
+#: gnome/gwidget.c:96 src/file.c:2250
msgid "yes"
msgstr "s�"
-#: gnome/gwidget.c:98 src/file.c:2212
+#: gnome/gwidget.c:98 src/file.c:2248
msgid "no"
msgstr "no"
@@ -1206,7 +1448,7 @@
#: gtkedit/edit.c:129 gtkedit/edit.c:224 gtkedit/edit.c:231 gtkedit/edit.c:238
#: gtkedit/edit.c:245 gtkedit/edit.c:251 gtkedit/edit.c:308 gtkedit/edit.c:344
#: gtkedit/editcmd.c:1945 gtkedit/editwidget.c:950 src/dir.c:386
-#: src/screen.c:2306 src/tree.c:692 src/tree.c:698 src/wtools.c:222
+#: src/screen.c:2326 src/tree.c:692 src/tree.c:698 src/wtools.c:222
#: vfs/fish.c:224
msgid " Error "
msgstr " Error "
@@ -1253,14 +1495,13 @@
#. NLS for hotkeys?
#: gtkedit/editcmd.c:340 gtkedit/editcmd.c:1137 gtkedit/editcmd.c:1183
-#: gtkedit/editcmd.c:1268 gtkedit/editcmd.c:2845 gtkedit/editoptions.c:65
+#: gtkedit/editcmd.c:1268 gtkedit/editcmd.c:2845 gtkedit/editoptions.c:66
#: src/achown.c:71 src/boxes.c:139 src/boxes.c:279 src/boxes.c:376
#: src/boxes.c:464 src/boxes.c:644 src/boxes.c:727 src/boxes.c:781
-#: src/chmod.c:114 src/chown.c:79 src/cmd.c:856 src/filegui.c:790
+#: src/chmod.c:114 src/chown.c:79 src/cmd.c:856 src/filegui.c:821
#: src/find.c:171 src/hotlist.c:138 src/hotlist.c:814 src/hotlist.c:911
#: src/layout.c:370 src/learn.c:59 src/option.c:145 src/panelize.c:86
-#: src/view.c:404 src/wtools.c:111 src/wtools.c:386 src/wtools.c:559
-#: src/wtools.c:640
+#: src/view.c:404 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561
msgid "&Cancel"
msgstr "&Cancelar"
@@ -1279,9 +1520,9 @@
#. Warning message with a query to continue or cancel the operation
#: gtkedit/editcmd.c:491 gtkedit/editcmd.c:810 gtkedit/editcmd.c:840
-#: gtkedit/editcmd.c:987 gtkedit/editcmd.c:1084 src/ext.c:301 src/file.c:606
-#: src/help.c:318 src/main.c:674 src/screen.c:2063 src/subshell.c:700
-#: src/subshell.c:726 src/utilunix.c:388 src/utilunix.c:392 src/utilunix.c:458
+#: gtkedit/editcmd.c:987 gtkedit/editcmd.c:1084 src/ext.c:301 src/file.c:619
+#: src/help.c:318 src/main.c:691 src/screen.c:2083 src/subshell.c:705
+#: src/subshell.c:731 src/utilunix.c:388 src/utilunix.c:392 src/utilunix.c:463
#: vfs/mcfs.c:170
msgid " Warning "
msgstr " � Atenci�n ! "
@@ -1295,8 +1536,9 @@
msgid "Overwrite"
msgstr "Sobrescribir"
-#: gtkedit/editcmd.c:494 gtkedit/editcmd.c:783 gtkedit/editcmd.c:810
-#: gtkedit/editcmd.c:840 gtkedit/editcmd.c:987 gtkedit/editcmd.c:1578
+#: gtkedit/editcmd.c:494 gtkedit/editcmd.c:556 gtkedit/editcmd.c:783
+#: gtkedit/editcmd.c:810 gtkedit/editcmd.c:840 gtkedit/editcmd.c:987
+#: gtkedit/editcmd.c:1578
msgid "Cancel"
msgstr "Cancelar"
@@ -1366,7 +1608,7 @@
msgid " Save file "
msgstr " Guardar archivo "
-#: gtkedit/editcmd.c:783 gtkedit/editwidget.c:1064 src/view.c:1992
+#: gtkedit/editcmd.c:783 gtkedit/editwidget.c:1064 src/view.c:1987
msgid "Save"
msgstr "Guardar"
@@ -1379,6 +1621,7 @@
" Continuar descartar� estos cambios. "
#: gtkedit/editcmd.c:810 gtkedit/editcmd.c:840 gtkedit/editcmd.c:987
+#: src/main.c:3067
msgid "Continue"
msgstr "Continuar"
@@ -1403,11 +1646,11 @@
msgid " Cancel "
msgstr " Cancelar "
-#: gtkedit/editcmd.c:1139 src/filegui.c:567
+#: gtkedit/editcmd.c:1139 src/filegui.c:596
msgid "al&L"
msgstr "&Todos"
-#: gtkedit/editcmd.c:1141 src/file.c:2136 src/filegui.c:263
+#: gtkedit/editcmd.c:1141 src/file.c:2172 src/filegui.c:266
msgid "&Skip"
msgstr "&Ignorar"
@@ -1460,7 +1703,7 @@
msgid " Enter replacement string:"
msgstr " Teclee el cambio a realizar:"
-#: gtkedit/editcmd.c:1211 gtkedit/editcmd.c:1284 src/view.c:1917
+#: gtkedit/editcmd.c:1211 gtkedit/editcmd.c:1284 src/view.c:1912
msgid " Enter search string:"
msgstr " Teclee el texto a buscar:"
@@ -1472,8 +1715,8 @@
#. Heads the 'Search' dialog box
#: gtkedit/editcmd.c:1298 gtkedit/editcmd.c:1474 gtkedit/editcmd.c:2209
-#: src/view.c:1465 src/view.c:1564 src/view.c:1686 src/view.c:1885
-#: src/view.c:1917
+#: src/view.c:1467 src/view.c:1566 src/view.c:1688 src/view.c:1880
+#: src/view.c:1912
msgid " Search "
msgstr " Buscar "
@@ -1636,7 +1879,7 @@
msgstr " Cortar al portapapeles "
#: gtkedit/editcmd.c:2565 gtkedit/editcmd.c:2569 gtkedit/editcmd.c:2574
-#: gtkedit/editcmd.c:2577 src/view.c:1857
+#: gtkedit/editcmd.c:2577 src/view.c:1852
msgid " Goto line "
msgstr " Ir a la l�nea "
@@ -1745,55 +1988,55 @@
msgstr "M�quina de escribir"
#. 2
-#: gtkedit/editoptions.c:71
+#: gtkedit/editoptions.c:72
msgid "Word wrap line length : "
msgstr "Ancho del parrafo auto: "
#. 4
-#: gtkedit/editoptions.c:77
+#: gtkedit/editoptions.c:78
msgid "Tab spacing : "
msgstr "Tama�o de tabulaciones: "
-#: gtkedit/editoptions.c:85
+#: gtkedit/editoptions.c:86
msgid "synta&X highlighting"
msgstr "sinta&Xis coloreada"
#. 7
-#: gtkedit/editoptions.c:91
+#: gtkedit/editoptions.c:92
msgid "confir&M before saving"
msgstr "confir&Mar al guardar"
#. 8
-#: gtkedit/editoptions.c:94
+#: gtkedit/editoptions.c:95
msgid "fill tabs with &Spaces"
msgstr "tabulaciones x e&Spacios"
#. 9
-#: gtkedit/editoptions.c:97
+#: gtkedit/editoptions.c:98
msgid "&Return does autoindent"
msgstr "autoindenta&R"
#. 10
-#: gtkedit/editoptions.c:100
+#: gtkedit/editoptions.c:101
msgid "&Backspace through tabs"
msgstr "&Borrar en tabulaciones"
#. 11
-#: gtkedit/editoptions.c:103
+#: gtkedit/editoptions.c:104
msgid "&Fake half tabs"
msgstr "&Fingir medias tabulaciones"
#. 13
-#: gtkedit/editoptions.c:109
+#: gtkedit/editoptions.c:110
msgid "Wrap mode"
msgstr "Autoajuste de p�rrafo"
#. 15
-#: gtkedit/editoptions.c:115
+#: gtkedit/editoptions.c:116
msgid "Key emulation"
msgstr "Emulaci�n de teclas"
-#: gtkedit/editoptions.c:156
+#: gtkedit/editoptions.c:157
msgid " Editor options "
msgstr " Opciones del editor "
@@ -1802,8 +2045,8 @@
msgid "Error initialising editor.\n"
msgstr "Error al inicializar el editor.\n"
-#: 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
+#: gtkedit/editwidget.c:1063 src/help.c:806 src/main.c:1688 src/screen.c:2304
+#: src/screen.c:2334 src/tree.c:1018 src/view.c:1982
msgid "Help"
msgstr "Ayuda"
@@ -1815,16 +2058,16 @@
msgid "Replac"
msgstr "Reemplaza"
-#: gtkedit/editwidget.c:1069 src/view.c:2000
+#: gtkedit/editwidget.c:1069 src/view.c:1995
msgid "Search"
msgstr "Buscar"
-#: gtkedit/editwidget.c:1072 src/main.c:1679
+#: gtkedit/editwidget.c:1072 src/main.c:1690
msgid "PullDn"
msgstr "Men�"
-#: gtkedit/editwidget.c:1073 src/help.c:818 src/main.c:1680 src/view.c:1989
-#: src/view.c:2009
+#: gtkedit/editwidget.c:1073 src/help.c:818 src/main.c:1691 src/view.c:1984
+#: src/view.c:2004
msgid "Quit"
msgstr "Salir"
@@ -2015,7 +2258,7 @@
msgid "&Save mode..."
msgstr "&Modo de guardar..."
-#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1311
+#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1322
msgid "&Layout..."
msgstr "&Presentaci�n..."
@@ -2269,10 +2512,6 @@
msgid "Flag"
msgstr "Visu"
-#: src/achown.c:378
-msgid "Mode"
-msgstr "Modo"
-
#: src/achown.c:383
#, c-format
msgid "%6d of %d"
@@ -2315,27 +2554,27 @@
msgid " I can't run the Advanced Chown command on a tarfs "
msgstr " No puedo \"cambiar due�o y permisos\" en un tarfs "
-#: src/background.c:178
+#: src/background.c:181
msgid "Background process:"
msgstr "Procesos en 2� plano"
-#: src/background.c:284 src/file.c:2135
+#: src/background.c:287 src/file.c:2171
msgid " Background process error "
msgstr " Error en un proceso en 2� plano"
-#: src/background.c:291
+#: src/background.c:294
msgid " Child died unexpectedly "
msgstr " El proceso hijo muri� inesperadamente"
-#: src/background.c:293
+#: src/background.c:296
msgid " Unknown error in child "
msgstr " Error desconocido en el proceso hijo "
-#: src/background.c:308
+#: src/background.c:311
msgid " Background protocol error "
msgstr " Error de protocolo en proceso en 2� plano "
-#: src/background.c:309
+#: src/background.c:312
msgid ""
" Background process sent us a request for more arguments \n"
" than we can handle. \n"
@@ -2464,35 +2703,27 @@
msgid "Symbolic link"
msgstr " Crear enlace simb�lico "
-#: src/boxes.c:801
-msgid "Symbolic link filename:"
-msgstr "Nombre del nuevo enlace simb�lico:"
-
-#: src/boxes.c:803
-msgid "Existing filename (filename symlink will point to):"
-msgstr "Apuntando a:"
-
-#: src/boxes.c:832
+#: src/boxes.c:833
msgid "Running "
msgstr "Corriendo "
-#: src/boxes.c:833 src/find.c:716 src/find.c:957
+#: src/boxes.c:834 src/find.c:716 src/find.c:957
msgid "Stopped"
msgstr "Detenido "
-#: src/boxes.c:894
+#: src/boxes.c:895
msgid "&Stop"
msgstr "&Detener"
-#: src/boxes.c:895
+#: src/boxes.c:896
msgid "&Resume"
msgstr "c&Ontinuar"
-#: src/boxes.c:896
+#: src/boxes.c:897
msgid "&Kill"
msgstr "&Matar"
-#: src/boxes.c:935
+#: src/boxes.c:936
msgid "Background Jobs"
msgstr " Procesos en 2� plano "
@@ -2799,7 +3030,7 @@
msgid " Link "
msgstr " Crear enlace "
-#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1639
+#: src/cmd.c:1032 src/cmd.c:1171 src/file.c:1685
msgid " to:"
msgstr " a: "
@@ -2813,74 +3044,76 @@
msgid " symlink: %s "
msgstr " enlace simb�lico: %s "
-#: src/cmd.c:1102
-msgid " Symlink "
-msgstr " Enlace simb�lico "
-
-#: src/cmd.c:1102
-msgid " points to:"
-msgstr " apunta a: "
+#: src/cmd.c:1130
+#, c-format
+msgid " Symlink `%s' points to: "
+msgstr " El enlace simb�lico '%s' apunta a: "
-#: src/cmd.c:1107
+#: src/cmd.c:1135
msgid " Edit symlink "
msgstr " Editar enlace simb�lico "
-#: src/cmd.c:1113
+#: src/cmd.c:1140
+#, c-format
+msgid " edit symlink, unable to remove %s: %s "
+msgstr " edite enlace simb�lico, imposible borrar %s: %s "
+
+#: src/cmd.c:1144
#, c-format
msgid " edit symlink: %s "
msgstr " editar enlace simb�lico: %s "
-#: src/cmd.c:1137
+#: src/cmd.c:1171
msgid " Link symbolically "
msgstr " Crear enlace simb�lico "
-#: src/cmd.c:1138
+#: src/cmd.c:1172
msgid " Relative symlink "
msgstr " Enlace simb�lico relativo "
-#: src/cmd.c:1149
+#: src/cmd.c:1183
#, c-format
msgid " relative symlink: %s "
msgstr " enlace simb�lico relativo: %s "
-#: src/cmd.c:1252
+#: src/cmd.c:1286
msgid " Enter machine name (F1 for details): "
msgstr " Teclee el nombre de la m�quina (F1 para m�s detalles): "
-#: src/cmd.c:1276
+#: src/cmd.c:1310
#, c-format
msgid " Could not chdir to %s "
msgstr " No puedo cambiar al directorio %s "
-#: src/cmd.c:1283
+#: src/cmd.c:1317
msgid " Link to a remote machine "
msgstr " Conexi�n por red "
-#: src/cmd.c:1289
+#: src/cmd.c:1323
msgid " FTP to machine "
msgstr " Conexi�n por FTP "
-#: src/cmd.c:1299
+#: src/cmd.c:1333
msgid " Socket source routing setup "
msgstr " Configuraci�n del ruteo espec�fico "
-#: src/cmd.c:1300
+#: src/cmd.c:1334
msgid " Enter host name to use as a source routing hop: "
msgstr " Teclee el nombre de la m�quina que ser� la intermediaria: "
-#: src/cmd.c:1307
+#: src/cmd.c:1341
msgid " Host name "
msgstr " Nombre de la m�quina "
-#: src/cmd.c:1307
+#: src/cmd.c:1341
msgid " Error while looking up IP address "
msgstr " Error al buscar la direcci�n IP "
-#: src/cmd.c:1318
+#: src/cmd.c:1352
msgid " Undelete files on an ext2 file system "
msgstr " Recuperar archivos de un sistema de archivos ext2 "
-#: src/cmd.c:1319
+#: src/cmd.c:1353
msgid ""
" Enter device (without /dev/) to undelete\n"
" files on: (F1 for details)"
@@ -2888,11 +3121,11 @@
" Introduzca el dispositivo (sin /dev/) donde quiere\n"
" recuperar archivos: (F1 para m�s detalles)"
-#: src/cmd.c:1369
+#: src/cmd.c:1403
msgid " Setup saved to ~/"
msgstr " Configuraci�n almacenada en ~/"
-#: src/cmd.c:1374
+#: src/cmd.c:1408
msgid " Setup "
msgstr " Configuraci�n "
@@ -3095,7 +3328,7 @@
" No puedo crear el enlace simb�lico destino \"%s\" \n"
" %s "
-#: src/file.c:510
+#: src/file.c:509
#, c-format
msgid ""
" Cannot overwrite directory \"%s\" \n"
@@ -3104,7 +3337,7 @@
" No puedo sobrescribir el directorio \"%s\" \n"
" %s "
-#: src/file.c:519
+#: src/file.c:518
#, c-format
msgid ""
" Cannot stat source file \"%s\" \n"
@@ -3113,14 +3346,14 @@
" No se pudo identificar el archivo origen \"%s\" \n"
" %s "
-#: src/file.c:532
+#: src/file.c:531
#, c-format
msgid " `%s' and `%s' are the same file. "
msgstr ""
" \"%s\" y \"%s\" \n"
" son el mismo archivo. "
-#: src/file.c:565
+#: src/file.c:574
#, c-format
msgid ""
" Cannot create special file \"%s\" \n"
@@ -3129,7 +3362,7 @@
" No puedo crear el archivo especial \"%s\" \n"
" %s "
-#: src/file.c:574 src/file.c:799
+#: src/file.c:583 src/file.c:812
#, c-format
msgid ""
" Cannot chown target file \"%s\" \n"
@@ -3138,7 +3371,7 @@
" No puedo cambiar el due�o del archivo destino: \"%s\" \n"
" %s "
-#: src/file.c:583 src/file.c:817
+#: src/file.c:592 src/file.c:831
#, c-format
msgid ""
" Cannot chmod target file \"%s\" \n"
@@ -3147,7 +3380,7 @@
" No puedo cambiar los permisos del archivo destino \"%s\" \n"
" %s "
-#: src/file.c:596
+#: src/file.c:609
#, c-format
msgid ""
" Cannot open source file \"%s\" \n"
@@ -3156,11 +3389,11 @@
" No puedo abrir el archivo fuente \"%s\" \n"
" %s"
-#: src/file.c:606
+#: src/file.c:619
msgid " Reget failed, about to overwrite file "
msgstr " Fall� el reintento, se va a sobrescribir el archivo "
-#: src/file.c:612
+#: src/file.c:625
#, c-format
msgid ""
" Cannot fstat source file \"%s\" \n"
@@ -3169,7 +3402,7 @@
" No se puede identificar el archivo origen \"%s\" \n"
" %s "
-#: src/file.c:638
+#: src/file.c:651
#, c-format
msgid ""
" Cannot create target file \"%s\" \n"
@@ -3178,7 +3411,7 @@
" No se puede crear el archivo destino \"%s\" \n"
" %s "
-#: src/file.c:652
+#: src/file.c:665
#, c-format
msgid ""
" Cannot fstat target file \"%s\" \n"
@@ -3187,7 +3420,7 @@
" No se puede identificar el archivo destino \"%s\" \n"
" %s"
-#: src/file.c:683
+#: src/file.c:696
#, c-format
msgid ""
" Cannot read source file \"%s\" \n"
@@ -3196,7 +3429,7 @@
" No se puede leer el archivo origen \"%s\" \n"
" %s"
-#: src/file.c:713
+#: src/file.c:726
#, c-format
msgid ""
" Cannot write target file \"%s\" \n"
@@ -3205,11 +3438,11 @@
" No se puede escribir el archivo destino \"%s\" \n"
" %s"
-#: src/file.c:732
+#: src/file.c:745
msgid "(stalled)"
msgstr "(ca�do)"
-#: src/file.c:770
+#: src/file.c:783
#, c-format
msgid ""
" Cannot close source file \"%s\" \n"
@@ -3218,7 +3451,7 @@
" No se puede cerrar el archivo origen \"%s\" \n"
" %s"
-#: src/file.c:779
+#: src/file.c:792
#, c-format
msgid ""
" Cannot close target file \"%s\" \n"
@@ -3227,19 +3460,19 @@
" No se puede cerrar el archivo destino \"%s\" \n"
" %s"
-#: src/file.c:789
+#: src/file.c:802
msgid "Incomplete file was retrieved. Keep it?"
msgstr "Archivo incompleto recuperado. �Desea conservarlo?"
-#: src/file.c:790
+#: src/file.c:803
msgid "&Delete"
msgstr "&Borrar"
-#: src/file.c:790 src/hotlist.c:1443
+#: src/file.c:803 src/hotlist.c:1443
msgid "&Keep"
msgstr "&Mantener"
-#: src/file.c:862
+#: src/file.c:876
#, c-format
msgid ""
" Cannot stat source directory \"%s\" \n"
@@ -3248,7 +3481,7 @@
" No se puede identificar el directorio de origen \"%s\" \n"
" %s"
-#: src/file.c:885
+#: src/file.c:899
#, c-format
msgid ""
" Source directory \"%s\" is not a directory \n"
@@ -3258,7 +3491,7 @@
" %s "
#. we found a cyclic symbolic link
-#: src/file.c:893
+#: src/file.c:907
#, c-format
msgid ""
" Cannot copy cyclic symbolic link \n"
@@ -3267,7 +3500,7 @@
" No puedo copiar un enlace simb�lico c�clico \n"
" \"%s\" "
-#: src/file.c:946
+#: src/file.c:964
#, c-format
msgid ""
" Cannot create target directory \"%s\" \n"
@@ -3276,7 +3509,7 @@
" No puedo crear el directorio destino \"%s\" \n"
" %s "
-#: src/file.c:964
+#: src/file.c:987
#, c-format
msgid ""
" Cannot chown target directory \"%s\" \n"
@@ -3286,7 +3519,7 @@
" %s "
#. Source doesn't exist
-#: src/file.c:1074
+#: src/file.c:1100
#, c-format
msgid ""
" Cannot stat file \"%s\" \n"
@@ -3295,17 +3528,17 @@
" No se puede identificar el archivo \"%s\" \n"
" %s "
-#: src/file.c:1096
+#: src/file.c:1122
#, c-format
msgid " `%s' and `%s' are the same file "
msgstr " \"%s\" y \"%s\" son el mismo archivo "
-#: src/file.c:1103
+#: src/file.c:1129
#, c-format
msgid " Cannot overwrite directory `%s' "
msgstr " No se puede sobrescribir el directorio \"%s\" "
-#: src/file.c:1140
+#: src/file.c:1172
#, c-format
msgid ""
" Cannot move file \"%s\" to \"%s\" \n"
@@ -3314,7 +3547,7 @@
" No puedo mover el archivo \"%s\" a \"%s\" \n"
" %s "
-#: src/file.c:1160
+#: src/file.c:1192
#, c-format
msgid ""
" Cannot remove file \"%s\" \n"
@@ -3323,17 +3556,17 @@
" No puedo borrar el archivo \"%s\" \n"
" %s"
-#: src/file.c:1213
+#: src/file.c:1246
#, c-format
msgid " Cannot overwrite directory \"%s\" %s "
msgstr " No puedo sobrescribir el directorio \"%s\" %s "
-#: src/file.c:1215
+#: src/file.c:1248
#, c-format
msgid " Cannot overwrite file \"%s\" %s "
msgstr " No puedo sobrescribir el archivo \"%s\" %s "
-#: src/file.c:1238
+#: src/file.c:1275
#, c-format
msgid ""
" Cannot move directory \"%s\" to \"%s\" \n"
@@ -3342,7 +3575,7 @@
" No puedo mover el directorio \"%s\" a \"%s\" \n"
" %s "
-#: src/file.c:1301
+#: src/file.c:1338
#, c-format
msgid ""
" Cannot delete file \"%s\" \n"
@@ -3351,7 +3584,7 @@
" No puedo borrar el archivo \"%s\" \n"
" %s "
-#: src/file.c:1362 src/file.c:1429 src/file.c:1458
+#: src/file.c:1399 src/file.c:1469 src/file.c:1501
#, c-format
msgid ""
" Cannot remove directory \"%s\" \n"
@@ -3360,7 +3593,7 @@
" No puedo eliminar el directorio \"%s\" \n"
" %s "
-#: src/file.c:1494
+#: src/file.c:1540
msgid " Internal error: get_file \n"
msgstr " Error interno: get_file \n"
@@ -3373,87 +3606,87 @@
#. * (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:1661
msgid "1Copy"
msgstr "1Copiar"
-#: src/file.c:1615
+#: src/file.c:1661
msgid "1Move"
msgstr "1Mover"
-#: src/file.c:1615
+#: src/file.c:1661
msgid "1Delete"
msgstr "1�Borrar"
-#: src/file.c:1630
+#: src/file.c:1676
#, c-format
msgid "%o %f \"%s\"%m"
msgstr "%o %f \"%s\"%m"
-#: src/file.c:1631
+#: src/file.c:1677
#, c-format
msgid "%o %d %f%m"
msgstr "%o %d %f%m"
-#: src/file.c:1633
+#: src/file.c:1679
#, c-format
msgid "%o %f \"%s\"%e"
msgstr "%o %f \"%s\"%e"
-#: src/file.c:1634
+#: src/file.c:1680
#, c-format
msgid "%o %d %f%e"
msgstr "%o %d %f%e"
-#: src/file.c:1638
+#: src/file.c:1684
msgid "file"
msgstr "archivo"
-#: src/file.c:1638
+#: src/file.c:1684
msgid "files"
msgstr "archivos"
-#: src/file.c:1638
+#: src/file.c:1684
msgid "directory"
msgstr "directorio"
-#: src/file.c:1638
+#: src/file.c:1684
msgid "directories"
msgstr "directorios"
-#: src/file.c:1639
+#: src/file.c:1685
msgid "files/directories"
msgstr "archivos/directorios"
-#: src/file.c:1639
+#: src/file.c:1685
msgid " with source mask:"
msgstr " aplicando la m�scara:"
-#: src/file.c:1791
+#: src/file.c:1837
msgid " Can't operate on \"..\"! "
msgstr " �No puedo operar sobre \"..\"! "
-#: src/file.c:1810
+#: src/file.c:1856
msgid "Yes"
msgstr "S�"
-#: src/file.c:1810
+#: src/file.c:1856
msgid "No"
msgstr "No"
-#: src/file.c:1863
+#: src/file.c:1909
msgid " Sorry, I could not put the job in background "
msgstr " Lo siento, no pude poner la tarea en 2� plano "
-#: src/file.c:1946 src/file.c:2051
+#: src/file.c:1996 src/file.c:2080
msgid " Internal failure "
msgstr " Fallo interno "
-#: src/file.c:1946 src/file.c:2051
+#: src/file.c:1996 src/file.c:2080
msgid " Unknown file operation "
msgstr " Operaci�n desconocida sobre el archivo "
-#: src/file.c:1965
+#: src/file.c:2011
#, c-format
msgid ""
" Destination \"%s\" must be a directory \n"
@@ -3462,15 +3695,15 @@
" El destino \"%s\" debe ser un directorio \n"
" %s "
-#: src/file.c:2136
+#: src/file.c:2172
msgid "&Retry"
msgstr "&Reintentar"
-#: src/file.c:2136 src/file.c:2197 src/filegui.c:260 src/filegui.c:562
+#: src/file.c:2172 src/file.c:2233 src/filegui.c:263 src/filegui.c:591
msgid "&Abort"
msgstr "&Abortar"
-#: src/file.c:2188
+#: src/file.c:2224
msgid ""
"\n"
" Directory not empty. \n"
@@ -3480,7 +3713,7 @@
" El directorio no est� vac�o.\n"
" �Borrarlo recursivamente? "
-#: src/file.c:2189
+#: src/file.c:2225
msgid ""
"\n"
" Background process: Directory not empty \n"
@@ -3490,134 +3723,134 @@
" Proceso en 2� plano: El directorio no est� vac�o.\n"
" �Borrarlo recursivamente? "
-#: src/file.c:2196
+#: src/file.c:2232
msgid "a&ll"
msgstr "&Todo"
-#: src/file.c:2196 src/filegui.c:565
+#: src/file.c:2232 src/filegui.c:594
msgid "non&E"
msgstr "nin&Guno"
-#: src/file.c:2206
+#: src/file.c:2242
msgid " Type 'yes' if you REALLY want to delete "
msgstr " Teclee \"yes\" si REALMENTE quiere borrar "
-#: src/file.c:2208
+#: src/file.c:2244
msgid "all the directories "
msgstr "todos los directorios "
-#: src/file.c:2210
+#: src/file.c:2246
msgid " Recursive Delete "
msgstr " Borrado recursivo "
-#: src/file.c:2211
+#: src/file.c:2247
msgid " Background process: Recursive Delete "
msgstr " Proceso en 2� plano: Borrado recursivo "
-#: src/filegui.c:404
+#: src/filegui.c:423
msgid "File"
msgstr "Archivo"
-#: src/filegui.c:425
+#: src/filegui.c:446
msgid "Count"
msgstr "Total"
-#: src/filegui.c:444
+#: src/filegui.c:467
msgid "Bytes"
msgstr "Bytes"
-#: src/filegui.c:479
+#: src/filegui.c:504
msgid "Source"
msgstr "Origen"
-#: src/filegui.c:500
+#: src/filegui.c:527
msgid "Target"
msgstr "Destino"
-#: src/filegui.c:520
+#: src/filegui.c:549
msgid "Deleting"
msgstr "Borrando"
-#: src/filegui.c:560
+#: src/filegui.c:589
#, c-format
msgid "Target file \"%s\" already exists!"
msgstr "�El archivo destino \"%s\" ya existe!"
-#: src/filegui.c:563
+#: src/filegui.c:592
msgid "if &Size differs"
msgstr "si el ta&Ma�o difiere"
-#: src/filegui.c:566
+#: src/filegui.c:595
msgid "&Update"
msgstr "actuali&Zar"
-#: src/filegui.c:568
+#: src/filegui.c:597
msgid "Overwrite all targets?"
msgstr "�Sobrescribir todos los archivos?"
-#: src/filegui.c:570
+#: src/filegui.c:599
msgid "&Reget"
msgstr "&Reintentar"
-#: src/filegui.c:571
+#: src/filegui.c:600
msgid "ap&Pend"
msgstr "a�a&Dir"
-#: src/filegui.c:574
+#: src/filegui.c:603
msgid "Overwrite this target?"
msgstr "�Sobrescribir este archivo?"
-#: src/filegui.c:576
+#: src/filegui.c:605
#, c-format
msgid "Target date: %s, size %d"
msgstr "Archivo destino: fecha %s, tama�o %d"
-#: src/filegui.c:578
+#: src/filegui.c:607
#, c-format
msgid "Source date: %s, size %d"
msgstr "Archivo origen: fecha %s, tama�o %d"
-#: src/filegui.c:662
+#: src/filegui.c:691
msgid " File exists "
msgstr " El archivo ya existe "
-#: src/filegui.c:663
+#: src/filegui.c:692
msgid " Background process: File exists "
msgstr " Proceso en 2� plano: El archivo ya existe "
#. follow symlinks and preserve Attributes must be the first
-#: src/filegui.c:773
+#: src/filegui.c:804
msgid "preserve &Attributes"
msgstr "&Preservar atributos"
#. &op_preserve
-#: src/filegui.c:775
+#: src/filegui.c:806
msgid "follow &Links"
msgstr "seguir en&Laces"
#. &file_mask_op_follow_links
-#: src/filegui.c:777
+#: src/filegui.c:808
msgid "to:"
msgstr "a:"
-#: src/filegui.c:778
+#: src/filegui.c:809
msgid "&Using shell patterns"
msgstr "&Usando patrones shell"
-#: src/filegui.c:799
+#: src/filegui.c:830
msgid "&Background"
msgstr "en 2� plan&O"
-#: src/filegui.c:808
+#: src/filegui.c:839
msgid "&Stable Symlinks"
msgstr "enlaces simb�licos &Estables"
#. &file_mask_stable_symlinks
-#: src/filegui.c:810
+#: src/filegui.c:841
msgid "&Dive into subdir if exists"
msgstr "copiar &Recursivamente en subdirectorios"
-#: src/filegui.c:969
+#: src/filegui.c:1000
#, c-format
msgid ""
"Invalid source pattern `%s' \n"
@@ -3670,7 +3903,7 @@
msgid "Content: "
msgstr "Contenido: "
-#: src/find.c:171 src/main.c:1208 src/main.c:1229
+#: src/find.c:171 src/main.c:1219 src/main.c:1240
msgid "&Tree"
msgstr "�r&Bol"
@@ -3695,7 +3928,7 @@
msgid "Finished"
msgstr "Terminado"
-#: src/find.c:561 src/view.c:1465
+#: src/find.c:561 src/view.c:1467
#, c-format
msgid "Searching %s"
msgstr "Buscando %s"
@@ -3718,28 +3951,24 @@
#. The buttons
#: src/find.c:752
-#, fuzzy
msgid "Change to this directory"
-msgstr "No puedo cambiar de directorio"
+msgstr "Cambia a este directorio"
#: src/find.c:753
-#, fuzzy
msgid "Search again"
-msgstr "Buscar de nuevo..."
+msgstr "Buscar de nuevo"
#: src/find.c:758
-#, fuzzy
msgid "View this file"
-msgstr " Ver archivo "
+msgstr "Ver este fichero"
#: src/find.c:759
msgid "Edit this file"
-msgstr ""
+msgstr "Editar este fichero"
#: src/find.c:760
-#, fuzzy
msgid "Send the results to a Panel"
-msgstr "Ejecutar un comando y mostrar resultados en un panel"
+msgstr "Enviar los resultados a un panel"
#: src/fixhlp.c:171
msgid "Usage: fixhlp <width> <tocname>\n"
@@ -3996,100 +4225,100 @@
msgid " file your old hotlist entries were not deleted"
msgstr ". Sus favoritos viejos no fueron borrados"
-#: src/info.c:80
+#: src/info.c:83
#, c-format
msgid "Midnight Commander %s"
msgstr "Midnight Commander %s"
-#: src/info.c:112
+#: src/info.c:109
+#, c-format
+msgid "File: %s"
+msgstr "Archivo: %s"
+
+#: src/info.c:121
msgid "Free nodes %d (%d%%) of %d"
msgstr " y %d (%d%%) de %d inodos"
-#: src/info.c:118
+#: src/info.c:127
msgid "No node information"
msgstr "Sin informaci�n sobre inodos"
-#: src/info.c:123
+#: src/info.c:132
msgid "Free space "
msgstr "Disponible "
-#: src/info.c:125
+#: src/info.c:134
msgid " (%d%%) of "
msgstr " (%d%%) de"
-#: src/info.c:129
+#: src/info.c:138
msgid "No space information"
msgstr "Espacio libre desconocido"
-#: src/info.c:133
+#: src/info.c:142
#, c-format
msgid "Type: %s "
msgstr " Tipo: %s"
-#: src/info.c:133
+#: src/info.c:142
msgid "non-local vfs"
msgstr "VFS no-local"
-#: src/info.c:139
+#: src/info.c:148
#, c-format
msgid "Device: %s"
msgstr " Origen: %s"
-#: src/info.c:143
+#: src/info.c:152
#, c-format
msgid "Filesystem: %s"
msgstr "Sistema en %s"
-#: src/info.c:148
+#: src/info.c:157
#, c-format
msgid "Accessed: %s"
msgstr "Accedido: %s"
-#: src/info.c:152
+#: src/info.c:161
#, c-format
msgid "Modified: %s"
msgstr "Modificado: %s"
-#: src/info.c:156
+#: src/info.c:165
#, c-format
msgid "Created: %s"
msgstr "Cambiado: %s"
-#: src/info.c:169
+#: src/info.c:178
msgid "Size: "
msgstr "Tama�o: "
-#: src/info.c:172
+#: src/info.c:181
#, c-format
msgid " (%d blocks)"
msgstr " (%d bloques)"
-#: src/info.c:178
+#: src/info.c:187
#, c-format
msgid "Owner: %s/%s"
msgstr "Due�o: %s/%s"
-#: src/info.c:183
+#: src/info.c:192
#, c-format
msgid "Links: %d"
msgstr "N� enlaces: %d"
-#: src/info.c:187
+#: src/info.c:196
#, c-format
msgid "Mode: %s (%04o)"
msgstr "Modo: %s (%04o)"
-#: src/info.c:192
+#: src/info.c:201
#, c-format
msgid "Location: %Xh:%Xh"
msgstr "Ubicado: %Xh:%Xh"
-#: src/info.c:198
-#, c-format
-msgid "File: %s"
-msgstr "Archivo: %s"
-
-#: src/info.c:202
+#: src/info.c:211
msgid "File: None"
msgstr "Archivo: Ninguno"
@@ -4148,7 +4377,7 @@
#: src/layout.c:380
msgid " Panel split "
-msgstr " Divisi�n de paneles "
+msgstr " Disposici�n de paneles "
#: src/layout.c:381
msgid " Highlight... "
@@ -4244,7 +4473,7 @@
msgid "key, or click with the mouse to define it. Move around with Tab."
msgstr "en esa tecla o presione el mouse. Puede moverse con el tabulador."
-#: src/main.c:675
+#: src/main.c:692
msgid ""
" The Commander can't change to the directory that \n"
" the subshell claims you are in. Perhaps you have \n"
@@ -4256,247 +4485,247 @@
" �Acaso borr� usted el directorio o se dio otros \n"
" permisos con el comando \"su\"?"
-#: src/main.c:750
+#: src/main.c:767
msgid "Press any key to continue..."
msgstr "Presione cualquier tecla para continuar..."
-#: src/main.c:800
+#: src/main.c:817
msgid " The shell is already running a command "
msgstr " El shell ya se encuentra corriendo un comando "
-#: src/main.c:1205 src/main.c:1226
+#: src/main.c:1216 src/main.c:1237
msgid "&Listing mode..."
msgstr "&Modo de listado..."
-#: src/main.c:1206 src/main.c:1227
+#: src/main.c:1217 src/main.c:1238
msgid "&Quick view C-x q"
msgstr "&Vista r�pida C-x q"
-#: src/main.c:1207 src/main.c:1228
+#: src/main.c:1218 src/main.c:1239
msgid "&Info C-x i"
msgstr "&Informaci�n C-x i"
-#: src/main.c:1210 src/main.c:1231
+#: src/main.c:1221 src/main.c:1242
msgid "&Sort order..."
msgstr "&Ordenar..."
-#: src/main.c:1212 src/main.c:1233
+#: src/main.c:1223 src/main.c:1244
msgid "&Filter..."
msgstr "&Filtro..."
-#: src/main.c:1215 src/main.c:1236
+#: src/main.c:1226 src/main.c:1247
msgid "&Network link..."
msgstr "&Conexi�n por red..."
-#: src/main.c:1216 src/main.c:1237
+#: src/main.c:1227 src/main.c:1248
msgid "FT&P link..."
msgstr "conexi�n por FT&P..."
-#: src/main.c:1220 src/main.c:1241
+#: src/main.c:1231 src/main.c:1252
msgid "&Drive... M-d"
msgstr "&Disco... M-d"
-#: src/main.c:1222 src/main.c:1243
+#: src/main.c:1233 src/main.c:1254
msgid "&Rescan C-r"
msgstr "&Releer C-r"
-#: src/main.c:1247
+#: src/main.c:1258
msgid "&User menu F2"
msgstr "me&N� de usuario F2"
-#: src/main.c:1248
+#: src/main.c:1259
msgid "&View F3"
msgstr "&Ver F3"
-#: src/main.c:1249
+#: src/main.c:1260
msgid "Vie&w file... "
msgstr "ver arc&Hivo..."
-#: src/main.c:1250
+#: src/main.c:1261
msgid "&Filtered view M-!"
msgstr "ver archivo (con &Filtro)... M-!"
-#: src/main.c:1251
+#: src/main.c:1262
msgid "&Edit F4"
msgstr "&Editar F4"
-#: src/main.c:1252
+#: src/main.c:1263
msgid "&Copy F5"
msgstr "&Copiar... F5"
-#: src/main.c:1253
+#: src/main.c:1264
msgid "c&Hmod C-x c"
msgstr "cambiar &Permisos... C-x c"
-#: src/main.c:1255
+#: src/main.c:1266
msgid "&Link C-x l"
msgstr "crear en&Lace... C-x l"
-#: src/main.c:1256
+#: src/main.c:1267
msgid "&SymLink C-x s"
msgstr "crear enlace &Simb�lico... C-x s"
-#: src/main.c:1257
+#: src/main.c:1268
msgid "edit s&Ymlink C-x C-s"
msgstr "edi&Tar enlace simb�lico C-x C-s"
-#: src/main.c:1258
+#: src/main.c:1269
msgid "ch&Own C-x o"
msgstr "cambiar due�&O... C-x o"
-#: src/main.c:1259
+#: src/main.c:1270
msgid "&Advanced chown "
msgstr "c&Ambiar due�o y permisos..."
-#: src/main.c:1261
+#: src/main.c:1272
msgid "&Rename/Move F6"
msgstr "&Renombrar/mover... F6"
-#: src/main.c:1262
+#: src/main.c:1273
msgid "&Mkdir F7"
msgstr "crear &Directorio... F7"
-#: src/main.c:1263
+#: src/main.c:1274
msgid "&Delete F8"
msgstr "&Borrar F8"
-#: src/main.c:1264
+#: src/main.c:1275
msgid "&Quick cd M-c"
msgstr "ca&Mbiar directorio... M-c"
-#: src/main.c:1266
+#: src/main.c:1277
msgid "select &Group M-+"
msgstr "seleccionar &Grupo... M-+"
-#: src/main.c:1267
+#: src/main.c:1278
msgid "u&Nselect group M-\\"
msgstr "de-seleccionar gr&Upo... M-\\"
-#: src/main.c:1268
+#: src/main.c:1279
msgid "reverse selec&Tion M-*"
msgstr "&Invertir la selecci�n M-*"
-#: src/main.c:1270
+#: src/main.c:1281
msgid "e&Xit F10"
msgstr "sali&R F10"
-#: src/main.c:1280
+#: src/main.c:1291
msgid "&Directory tree"
msgstr "�rbol de &Directorios"
-#: src/main.c:1282
+#: src/main.c:1293
msgid "&Find file M-?"
msgstr "&Buscar archivos... M-?"
-#: src/main.c:1283
+#: src/main.c:1294
msgid "s&Wap panels C-u"
msgstr "&Intercambiar paneles C-u"
-#: src/main.c:1284
+#: src/main.c:1295
msgid "switch &Panels on/off C-o"
msgstr "&Activar/desactivar paneles C-o"
-#: src/main.c:1285
+#: src/main.c:1296
msgid "&Compare directories C-x d"
msgstr "&Comparar directorios... C-x d"
-#: src/main.c:1286
+#: src/main.c:1297
msgid "e&Xternal panelize C-x !"
msgstr "b�squedas e&Xternas... C-x !"
-#: src/main.c:1287
+#: src/main.c:1298
msgid "show directory s&Izes"
msgstr "mostrar &Tama�os de los directorios"
-#: src/main.c:1289
+#: src/main.c:1300
msgid "command &History"
msgstr "&Historia de comandos"
-#: src/main.c:1290
+#: src/main.c:1301
msgid "di&Rectory hotlist C-\\"
msgstr "directorios &Favoritos... C-\\"
-#: src/main.c:1292
+#: src/main.c:1303
msgid "&Active VFS list C-x a"
msgstr "directorios virtuales (&VFS)... C-x a"
-#: src/main.c:1295
+#: src/main.c:1306
msgid "&Background jobs C-x j"
msgstr "&Procesos en 2� plano... C-x j"
-#: src/main.c:1299
+#: src/main.c:1310
msgid "&Undelete files (ext2fs only)"
msgstr "&Recuperar archivos (ext2fs)..."
-#: src/main.c:1302
+#: src/main.c:1313
msgid "&Listing format edit"
msgstr "edici�n del formato de &Listado"
-#: src/main.c:1304
+#: src/main.c:1315
msgid "&Extension file edit"
msgstr "&Editar el archivo de extensiones..."
-#: src/main.c:1305
+#: src/main.c:1316
msgid "&Menu file edit"
msgstr "editar archivo de &Men�..."
-#: src/main.c:1310
+#: src/main.c:1321
msgid "&Configuration..."
msgstr "&Configuraci�n..."
-#: src/main.c:1312
+#: src/main.c:1323
msgid "c&Onfirmation..."
msgstr "c&Onfirmaci�n..."
-#: src/main.c:1313
+#: src/main.c:1324
msgid "&Display bits..."
msgstr "&Juego de caracteres..."
-#: src/main.c:1315
+#: src/main.c:1326
msgid "learn &Keys..."
msgstr "redefinir &Teclas..."
-#: src/main.c:1318
+#: src/main.c:1329
msgid "&Virtual FS..."
msgstr "sistema de archivos &Virtual (VFS)..."
-#: src/main.c:1321
+#: src/main.c:1332
msgid "&Save setup"
msgstr "&Guardar configuraci�n"
-#: src/main.c:1337 src/main.c:1339
+#: src/main.c:1348 src/main.c:1350
msgid " &Left "
msgstr " &Izquierdo "
-#: src/main.c:1339
+#: src/main.c:1350
msgid " &Above "
msgstr " a&Rriba "
-#: src/main.c:1342
+#: src/main.c:1353
msgid " &File "
msgstr " &Archivo "
-#: src/main.c:1343
+#: src/main.c:1354
msgid " &Command "
msgstr " &Comando "
-#: src/main.c:1344
+#: src/main.c:1355
msgid " &Options "
msgstr " &Opciones "
-#: src/main.c:1346 src/main.c:1348
+#: src/main.c:1357 src/main.c:1359
msgid " &Right "
msgstr " &Derecho "
-#: src/main.c:1348
+#: src/main.c:1359
msgid " &Below "
msgstr " a&Bajo "
-#: src/main.c:1403
+#: src/main.c:1414
msgid " Information "
msgstr " Informaci�n "
-#: src/main.c:1404
+#: src/main.c:1415
msgid ""
" Using the fast reload option may not reflect the exact \n"
" directory contents. In this cases you'll need to do a \n"
@@ -4508,56 +4737,136 @@
" caso use C-r para obligar al programa a actualizar los datos.\n"
" Lea la p�gina de manual para mayor informaci�n. "
-#: src/main.c:1678 src/screen.c:2285 src/screen.c:2315
+#: src/main.c:1689 src/screen.c:2305 src/screen.c:2335
msgid "Menu"
msgstr "Men�"
-#: src/main.c:1883
+#: src/main.c:1894
msgid "Thank you for using GNU Midnight Commander"
msgstr "Gracias por usar el GNU Midnight Commander"
-#: src/main.c:2242
+#: src/main.c:2253
#, c-format
msgid "with mouse support on xterm%s.\n"
msgstr "con soporte para rat�n en xterm%s.\n"
-#: src/main.c:2243
+#: src/main.c:2254
msgid " and the Linux console"
msgstr " y la consola Linux"
-#: src/main.c:2338
+#: src/main.c:2349
msgid "The TERM environment variable is unset!\n"
msgstr "�La variable de entorno TERM est� sin definir!\n"
-#: src/main.c:2545
+#: src/main.c:2556
#, c-format
msgid "Library directory for the Midnight Commander: %s\n"
msgstr "Directorio para archivos del Midnight Commander: %s\n"
-#: src/main.c:2556
+#: src/main.c:2567
msgid ""
"Option -m is obsolete. Please look at Display Bits... in the Option's menu\n"
msgstr ""
"La opci�n -m est� obsoleta. Vea \"Juego de caracteres...\" en el men� "
"\"Opciones\"\n"
-#: src/main.c:2682
+#: src/main.c:2646
+msgid "Use to debug the background code"
+msgstr "Se usa para depurar c�digo de 2� plano"
+
+#: src/main.c:2652
+msgid "Request to run in color mode"
+msgstr "Solicita la ejecuci�n en color"
+
+#: src/main.c:2654
+msgid "Specifies a color configuration"
+msgstr "Indica una configuraci�n de colores"
+
+#: src/main.c:2659
+msgid "Edits one file"
+msgstr "Edita un fichero"
+
+#: src/main.c:2663
+msgid "Displays this help message"
+msgstr "Muestra este mensaje de ayuda"
+
+#: src/main.c:2666
+msgid "Displays a help screen on how to change the color scheme"
+msgstr "Muestra una pantalla de ayuda sobre c�mo cambiar colores"
+
+#: src/main.c:2669
+msgid "Log ftp dialog to specified file"
+msgstr "Registra el di�logo ftp en el archivo indicado"
+
+#: src/main.c:2676
+msgid "Obsolete"
+msgstr "Obsoleto"
+
+#: src/main.c:2678
+msgid "Requests to run in black and white"
+msgstr "Solicita ejecuci�n en blanco y negro"
+
+#: src/main.c:2680
+msgid "Disable mouse support in text version"
+msgstr "Desactiva el uso del rat�n en la versi�n texto"
+
+#: src/main.c:2683
+msgid "Disables subshell support"
+msgstr "Desactiva el uso de subshell"
+
+#: src/main.c:2687
+msgid "Prints working directory at program exit"
+msgstr "Escribe el nombre del directorio al salir del programa"
+
+#: src/main.c:2689
+msgid "Resets soft keys on HP terminals"
+msgstr "Restablece teclas en terminales HP"
+
+#: src/main.c:2691
+msgid "To run on slow terminals"
+msgstr "Para ejecuci�n en terminales lentos"
+
+#: src/main.c:2694
+msgid "Use stickchars to draw"
+msgstr "Usa palotes para dibujar"
+
+#: src/main.c:2698
+msgid "Enables subshell support (default)"
+msgstr "Activa uso de subshell (por defecto)"
+
+#: src/main.c:2703
+msgid "Tries to use termcap instead of terminfo"
+msgstr "Intenta utilizar termcap en vez de terminfo"
+
+#: src/main.c:2707
+msgid "Displays the current version"
+msgstr "Muestra el n�mero de versi�n"
+
+#: src/main.c:2709
+msgid "Launches the file viewer on a file"
+msgstr "Abre un fichero con el visor"
+
+#: src/main.c:2711
+msgid "Forces xterm features"
+msgstr "Utiliza las posibilidades de xterm"
+
+#: src/main.c:2713
msgid "Geometry for the window"
msgstr "Geometr�a de la ventana"
-#: src/main.c:2682
+#: src/main.c:2713
msgid "GEOMETRY"
msgstr "GEOMETRIA"
-#: src/main.c:2683
+#: src/main.c:2714
msgid "No windows opened at startup"
msgstr "Ninguna ventana abierta al inicio"
-#: src/main.c:2684
+#: src/main.c:2715
msgid "Force activation even if a server is already running"
-msgstr ""
+msgstr "Activaci�n forzosa, incluso si un servidor esta en ejecuci�n"
-#: src/main.c:2956
+#: src/main.c:2987
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"
@@ -4565,11 +4874,19 @@
"No pude abrir la l�nea de la terminal. Necesita ejecutar \"mc\" sin\n"
"la opci�n -P. En algunos sistemas, basta con ejecutar `which mc`\n"
-#: src/main.c:3030
+#: src/main.c:3063
+msgid ""
+"You are running the GNOME Midnight Commander as root. \n"
+"\n"
+"You will not be protected from severly damaging your system\n"
+"if you continue."
+msgstr ""
+
+#: src/main.c:3073
msgid " Notice "
msgstr " Aviso "
-#: src/main.c:3031
+#: src/main.c:3074
msgid ""
" The Midnight Commander configuration files \n"
" are now stored in the ~/.mc directory, the \n"
@@ -4697,7 +5014,7 @@
msgid " External panelize "
msgstr " B�squedas externas "
-#: src/panelize.c:194 src/panelize.c:462
+#: src/panelize.c:194 src/panelize.c:458
msgid "External panelize"
msgstr "B�squedas externas"
@@ -4729,7 +5046,7 @@
msgid "Cannot invoke command."
msgstr "No puedo invocar el comando."
-#: src/panelize.c:462
+#: src/panelize.c:458
msgid "Pipe close failed"
msgstr "Fallo al cerrar la tuber�a"
@@ -4753,10 +5070,6 @@
msgid "CTime"
msgstr "FechaCmb"
-#: src/screen.c:432
-msgid "Permission"
-msgstr "Permisos"
-
#: src/screen.c:433
msgid "Perm"
msgstr "Perm"
@@ -4782,27 +5095,27 @@
msgid " %s bytes in %d file%s"
msgstr " %s bytes en %d archivo%s"
-#: src/screen.c:1289
+#: src/screen.c:1306
msgid "Unknow tag on display format: "
msgstr "Campo desconocido en el formato de pantalla: "
-#: src/screen.c:2048
+#: src/screen.c:2068
msgid " Do you really want to execute? "
msgstr " �Realmente quiere ejecutar?"
-#: src/screen.c:2063
+#: src/screen.c:2083
msgid " No action taken "
msgstr " No se tom� ninguna medida "
-#: src/screen.c:2289 src/screen.c:2319 src/tree.c:1026
+#: src/screen.c:2309 src/screen.c:2339 src/tree.c:1026
msgid "RenMov"
msgstr "RenMov"
-#: src/screen.c:2290 src/screen.c:2320 src/tree.c:1030
+#: src/screen.c:2310 src/screen.c:2340 src/tree.c:1030
msgid "Mkdir"
msgstr "Mkdir"
-#: src/screen.c:2306
+#: src/screen.c:2326
#, c-format
msgid ""
" Can't chdir to %s \n"
@@ -4816,19 +5129,19 @@
msgid "Couldn't open named pipe %s\n"
msgstr "No pude abrir la tuber�a con nombre %s\n"
-#: src/subshell.c:700
+#: src/subshell.c:705
msgid " The shell is still active. Quit anyway? "
msgstr " El shell todav�a est� activo. �Terminar de todas maneras?"
-#: src/subshell.c:726
+#: src/subshell.c:731
msgid " There are stopped jobs."
msgstr " Hay procesos detenidos."
-#: src/subshell.c:727
+#: src/subshell.c:732
msgid " Quit anyway? "
msgstr " �Terminar de todas maneras? "
-#: src/subshell.c:780
+#: src/subshell.c:785
#, c-format
msgid "Warning: Couldn't change to %s.\n"
msgstr "Cuidado: no pude cambiar a %s.\n"
@@ -4947,7 +5260,7 @@
msgid " User menu "
msgstr " Men� de usuario "
-#: src/util.c:220
+#: src/util.c:228
msgid "name_trunc: too big"
msgstr "name_trunc: demasiado grande"
@@ -5022,20 +5335,20 @@
msgid " [grow]"
msgstr " [crece]"
-#: src/view.c:1457
+#: src/view.c:1459
#, c-format
msgid "Searching for `%s'"
msgstr "Buscando \"%s\""
-#: src/view.c:1564 src/view.c:1686
+#: src/view.c:1566 src/view.c:1688
msgid " Search string not found "
msgstr " La cadena buscada no ha sido encontrada "
-#: src/view.c:1725
+#: src/view.c:1727
msgid " Invalid regular expression "
msgstr " Expresi�n regular inv�lida "
-#: src/view.c:1855
+#: src/view.c:1850
#, c-format
msgid ""
" The current line number is %d.\n"
@@ -5044,59 +5357,59 @@
" La l�nea actual es %d.\n"
" Teclee la nueva l�nea:"
-#: src/view.c:1885
+#: src/view.c:1880
msgid " Enter regexp:"
msgstr " Teclee la expresi�n regular:"
-#: src/view.c:1990
+#: src/view.c:1985
msgid "Ascii"
msgstr "Ascii"
-#: src/view.c:1990
+#: src/view.c:1985
msgid "Hex"
msgstr "Hex"
-#: src/view.c:1991
+#: src/view.c:1986
msgid "Line"
msgstr "L�nea"
-#: src/view.c:1992
+#: src/view.c:1987
msgid "RxSrch"
msgstr "BusqRx"
-#: src/view.c:1995
+#: src/view.c:1990
msgid "EdText"
msgstr "EdTexto"
-#: src/view.c:1995
+#: src/view.c:1990
msgid "EdHex"
msgstr "EdHex"
-#: src/view.c:1997
+#: src/view.c:1992
msgid "UnWrap"
msgstr "Desple"
-#: src/view.c:1997
+#: src/view.c:1992
msgid "Wrap"
msgstr "Plegar"
-#: src/view.c:2000
+#: src/view.c:1995
msgid "HxSrch"
msgstr "BusqHx"
-#: src/view.c:2003
+#: src/view.c:1998
msgid "Raw"
msgstr "Crudo"
-#: src/view.c:2003
+#: src/view.c:1998
msgid "Parse"
msgstr "Procesado"
-#: src/view.c:2007
+#: src/view.c:2002
msgid "Unform"
msgstr "SinForm"
-#: src/view.c:2007
+#: src/view.c:2002
msgid "Format"
msgstr "Formato"
@@ -5295,18 +5608,6 @@
msgid "NumLock on keypad"
msgstr "Bloquea n�meros, pad"
-#: src/wtools.c:587 vfs/vfs.c:1760
-msgid "Password:"
-msgstr "Contrase�a:"
-
-#: src/wtools.c:587
-msgid "Password"
-msgstr "Contrase�a"
-
-#: src/wtools.c:642
-msgid "Ok"
-msgstr "Aceptar"
-
#: vfs/extfs.c:266
#, c-format
msgid ""
@@ -5324,18 +5625,164 @@
msgid "Sorry, we can not do password authenticated connections for now."
msgstr "Lo siento, las conexiones con contrase�a a�n no son posibles."
+#: vfs/fish.c:229
+msgid " fish: Password required for "
+msgstr " fish: Contrase�a requerida para "
+
+#: vfs/ftpfs.c:326
+#, c-format
+msgid "ftpfs: Disconnecting from %s"
+msgstr "ftpfs: Desconectando de %s"
+
+#: vfs/ftpfs.c:377
+msgid " FTP: Password required for "
+msgstr " FTP: Contrase�a requerida para "
+
+#: vfs/ftpfs.c:409
+msgid " Proxy: Password required for "
+msgstr " Proxy: Contrase�a requerida para "
+
+#: vfs/ftpfs.c:435
+msgid "ftpfs: sending proxy login name"
+msgstr "ftpfs: enviando nombre de usuario al proxy"
+
+#: vfs/ftpfs.c:439
+msgid "ftpfs: sending proxy user password"
+msgstr "ftpfs: enviando contrase�a de usuario al proxy"
+
+#: vfs/ftpfs.c:443
+msgid "ftpfs: proxy authentication succeeded"
+msgstr "ftpfs: la identificaci�n ante el proxy tuvo �xito"
+
+#: vfs/ftpfs.c:447
+#, c-format
+msgid "ftpfs: connected to %s"
+msgstr "ftpfs: conectado a %s"
+
+#: vfs/ftpfs.c:464
+msgid "ftpfs: sending login name"
+msgstr "ftpfs: enviando nombre de usuario"
+
+#: vfs/ftpfs.c:469
+msgid "ftpfs: sending user password"
+msgstr "ftpfs: enviando contrase�a de usuario"
+
+#: vfs/ftpfs.c:474
+msgid "ftpfs: logged in"
+msgstr "ftpfs: autorizados"
+
+#: vfs/ftpfs.c:489
+#, c-format
+msgid "ftpfs: Login incorrect for user %s "
+msgstr "ftpfs: denegada autorizaci�n al usuario %s"
+
#: vfs/ftpfs.c:521
#, c-format
msgid " Could not set source routing (%s)"
-msgstr " No pude preestablecer la ruta (%s)"
+msgstr " No se pudo prefijar la ruta (%s)"
+
+#: vfs/ftpfs.c:650
+msgid "ftpfs: Invalid host name."
+msgstr "ftpfs: nombre de m�quina incorrecto"
+
+#: vfs/ftpfs.c:670
+msgid "ftpfs: Invalid host address."
+msgstr "ftpfs: direcci�n de m�quina incorrecta"
+
+#: vfs/ftpfs.c:695
+#, c-format
+msgid "ftpfs: making connection to %s"
+msgstr "ftpfs: estableciendo conexi�n con %s"
+
+#: vfs/ftpfs.c:705
+msgid "ftpfs: connection interrupted by user"
+msgstr "ftpfs: conexi�n abortada por el usuario"
+
+#: vfs/ftpfs.c:707
+#, c-format
+msgid "ftpfs: connection to server failed: %s"
+msgstr "ftpfs: conexi�n al servidor fracas�: %s"
+
+#: vfs/ftpfs.c:791
+#, c-format
+msgid "Waiting to retry... %d (Control-C to cancel)"
+msgstr "Esperando antes de insistir... %d (Ctrl-C para cancelar)"
+
+#: vfs/ftpfs.c:985
+msgid "ftpfs: could not setup passive mode for source routing"
+msgstr "ftpfs: no se pudo aplicar el enrutamiento en \"modo pasivo\""
+
+#: vfs/ftpfs.c:995
+msgid "ftpfs: could not setup passive mode"
+msgstr "ftpfs: no se pudo aplicar el \"modo pasivo\""
+
+#: vfs/ftpfs.c:1066
+msgid "ftpfs: aborting transfer."
+msgstr "ftpfs: abortando transferencia."
+
+#: vfs/ftpfs.c:1068
+#, c-format
+msgid "ftpfs: abort error: %s"
+msgstr "ftpfs: error al abortar: %s"
+
+#: vfs/ftpfs.c:1073
+msgid "ftpfs: abort failed"
+msgstr "ftpfs: aborto fracasado"
+
+#: vfs/ftpfs.c:1159 vfs/ftpfs.c:1333
+msgid "ftpfs: CWD failed."
+msgstr "ftpfs: fallo al ejecutar CWD"
+
+#: vfs/ftpfs.c:1169 vfs/ftpfs.c:1176
+msgid "ftpfs: couldn't resolve symlink"
+msgstr "ftpfs: no se pudo resolver el enlace simb�lico"
+
+#: vfs/ftpfs.c:1221
+msgid "Resolving symlink..."
+msgstr "Resolviendo enlace simb�lico..."
+
+#: vfs/ftpfs.c:1324
+#, c-format
+msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)"
+msgstr "ftpfs: leyendo v�a FTP el directorio %s... (No use opciones de ls)"
+
+#: vfs/ftpfs.c:1326
+#, c-format
+msgid "ftpfs: Reading FTP directory %s..."
+msgstr "ftpfs: leyendo v�a FTP el directorio %s..."
+
+#: vfs/ftpfs.c:1345
+msgid "ftpfs: FAIL"
+msgstr "ftpfs: FALLO"
+
+#: vfs/ftpfs.c:1436
+msgid "ftpfs: reading FTP directory interrupt by user"
+msgstr "ftpfs: lectura de directorio FTP abortada por el usuario"
+
+#: vfs/ftpfs.c:1465
+msgid "ftpfs: got listing"
+msgstr "ftpfs: listado completo"
+
+#: vfs/ftpfs.c:1478
+msgid "ftpfs: failed"
+msgstr "ftpfs: fall�"
+
+#: vfs/ftpfs.c:1495
+msgid "ftpfs: failed; nowhere to fallback to"
+msgstr "ftpfs: fall�; no hay d�nde replegarse"
+
+#: vfs/ftpfs.c:1559
+#, c-format
+msgid "ftpfs: storing file %d (%d)"
+msgstr "ftpfs: guardando fichero %d (%d)"
#: vfs/ftpfs.c:1995 vfs/ftpfs.c:2010
msgid ""
"~/.netrc file has not correct mode.\n"
"Remove password or correct mode."
msgstr ""
-"el archivo ~/.netrc tiene un modo incorrecto.\n"
-"Quite la contrase�a o corrija el modo del archivo."
+"El archivo ~/.netrc contiene una contrase�a.\n"
+"Qu�tela o restrinja los permisos de lectura."
#: vfs/mcfs.c:154
msgid " MCFS "
@@ -5407,6 +5854,30 @@
"%s\n"
"no parece un archivo de tipo tar."
+#~ msgid " History "
+#~ msgstr " Recientes "
+
+#~ msgid "Password"
+#~ msgstr "Contrase�a"
+
+#~ msgid "Open with"
+#~ msgstr "Abrir con..."
+
+#~ msgid "Move/rename..."
+#~ msgstr "Mover/Renombrar..."
+
+#~ msgid " Symlink "
+#~ msgstr " Enlace simb�lico "
+
+#~ msgid "Ok"
+#~ msgstr "Aceptar"
+
+#~ msgid "Partial View"
+#~ msgstr "Listado Breve"
+
+#~ msgid "Full View"
+#~ msgstr "Listado Completo"
+
#~ msgid "Trashcan"
#~ msgstr "Papelera"
@@ -5609,12 +6080,6 @@
#~ msgid "Do you want to delete "
#~ msgstr " �Realmente quiere eliminar "
-#~ msgid "Open with..."
-#~ msgstr "Abrir con..."
-
-#~ msgid "Opens a terminal"
-#~ msgstr "Abre una ventana de terminal"
-
#~ msgid "Rename/Move..."
#~ msgstr "Renombrar/mover..."
@@ -5642,9 +6107,6 @@
#~ msgid "Changes the sort order of the files"
#~ msgstr "Cambia el orden de presentaci�n de los archivos"
-#~ msgid "Set a filter for the files"
-#~ msgstr "Establece un filtro para archivos"
-
#~ msgid "Network link..."
#~ msgstr "Conexi�n por red..."
@@ -5687,9 +6149,6 @@
#~ msgid "Window"
#~ msgstr "Ventana"
-#~ msgid "Options"
-#~ msgstr "Opciones"
-
#~ msgid "Rename/move.."
#~ msgstr "Renombrar/mover..."
@@ -5702,9 +6161,6 @@
#~ msgid "Panel split"
#~ msgstr "Divisi�n del panel"
-#~ msgid "[DEVEL-ONLY: Debug the background code]"
-#~ msgstr "[s�lo desarroladores: Depurar c�digo en 2� plano]"
-
#~ msgid "Create command file to set default directory upon exit."
#~ msgstr ""
#~ "Crear archivo de comandos para configurar el directorio final al terminar."
@@ -5724,17 +6180,11 @@
#~ msgid "Help on how to specify colors."
#~ msgstr "Ayuda sobre como especificar los colores."
-#~ msgid "Log ftpfs commands to the file."
-#~ msgstr "Registra todos los comandos de ftpfs a un archivo."
-
#~ msgid "Prints out the configured paths."
#~ msgstr "Imprime la lista de rutas configuradas."
#~ msgid "Force black and white display."
#~ msgstr "Fuerza visualizaci�n en blanco y negro."
-
-#~ msgid "Disable mouse support."
-#~ msgstr "Desactiva el soporte para el rat�n."
#~ msgid "Force the concurrent subshell mode"
#~ msgstr "Activa el shell concurrente."
Binary files old/mc-4.5.27/po/fr.gmo and new/mc-4.5.28/po/fr.gmo differ
diff -ruN old/mc-4.5.27/po/fr.po new/mc-4.5.28/po/fr.po
--- old/mc-4.5.27/po/fr.po Thu Mar 18 20:42:35 1999
+++ new/mc-4.5.28/po/fr.po Fri Mar 26 15:30:48 1999
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: mc VERSION\n"
-"POT-Creation-Date: 1999-02-08 08:12-0500\n"
+"POT-Creation-Date: 1999-03-21 17:07+0100\n"
"PO-Revision-Date: 1998-03-27 01:22+0100\n"
"Last-Translator: Vincent Renardias <vincent@ldsol.com>\n"
"Language-Team: Vincent Renardias <vincent@ldsol.com>\n"
@@ -17,12 +17,13 @@
msgid " Emacs key: "
msgstr " Touches Emacs: "
-#: edit/edit_key_translator.c:133
+#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148
msgid " Execute Macro "
msgstr " Ex�cuter Macro "
#. Input line for a single key press follows the ':'
-#: edit/edit_key_translator.c:133 gtkedit/editcmd.c:698 gtkedit/editcmd.c:707
+#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148
+#: gtkedit/editcmd.c:709 gtkedit/editcmd.c:718
msgid " Press macro hotkey: "
msgstr " Tapez la touche raccourcis pour la macro: "
@@ -34,135 +35,136 @@
msgid " Press any key: "
msgstr " Appuyez sur une touche: "
-#: gnome/gcmd.c:56
+#: gnome/gcmd.c:57
msgid " There is no other panel to compare contents to "
msgstr " Il n'y a pas d'autre panel pour faire une comparaison "
-#: gnome/gcmd.c:91
+#: gnome/gcmd.c:113
msgid "GNU Midnight Commander"
msgstr "GNU Midnight Commander"
-#: gnome/gcmd.c:94
+#: gnome/gcmd.c:116
msgid "The GNOME edition of the Midnight Commander file manager."
msgstr "L'�dition GNOME du gestionnaire de fichiers Midnight Comander."
-#: gnome/gcmd.c:106 src/main.c:818 src/screen.c:2048
+#: gnome/gcmd.c:128 src/main.c:847 src/screen.c:2067
msgid " The Midnight Commander "
msgstr " Midnight Commander "
-#: gnome/gcmd.c:107 src/main.c:819
+#: gnome/gcmd.c:129 src/main.c:848
msgid " Do you really want to quit the Midnight Commander? "
msgstr " Voulez-vous vraiment quitter Midnight Commander? "
-#: gnome/gcmd.c:108 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1791
-#: src/file.c:2171 src/filegui.c:573 src/hotlist.c:1035 src/main.c:820
-#: src/screen.c:2050 src/subshell.c:701 src/subshell.c:727 src/tree.c:755
+#: gnome/gcmd.c:130 gtkedit/editcmd.c:2269 src/cmd.c:251 src/file.c:1859
+#: src/file.c:2233 src/filegui.c:602 src/hotlist.c:1035 src/main.c:849
+#: src/screen.c:2069 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
#: src/view.c:404
msgid "&Yes"
msgstr "&Oui"
-#: gnome/gcmd.c:108 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1791
-#: src/file.c:2171 src/filegui.c:572 src/hotlist.c:1035 src/main.c:820
-#: src/screen.c:2050 src/subshell.c:701 src/subshell.c:727 src/tree.c:755
+#: gnome/gcmd.c:130 gtkedit/editcmd.c:2269 src/cmd.c:251 src/file.c:1859
+#: src/file.c:2233 src/filegui.c:601 src/hotlist.c:1035 src/main.c:849
+#: src/screen.c:2069 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
#: src/view.c:404
msgid "&No"
msgstr "&Non"
-#: gnome/gcmd.c:206
+#: gnome/gcmd.c:269
msgid "Sort By"
msgstr "Trier Par"
#. we define this up here so we can pass it in to our callback
-#: gnome/gcmd.c:211
+#: gnome/gcmd.c:274
msgid "Ignore case sensitivity."
msgstr "Ignorer la case."
-#: gnome/gcmd.c:219 src/chmod.c:150 src/screen.c:425
+#: gnome/gcmd.c:282 gnome/gcustom-layout.c:43 src/chmod.c:150 src/screen.c:425
msgid "Name"
msgstr "Nom"
-#: gnome/gcmd.c:226
+#: gnome/gcmd.c:289
msgid "File Type"
msgstr "Type de Fichier"
-#: gnome/gcmd.c:232 src/screen.c:426 src/screen.c:427
+#: gnome/gcmd.c:295 gnome/gcustom-layout.c:47 src/screen.c:426
+#: src/screen.c:427
msgid "Size"
msgstr "Taille"
-#: gnome/gcmd.c:238
+#: gnome/gcmd.c:301
msgid "Time Last Accessed"
msgstr ""
-#: gnome/gcmd.c:244
+#: gnome/gcmd.c:307
msgid "Time Last Modified"
msgstr ""
-#: gnome/gcmd.c:250
+#: gnome/gcmd.c:313
msgid "Time Last Changed"
msgstr ""
-#: gnome/gcmd.c:264
+#: gnome/gcmd.c:327
msgid "Reverse the order."
msgstr ""
-#: gnome/gcmd.c:326
+#: gnome/gcmd.c:390
msgid "Enter name."
msgstr "Entrez le nom."
-#: gnome/gcmd.c:332
+#: gnome/gcmd.c:396
msgid "Enter label for command:"
msgstr ""
-#: gnome/gcmd.c:427
+#: gnome/gcmd.c:495
msgid "Find all core files"
msgstr "Trouver tous les fichiers core"
-#: gnome/gcmd.c:430 src/panelize.c:350
+#: gnome/gcmd.c:498 src/panelize.c:350
msgid "Find rejects after patching"
msgstr ""
-#: gnome/gcmd.c:472
+#: gnome/gcmd.c:542
msgid "Run Command"
msgstr "Ex�cuter Commande"
#. Frame 1
-#: gnome/gcmd.c:477
-#, fuzzy
+#: gnome/gcmd.c:547
msgid "Preset Commands"
-msgstr " Commande "
+msgstr "Commandes pr�-enregistr�es"
-#: gnome/gcmd.c:494
+#. add add/remove buttons in center
+#: gnome/gcmd.c:564 gnome/gcustom-layout.c:185
msgid "Add"
msgstr "Ajouter"
-#: gnome/gcmd.c:498
+#: gnome/gcmd.c:568 gnome/gcustom-layout.c:186
msgid "Remove"
msgstr "Supprimer"
#. Frame 2
-#: gnome/gcmd.c:506
+#: gnome/gcmd.c:576
msgid "Run this Command"
msgstr "Ex�cuter cette Commande"
-#: gnome/gcmd.c:513
+#: gnome/gcmd.c:583
msgid "Command: "
msgstr "Commande: "
-#: gnome/gcmd.c:574
+#: gnome/gcmd.c:646
#, fuzzy
msgid "Set Filter"
msgstr " Filtre "
-#: gnome/gcmd.c:579 gnome/gcmd.c:620 gnome/gcmd.c:625 gnome/gcmd.c:629
-#: gnome/gscreen.c:2484
+#: gnome/gcmd.c:651 gnome/gcmd.c:692 gnome/gcmd.c:697 gnome/gcmd.c:701
+#: gnome/gscreen.c:2526
msgid "Show all files"
msgstr "Montrer tous les fichiers"
-#: gnome/gcmd.c:586
+#: gnome/gcmd.c:658
msgid "."
msgstr ""
-#: gnome/gcmd.c:602
+#: gnome/gcmd.c:674
msgid ""
"Enter a filter here for files in the panel view.\n"
"\n"
@@ -170,201 +172,353 @@
"*.gif will show just gif images"
msgstr ""
-#: gnome/gcmd.c:604
+#: gnome/gcmd.c:676
msgid "Enter a Regular Expression to filter files in the panel view."
msgstr ""
-#: gnome/gcmd.c:661 gnome/gpopup.c:49
+#: gnome/gcmd.c:733
msgid " Open with..."
msgstr " Ouvrir avec..."
-#: gnome/gcmd.c:662 gnome/gpopup.c:50
+#: gnome/gcmd.c:734
msgid "Enter extra arguments:"
msgstr "Entrez les arguments suppl�mentaires:"
-#: gnome/gdesktop.c:350 gnome/gdesktop.c:1553
+#: gnome/gcmd.c:796
+msgid "Desktop entry properties"
+msgstr ""
+
+#: gnome/gcustom-layout.c:36
+msgid "Access Time"
+msgstr "Date d'acc�s"
+
+#: gnome/gcustom-layout.c:37
+msgid "Creation Time"
+msgstr "Date de cr�ation"
+
+#. Group
+#: gnome/gcustom-layout.c:38 gnome/gnome-file-property-dialog.c:776
+#: gnome/gnome-file-property-dialog.c:940 gnome/gprop.c:280 gnome/gprop.c:405
+#: src/screen.c:439
+msgid "Group"
+msgstr "Groupe"
+
+#: gnome/gcustom-layout.c:39
+msgid "Group ID"
+msgstr "ID Groupe"
+
+#: gnome/gcustom-layout.c:40
+msgid "Inode Number"
+msgstr ""
+
+#: gnome/gcustom-layout.c:41 src/achown.c:378
+msgid "Mode"
+msgstr "Mode"
+
+#: gnome/gcustom-layout.c:42
+msgid "Modification Time"
+msgstr "Date de Modification"
+
+#: gnome/gcustom-layout.c:44
+msgid "Number of Hard Links"
+msgstr "Nombre de Liens Physiques"
+
+#. Owner
+#: gnome/gcustom-layout.c:45 gnome/gnome-file-property-dialog.c:925
+#: gnome/gprop.c:390 src/screen.c:438
+msgid "Owner"
+msgstr "Propri�taire"
+
+#: gnome/gcustom-layout.c:46 src/screen.c:432
+msgid "Permission"
+msgstr "Permission"
+
+#: gnome/gcustom-layout.c:48
+msgid "Size (short)"
+msgstr ""
+
+#: gnome/gcustom-layout.c:49
+msgid "Type"
+msgstr "Type"
+
+#: gnome/gcustom-layout.c:50
+msgid "User ID"
+msgstr "ID Utilisateur"
+
+#: gnome/gcustom-layout.c:144
+msgid "Possible Columns"
+msgstr "Colonnes possibles"
+
+#: gnome/gcustom-layout.c:164
+msgid "Displayed Columns"
+msgstr "Colonnes affich�es"
+
+#: gnome/gcustom-layout.c:306
+msgid "Custom View"
+msgstr "Vue Personalis�e"
+
+#: gnome/gdesktop.c:416 gnome/gdesktop.c:2067
msgid "Warning"
msgstr "Avertissement"
-#: gnome/gdesktop.c:351
+#: gnome/gdesktop.c:417
#, c-format
msgid "Could not open %s; will not have desktop icons"
msgstr ""
-#: gnome/gdesktop.c:1519
-msgid "Trashcan"
-msgstr ""
+#: gnome/gdesktop.c:1010
+msgid "While running the mount/umount command"
+msgstr "Pendant l'ex�cution de la commande mount/umount"
+
+#: gnome/gdesktop.c:1079
+msgid "While running the eject command"
+msgstr "Pendant l'ex�cution de la commande eject"
+
+#: gnome/gdesktop.c:1132 gnome/gicon.c:154 gnome/gtools.c:52
+msgid "Error"
+msgstr "Erreur"
#. Create the link to the user's home directory so that he will have an icon
-#: gnome/gdesktop.c:1549
+#: gnome/gdesktop.c:2063
msgid "Home directory"
msgstr "R�pertoire 'Home'"
-#: gnome/gdesktop.c:1554
+#: gnome/gdesktop.c:2068
#, c-format
msgid "Could not symlink %s to %s; will not have initial desktop icons."
msgstr ""
-#: gnome/gdialogs.c:58
-msgid "To: "
-msgstr ""
+#: gnome/gdesktop.c:2398 gnome/glayout.c:355
+msgid "_Terminal"
+msgstr "_Terminal"
+
+#: gnome/gdesktop.c:2398 gnome/glayout.c:355
+msgid "Launch a new terminal in the current directory"
+msgstr "D�marrer un nouveau terminal dans le r�pertoire courant"
+
+#. If this ever changes, make sure you update create_new_menu accordingly.
+#: gnome/gdesktop.c:2400 gnome/glayout.c:357
+msgid "_Directory..."
+msgstr "_R�pertoire..."
+
+#: gnome/gdesktop.c:2400 gnome/glayout.c:357
+msgid "Creates a new directory"
+msgstr "Cr�� un nouveau r�pertoire"
+
+#: gnome/gdesktop.c:2401
+msgid "_Launcher..."
+msgstr "_Lanceur..."
+
+#: gnome/gdesktop.c:2401
+msgid "Creates a new launcher"
+msgstr "Cr��r un nouveau lanceur"
+
+#: gnome/gdesktop.c:2409 gnome/glayout.c:440
+msgid "Arrange Icons"
+msgstr "Arranger les Icones"
+
+#: gnome/gdesktop.c:2410
+msgid "Create New Window"
+msgstr "Cr��r une nouvelle fen�tre"
+
+#: gnome/gdesktop.c:2412
+msgid "Recreate Desktop Shortcuts"
+msgstr "Recr��r les raccourcis sur le bureau"
+
+#: gnome/gdesktop.c:2413 gnome/glayout.c:443
+msgid "Rescan Desktop"
+msgstr "Rafraichir Bureau"
#: gnome/gdialogs.c:59
-msgid "Copying from: "
-msgstr ""
+msgid "To: "
+msgstr "Vers: "
#: gnome/gdialogs.c:60
-#, fuzzy
+msgid "Copying from: "
+msgstr "Copie � partir de: "
+
+#: gnome/gdialogs.c:61
msgid "Deleting file: "
-msgstr "Effacement"
+msgstr "Effacement de: "
-#: gnome/gdialogs.c:340
+#: gnome/gdialogs.c:365
msgid "Files Exist"
-msgstr "Des fichier existent"
+msgstr "Des fichiers existent"
-#: gnome/gdialogs.c:352
+#: gnome/gdialogs.c:380
msgid ""
"Some of the files you are trying to copy already exist in the destination "
-"folder."
+"folder. Please select the action to be performed."
msgstr ""
-#: gnome/gdialogs.c:361
+#: gnome/gdialogs.c:393
msgid "Prompt me before overwriting any file."
-msgstr ""
+msgstr "Demander confirmation avant d'�craser un fichier."
-#: gnome/gdialogs.c:368
+#: gnome/gdialogs.c:400
msgid "Don't overwrite any files."
msgstr "N'�craser aucun fichier."
-#: gnome/gdialogs.c:380
+#: gnome/gdialogs.c:416
msgid "Overwrite:"
msgstr "Ecraser:"
-#: gnome/gdialogs.c:387
+#: gnome/gdialogs.c:423
msgid "Older files."
msgstr "Anciens fichiers."
-#: gnome/gdialogs.c:393
+#: gnome/gdialogs.c:429
msgid "Files only if size differs."
msgstr "Fichiers seulement si la taille diff�re."
-#: gnome/gdialogs.c:399
+#: gnome/gdialogs.c:435
msgid "All files."
msgstr "Tous les fichiers."
-#: gnome/gdialogs.c:448
+#: gnome/gdialogs.c:475
msgid "File Exists"
msgstr "Le fichier existe"
-#: gnome/gdialogs.c:454
+#: gnome/gdialogs.c:481
#, c-format
msgid "The target file already exists: %s"
msgstr "Le fichier cible existe d�j�: %s"
-#: gnome/gdialogs.c:461
+#: gnome/gdialogs.c:488
msgid "Replace it?"
msgstr "Le remplacer?"
-#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 src/file.c:784
-#: src/screen.c:2288 src/screen.c:2318 src/tree.c:1024
+#: gnome/gdialogs.c:562 gtkedit/editwidget.c:1069 src/file.c:802
+#: src/screen.c:2308 src/screen.c:2338 src/tree.c:1024
msgid "Copy"
msgstr "Copier"
-#: gnome/gdialogs.c:535 gtkedit/editwidget.c:1065
+#: gnome/gdialogs.c:565 gtkedit/editwidget.c:1070
msgid "Move"
msgstr "D�placer"
-#: gnome/gdialogs.c:552
+#: gnome/gdialogs.c:582
msgid "Destination"
msgstr "Destination"
-#: gnome/gdialogs.c:556
+#: gnome/gdialogs.c:586
msgid "Find Destination Folder"
msgstr "Trouver le R�pertoire de Destination"
-#: gnome/gdialogs.c:561
+#: gnome/gdialogs.c:591
msgid "Copy as a background process"
msgstr "Copier en t�che de fond"
-#: gnome/gdialogs.c:581
+#: gnome/gdialogs.c:611
msgid "Advanced Options"
msgstr "Options Avanc�es"
-#: gnome/gdialogs.c:585
+#: gnome/gdialogs.c:615
msgid "Preserve symlinks"
msgstr "Pr�server les liens symboliques"
-#: gnome/gdialogs.c:595
+#: gnome/gdialogs.c:625
msgid "Follow links."
msgstr "Suivre les liens."
-#: gnome/gdialogs.c:600
+#: gnome/gdialogs.c:631
msgid ""
"Selecting this will copy the files that symlinks point to instead of just "
"copying the link."
msgstr ""
-#: gnome/gdialogs.c:604
+#: gnome/gdialogs.c:636
msgid "Preserve file attributes."
msgstr "Pr�server les attributs de fichiers."
-#: gnome/gdialogs.c:608
+#: gnome/gdialogs.c:641
msgid "Preserves the permissions and the UID/GID if possible"
msgstr "Pr�serve les permissions et UID/GID si possible"
-#: gnome/gdialogs.c:613
+#: gnome/gdialogs.c:647
msgid "Recursively copy subdirectories."
msgstr "Copie r�cursive des sous-r�pertoires."
-#: gnome/gdialogs.c:617
+#: gnome/gdialogs.c:652
msgid "If set, this will copy the directories recursively"
msgstr ""
-#: gnome/gdialogs.c:733
-#, fuzzy
+#: gnome/gdialogs.c:756
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Directory not empty. Delete it recursively?"
+msgstr ""
+
+#: gnome/gdialogs.c:765 src/file.c:2228
+msgid " Delete: "
+msgstr " Effacer: "
+
+#: gnome/gdialogs.c:769
+msgid "Do the same for the rest"
+msgstr "Faire pareil pour le reste"
+
+#: gnome/gdialogs.c:838
msgid "Move Progress"
-msgstr "D�placer ici"
+msgstr "Avancement du d�placement"
-#: gnome/gdialogs.c:736
-#, fuzzy
+#: gnome/gdialogs.c:841
msgid "Copy Progress"
-msgstr "Copier ici"
+msgstr "Avancement de la copie"
-#: gnome/gdialogs.c:739
-#, fuzzy
+#: gnome/gdialogs.c:844
msgid "Delete Progress"
-msgstr "Touche Effacement"
+msgstr "Avancement de l'effacement"
-#: gnome/gdialogs.c:784
+#: gnome/gdialogs.c:889
msgid "File "
msgstr "Fichier "
-#: gnome/gdialogs.c:788
-msgid " is "
-msgstr " est "
-
-#: gnome/gdialogs.c:791
-msgid " Done."
-msgstr " Termin�."
+#: gnome/gdialogs.c:893
+msgid "is "
+msgstr "est "
+
+#: gnome/gdialogs.c:896
+msgid "done."
+msgstr "termin�."
+
+#: gnome/gdialogs.c:956 src/wtools.c:585 vfs/vfs.c:1762
+msgid "Password:"
+msgstr "Mot de passe:"
+
+#: gnome/gdialogs.c:956 src/wtools.c:585
+msgid "Password"
+msgstr "Mot de passe"
+
+#. Create the dialog
+#: gnome/gdialogs.c:988
+msgid "Symbolic Link"
+msgstr "Lien Symbolique"
+
+#: gnome/gdialogs.c:1004 src/boxes.c:803
+msgid "Existing filename (filename symlink will point to):"
+msgstr "Fichier existant (vers lequel le lien va pointer):"
+
+#: gnome/gdialogs.c:1018 src/boxes.c:801
+msgid "Symbolic link filename:"
+msgstr "Nom du lien symbolique:"
#: gnome/gdnd.c:51
-#, fuzzy
msgid "_Move here"
-msgstr "D�placer ici"
+msgstr "_D�placer ici"
#: gnome/gdnd.c:52
-#, fuzzy
msgid "_Copy here"
-msgstr "Copier ici"
+msgstr "_Copier ici"
#: gnome/gdnd.c:53
-#, fuzzy
msgid "_Link here"
-msgstr "Lier ici"
+msgstr "_Lier ici"
#: gnome/gdnd.c:55
msgid "Cancel drag"
-msgstr ""
+msgstr "Abandon du glissement"
#. FIXME: this error message sucks
#: gnome/gdnd.c:191
@@ -376,377 +530,608 @@
" Impossible d'ouvrir %s\n"
" %s "
-#: gnome/gicon.c:83 gnome/gtools.c:50
-msgid "Error"
-msgstr "Erreur"
+#: gnome/gicon.c:154
+msgid "Default set of icons not found, please check your installation"
+msgstr "Jeux d'icones par d�faut non trouv�, v�rifiez votre installation"
+
+#: gnome/glayout.c:40
+msgid "_Icon View"
+msgstr "Vue par _Icones"
-#: gnome/gicon.c:83
-msgid "Default set of icons not found, check your installation"
+#: gnome/glayout.c:41 gnome/glayout.c:57
+msgid "Switch view to an icon display"
msgstr ""
-#: gnome/glayout.c:274
-msgid "Enter command to run"
-msgstr "Entrer la commande � ex�cuter"
+#: gnome/glayout.c:43
+msgid "_Brief View"
+msgstr "Vue _Br�ve"
-#: gnome/glayout.c:284
-msgid "_Terminal"
-msgstr "_Terminal"
+#: gnome/glayout.c:44 gnome/glayout.c:60
+msgid "Switch view to show just file name and type"
+msgstr ""
-#: gnome/glayout.c:284
-msgid "Launch a new terminal in the current directory"
+#: gnome/glayout.c:46
+msgid "_Detailed View"
+msgstr "Vue _D�taill�e"
+
+#: gnome/glayout.c:47 gnome/glayout.c:63
+msgid "Switch view to show detailed file statistics"
msgstr ""
-#. If this ever changes, make sure you update create_new_menu accordingly.
-#: gnome/glayout.c:286
-msgid "_Directory..."
-msgstr "_R�pertoire..."
+#: gnome/glayout.c:49
+msgid "_Custom View"
+msgstr "Vue _Personalis�e"
-#: gnome/glayout.c:286
-msgid "Creates a new directory"
-msgstr "Cr�� un nouveau r�pertoire"
+#: gnome/glayout.c:50 gnome/glayout.c:66
+msgid "Switch view to show user-defined statistics"
+msgstr ""
+
+#: gnome/glayout.c:56
+msgid "Icons"
+msgstr "Icones"
+
+#: gnome/glayout.c:59
+msgid "Brief"
+msgstr "Br�ve"
+
+#: gnome/glayout.c:62
+msgid "Detailed"
+msgstr "D�taill�e"
+
+#: gnome/glayout.c:65
+msgid "Custom"
+msgstr "Personalis�e"
-#: gnome/glayout.c:292
-msgid "New _Window"
-msgstr "_Nouvelle fen�tre"
-
-#: gnome/glayout.c:292
-msgid "Opens a new window"
-msgstr "Ouvre une nouvelle fen�tre"
-
-#. We want to make a new menu entry here...
-#. For example:
-#. New->
-#. Command Prompt
-#. Gimp Image
-#. Gnumeric Spreadsheet
-#. Text Document
-#. etc...
#: gnome/glayout.c:302
-msgid "_New"
-msgstr "_Nouveau"
+msgid "Enter command to run"
+msgstr "Entrer la commande � ex�cuter"
-#: gnome/glayout.c:304
-msgid "_Open"
-msgstr "_Ouvrir"
-
-#: gnome/glayout.c:304
-msgid "Opens the selected files"
-msgstr "Ouvre les fichiers s�lectionn�s"
+#: gnome/glayout.c:315
+msgid ""
+"Notice that if you choose to terminate the file manager, you will\n"
+"also terminate the GNOME desktop handler.\n"
+"\n"
+"Are you sure you want to exit?"
+msgstr ""
+
+#: gnome/glayout.c:327
+msgid ""
+"The file manager and the desktop handler are now terminating\n"
+"\n"
+"If you want to start up again the desktop handler or the file manager\n"
+"you can launch it from the Panel, or you can run the UNIX command `gmc'\n"
+"\n"
+"Press OK to terminate the application, or cancel to continue using it."
+msgstr ""
-#. { GNOME_APP_UI_ITEM, N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd },
-#: gnome/glayout.c:306
+#. GNOMEUIINFO_ITEM_NONE(N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd },
+#: gnome/glayout.c:378
msgid "_Copy..."
msgstr "_Copier..."
-#: gnome/glayout.c:306
+#: gnome/glayout.c:378
msgid "Copy files"
msgstr "Copier les fichiers"
-#: gnome/glayout.c:307
+#: gnome/glayout.c:379
msgid "_Delete..."
msgstr "_Effacer..."
-#: gnome/glayout.c:307
-msgid "Delete files from disk"
-msgstr "Effacer les fichiers du disque"
+#: gnome/glayout.c:379
+msgid "Delete files"
+msgstr "Effacement des fichiers"
-#: gnome/glayout.c:308
+#: gnome/glayout.c:380
msgid "_Move..."
msgstr "_D�placer..."
-#: gnome/glayout.c:308
+#: gnome/glayout.c:380
msgid "Rename or move files"
msgstr "Renommer ou d�placer fichiers"
-#: gnome/glayout.c:310
-msgid "C_lose"
-msgstr "_Fermer"
-
-#: gnome/glayout.c:310
-msgid "Close this panel"
-msgstr "Fermer de panel"
+#: gnome/glayout.c:382
+msgid "Show directory sizes"
+msgstr "Afficher la taille des r�pertoires"
+
+#: gnome/glayout.c:382
+msgid "Shows the disk space used by each directory"
+msgstr "Afficher l'espace disque utilis� par chaque r�pertoire"
-#: gnome/glayout.c:317
-#, fuzzy
+#: gnome/glayout.c:389
msgid "Select _All"
msgstr "Tout _S�lectionner"
-#: gnome/glayout.c:317
+#: gnome/glayout.c:389
msgid "Select all files in the current Panel"
msgstr "S�lectionner tous les fichier du panel courant"
-#: gnome/glayout.c:318
+#: gnome/glayout.c:391
msgid "_Select Files..."
msgstr "_S�lectionner Fichiers..."
-#: gnome/glayout.c:318
+#: gnome/glayout.c:391
msgid "Select a group of files"
msgstr "S�lectionner un groupe de fichiers"
-#: gnome/glayout.c:319
+#: gnome/glayout.c:392
msgid "_Invert Selection"
msgstr "_Inverser la S�lection"
-#: gnome/glayout.c:319
+#: gnome/glayout.c:392
msgid "Reverses the list of tagged files"
-msgstr ""
+msgstr "Inverser la liste des fichiers marqu�s"
-#: gnome/glayout.c:321
+#: gnome/glayout.c:394
msgid "_Rescan Directory"
msgstr "_Rafraichir R�pertoire"
-#: gnome/glayout.c:321
+#: gnome/glayout.c:394
msgid "Rescan the directory contents"
msgstr "Raffraichir le contenu du r�pertoire"
-#: gnome/glayout.c:328
-msgid "Icon View"
-msgstr "Vue par Icones"
-
-#: gnome/glayout.c:329
-msgid "Partial View"
-msgstr "Vue Partielle"
-
-#: gnome/glayout.c:330
-msgid "Full View"
-msgstr "Vue Compl�te"
-
-#: gnome/glayout.c:331
-msgid "Custom View"
-msgstr "Vue Personalis�e"
-
-#: gnome/glayout.c:337
+#: gnome/glayout.c:401
msgid "_Sort By..."
msgstr "_Trier Par..."
-#: gnome/glayout.c:337
+#: gnome/glayout.c:401
msgid "Confirmation settings"
msgstr "Param�tres de confirmation"
-#: gnome/glayout.c:338
+#: gnome/glayout.c:402
msgid "_Filter View..."
msgstr "_Vue Filtr�e.."
-#: gnome/glayout.c:338
+#: gnome/glayout.c:402
msgid "Global option settings"
msgstr "Configuration globale"
-#: gnome/glayout.c:345
+#: gnome/glayout.c:409
msgid "_Find File..."
msgstr "_Trouver Fichier..."
-#: gnome/glayout.c:345
+#: gnome/glayout.c:409
msgid "Locate files on disk"
msgstr "Localiser des fichiers"
#. { GNOME_APP_UI_ITEM, N_("_Compare panels..."), N_("Compare two panel contents"), gnome_compare_panels },
-#: gnome/glayout.c:349
+#: gnome/glayout.c:412
msgid "_Run Command..."
msgstr "_Ex�cuter Commande..."
-#: gnome/glayout.c:349
+#: gnome/glayout.c:412
msgid "Runs a command"
msgstr "Ex�cuter une commande"
-#: gnome/glayout.c:351
+#: gnome/glayout.c:414
#, fuzzy
msgid "_Run Command in panel..."
msgstr "_Comparer panels..."
-#: gnome/glayout.c:351
+#: gnome/glayout.c:414
msgid "Run a command and put the results in a panel"
msgstr ""
-#: gnome/glayout.c:354
-msgid "_Active VFS list..."
-msgstr "Liste des VFS _actifs..."
-
-#: gnome/glayout.c:354
-msgid "List of active virtual file systems"
-msgstr "Liste des syst�mes de fichiers virtuels actifs"
-
-#: gnome/glayout.c:361
+#: gnome/glayout.c:424
msgid "_Background jobs..."
msgstr "_Taches de fond..."
-#: gnome/glayout.c:361
+#: gnome/glayout.c:424
msgid "List of background operations"
msgstr "Liste des op�rations en tache de fond"
-#. GNOMEUIINFO_HELP ("midnight-commander"),
-#: gnome/glayout.c:369
-msgid "_About"
-msgstr "_A Propos"
-
-#: gnome/glayout.c:369
-msgid "Information on this program"
-msgstr "Informations sur ce programme"
-
-#: gnome/glayout.c:375 gnome/gview.c:323
-msgid "_File"
-msgstr "_Fichier"
-
-#: gnome/glayout.c:376
-msgid "_Edit"
-msgstr "_Editer"
+#: gnome/glayout.c:427
+msgid "Exit"
+msgstr "Quitter"
+
+#: gnome/glayout.c:427
+msgid "Terminates the file manager and the desktop"
+msgstr "Terminer le gestionnaire de fichiers et le bureau"
+
+#: gnome/glayout.c:442
+msgid "Rescan System Devices"
+msgstr "Rescanner les p�riph�riques syst�mes"
-#: gnome/glayout.c:377
+#: gnome/glayout.c:450 gnome/glayout.c:460
msgid "_Layout"
msgstr "_Pr�sentation"
-#: gnome/glayout.c:378
+#: gnome/glayout.c:451 gnome/glayout.c:461
msgid "_Commands"
msgstr "_Commandes"
-#: gnome/glayout.c:379
+#: gnome/glayout.c:452
+msgid "_Desktop"
+msgstr "_Bureau"
+
+#: gnome/glayout.c:453 gnome/glayout.c:462
msgid "_Help"
msgstr "_Aide"
-#: gnome/glayout.c:474
+#: gnome/glayout.c:600
msgid "File/New/Directory..."
msgstr "Fichier/Nouveau/R�pertoire..."
-#: gnome/gpopup.c:222 gnome/gpopup.c:223
-msgid "Properties"
-msgstr "Propri�t�s"
+#. we set the file part
+#: gnome/gnome-file-property-dialog.c:170
+msgid "Full Name: "
+msgstr "Nom Complet: "
+
+#: gnome/gnome-file-property-dialog.c:178
+msgid "File Name"
+msgstr "Nom du Fichier"
+
+#: gnome/gnome-file-property-dialog.c:201
+msgid "File Type: "
+msgstr "Type du Fichier: "
+
+#: gnome/gnome-file-property-dialog.c:207
+msgid "File Type: Symbolic Link"
+msgstr "Type du Fichier: Lien Symbolique"
+
+#: gnome/gnome-file-property-dialog.c:212
+msgid "Target Name: INVALID LINK"
+msgstr "Nom de la cible: LIEN NON VALIDE"
+
+#: gnome/gnome-file-property-dialog.c:215
+msgid "Target Name: "
+msgstr "Nom de la cible: "
+
+#: gnome/gnome-file-property-dialog.c:220
+msgid "File Type: Directory"
+msgstr "Type du fichier: R�pertoire"
+
+#: gnome/gnome-file-property-dialog.c:222
+msgid "File Type: Character Device"
+msgstr "Type du fichier: P�riph�rique caract�re"
+
+#: gnome/gnome-file-property-dialog.c:224
+msgid "File Type: Block Device"
+msgstr "Type du fichier: P�riph�rique Bloc"
+
+#: gnome/gnome-file-property-dialog.c:226
+msgid "File Type: Socket"
+msgstr "Type du fichier: Socket"
+
+#: gnome/gnome-file-property-dialog.c:228
+msgid "File Type: FIFO"
+msgstr "Type du fichier: FIFO"
+
+#: gnome/gnome-file-property-dialog.c:238
+#: gnome/gnome-file-property-dialog.c:242
+#: gnome/gnome-file-property-dialog.c:248
+msgid "File Size: "
+msgstr "Taille du Fichier: "
+
+#: gnome/gnome-file-property-dialog.c:238
+msgid " bytes"
+msgstr " octets"
+
+#: gnome/gnome-file-property-dialog.c:242
+msgid " KBytes ("
+msgstr " KOctets ("
+
+#: gnome/gnome-file-property-dialog.c:243
+#: gnome/gnome-file-property-dialog.c:249
+msgid " bytes)"
+msgstr " octets)"
+
+#: gnome/gnome-file-property-dialog.c:248
+msgid " MBytes ("
+msgstr " MOctets ("
+
+#: gnome/gnome-file-property-dialog.c:256
+msgid "File Size: N/A"
+msgstr "Taille du Fichier: N/D"
+
+#: gnome/gnome-file-property-dialog.c:267
+msgid "File Created on: "
+msgstr "Fichier cr�� le: "
+
+#: gnome/gnome-file-property-dialog.c:276
+msgid "Last Modified on: "
+msgstr "Derni�re Modification le: "
+
+#: gnome/gnome-file-property-dialog.c:285
+msgid "Last Accessed on: "
+msgstr "Dernier acc�s le: "
+
+#: gnome/gnome-file-property-dialog.c:303
+msgid "URL:"
+msgstr "URL:"
+
+#: gnome/gnome-file-property-dialog.c:310
+msgid "Caption:"
+msgstr "L�gende:"
-#: gnome/gpopup.c:225 gnome/gpopup.c:226
+#. we do open first
+#: gnome/gnome-file-property-dialog.c:469 gnome/gpopup2.c:187
msgid "Open"
msgstr "Ouvrir"
-#: gnome/gpopup.c:227
-msgid "Open with"
-msgstr "Ouvrir avec"
+#: gnome/gnome-file-property-dialog.c:479
+msgid "Use default Open action"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:489
+#, fuzzy
+msgid "Drop Action"
+msgstr "Emplacement: "
-#: gnome/gpopup.c:228 src/screen.c:2286 src/screen.c:2316
+#: gnome/gnome-file-property-dialog.c:491 gnome/gpopup2.c:194
+#: src/screen.c:2306 src/screen.c:2336
msgid "View"
msgstr "Voir"
-#: gnome/gpopup.c:229
-msgid "View unfiltered"
-msgstr "Vue non filtr�e"
+#: gnome/gnome-file-property-dialog.c:502
+msgid "Use default Drop action"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:504
+msgid "Use default View action"
+msgstr ""
-#: gnome/gpopup.c:230 src/screen.c:2287 src/screen.c:2317 src/view.c:1968
+#: gnome/gnome-file-property-dialog.c:513 gnome/gpopup2.c:196
+#: src/screen.c:2307 src/screen.c:2337 src/view.c:1991
msgid "Edit"
msgstr "Editer"
-#: gnome/gpopup.c:232
-msgid "Link..."
-msgstr "Lien..."
+#: gnome/gnome-file-property-dialog.c:523
+msgid "Use default Edit action"
+msgstr ""
-#: gnome/gpopup.c:233
-msgid "Symlink..."
-msgstr "Lien Symbolique..."
+#: gnome/gnome-file-property-dialog.c:577 gnome/gprop.c:521
+msgid "Icon"
+msgstr "Icone"
-#: gnome/gpopup.c:234
-msgid "Edit symlink..."
-msgstr "Editer lien symbolique..."
+#. We must be a file or a link to a file.
+#: gnome/gnome-file-property-dialog.c:611
+#, fuzzy
+msgid "File Actions"
+msgstr "Des fichier existent"
+
+#: gnome/gnome-file-property-dialog.c:616
+#, fuzzy
+msgid "Open action"
+msgstr "Destination"
+
+#: gnome/gnome-file-property-dialog.c:617
+msgid "Needs terminal to run"
+msgstr "Requiert un terminal"
+
+#: gnome/gnome-file-property-dialog.c:742
+msgid "File Permissions"
+msgstr "Permissions de fichiers"
+
+#: gnome/gnome-file-property-dialog.c:753 gnome/gprop.c:259
+msgid "Current mode: "
+msgstr "Mode actuel: "
+
+#. Headings
+#: gnome/gnome-file-property-dialog.c:768 gnome/gprop.c:272
+msgid "Read"
+msgstr "Lire"
+
+#: gnome/gnome-file-property-dialog.c:769 gnome/gprop.c:273
+msgid "Write"
+msgstr "Ecrire"
+
+#: gnome/gnome-file-property-dialog.c:770 gnome/gprop.c:274
+msgid "Exec"
+msgstr "Exec"
+
+#: gnome/gnome-file-property-dialog.c:771 gnome/gprop.c:275
+msgid "Special"
+msgstr "Sp�cial"
+
+#. Permissions
+#: gnome/gnome-file-property-dialog.c:775 gnome/gprop.c:279
+msgid "User"
+msgstr "Utilisateur"
+
+#: gnome/gnome-file-property-dialog.c:777 gnome/gprop.c:281
+msgid "Other"
+msgstr "Autre"
+
+#. Special
+#: gnome/gnome-file-property-dialog.c:781 gnome/gprop.c:285
+msgid "Set UID"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:782 gnome/gprop.c:286
+msgid "Set GID"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:783 gnome/gprop.c:287
+msgid "Sticky"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:1074
+msgid "URL"
+msgstr "URL"
+
+#: gnome/gnome-file-property-dialog.c:1077
+msgid "Statistics"
+msgstr "Statistiques"
+
+#: gnome/gnome-file-property-dialog.c:1083
+msgid "Options"
+msgstr "Options"
+
+#: gnome/gnome-file-property-dialog.c:1086
+msgid "Permissions"
+msgstr "Permissions"
-#: gnome/gpopup.c:241 gnome/gpopup.c:252
-msgid "Move/rename..."
-msgstr "D�placer/renommer..."
+#: gnome/gnome-file-property-dialog.c:1089
+msgid " Properties"
+msgstr " Propri�t�s"
-#: gnome/gpopup.c:242 gnome/gpopup.c:253
+#: gnome/gnome-file-property-dialog.c:1140
+msgid "You entered an invalid username"
+msgstr "Vous avez entrez un nom d'utilisateur invalide"
+
+#: gnome/gnome-file-property-dialog.c:1185
+msgid "You must rename your file to something"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:1191
+msgid "You cannot rename a file to something containing a '/' character"
+msgstr "Vous ne pouvez pas renommer un fichier avec un nom contenant un caract�re '/'"
+
+#. the first label
+#: gnome/gnome-open-dialog.c:379
+msgid "Select an application to open \""
+msgstr "S�lectionnez une application � ouvrir \""
+
+#: gnome/gnome-open-dialog.c:390
+#, fuzzy
+msgid "Select a file to run with"
+msgstr "S�lectionner tous les fichier du panel courant"
+
+#. the file tree
+#: gnome/gnome-open-dialog.c:401
+msgid "Applications"
+msgstr "Applications"
+
+#: gnome/gnome-open-dialog.c:417
+msgid "Program to run"
+msgstr "Programme � lancer"
+
+#: gnome/gpopup2.c:188
+msgid "Mount device"
+msgstr "Monter le p�riph�rique"
+
+#: gnome/gpopup2.c:189
+msgid "Unmount device"
+msgstr "D�monter le p�riph�rique"
+
+#: gnome/gpopup2.c:190
+msgid "Eject device"
+msgstr "Ejecter le p�riph�rique"
+
+#: gnome/gpopup2.c:193
+msgid "Open with..."
+msgstr "Ouvrir avec..."
+
+#: gnome/gpopup2.c:195
+msgid "View Unfiltered"
+msgstr "Vue non filtr�e"
+
+#: gnome/gpopup2.c:198
msgid "Copy..."
msgstr "Copier..."
-#: gnome/gpopup.c:243 gnome/gpopup.c:255 gtkedit/editwidget.c:1067
-#: src/screen.c:2291 src/screen.c:2321
+#: gnome/gpopup2.c:199 gtkedit/editwidget.c:1072 src/screen.c:2311
+#: src/screen.c:2341
msgid "Delete"
msgstr "Effacer"
-#: gnome/gprefs.c:96
-#, fuzzy
+#: gnome/gpopup2.c:200
+msgid "Move..."
+msgstr "D�placer..."
+
+#: gnome/gpopup2.c:201
+msgid "Hard Link..."
+msgstr "Lien Physique..."
+
+#: gnome/gpopup2.c:202
+msgid "Symlink..."
+msgstr "Lien Symbolique..."
+
+#: gnome/gpopup2.c:203
+msgid "Edit Symlink..."
+msgstr "Editer lien symbolique..."
+
+#: gnome/gpopup2.c:205
+msgid "Properties..."
+msgstr "Propri�t�s..."
+
+#: gnome/gprefs.c:81
msgid "Show backup files"
-msgstr "Montrer tous les fichiers"
+msgstr "Montrer les fichiers de sauvegarde"
-#: gnome/gprefs.c:100
-#, fuzzy
+#: gnome/gprefs.c:85
msgid "Show hidden files"
-msgstr "Montrer tous les fichiers"
+msgstr "Montrer les fichiers cach�s"
-#: gnome/gprefs.c:104
-#, fuzzy
+#: gnome/gprefs.c:89
msgid "Mix files and directories"
-msgstr "fichiers/r�pertoires"
+msgstr "M�langer fichiers et r�pertoires"
-#: gnome/gprefs.c:108
+#: gnome/gprefs.c:93
#, fuzzy
msgid "Use shell patterns instead of regular expressions"
msgstr " Expression r�guli�re malform�e "
-#: gnome/gprefs.c:117
+#: gnome/gprefs.c:102
msgid "Confirm when deleting file"
-msgstr ""
+msgstr "Confirmer lors de l'effacement d'un fichier"
-#: gnome/gprefs.c:121
-#, fuzzy
+#: gnome/gprefs.c:106
msgid "Confirm when overwriting files"
-msgstr "N'�craser aucun fichier."
+msgstr "Confirmer avant d'effacer un fichier"
-#: gnome/gprefs.c:125
-#, fuzzy
+#: gnome/gprefs.c:110
msgid "Confirm when executing files"
-msgstr "Param�tres de confirmation"
+msgstr "Confirmer avant d'ex�cuter un fichier"
-#: gnome/gprefs.c:129
+#: gnome/gprefs.c:114
msgid "Show progress while operations are being performed"
-msgstr ""
+msgstr "Montrer l'avancement des op�rations en cours"
-#: gnome/gprefs.c:138
-msgid "VFS Timeout :"
+#: gnome/gprefs.c:123
+msgid "VFS Timeout:"
msgstr ""
-#: gnome/gprefs.c:139 gnome/gprefs.c:164
+#: gnome/gprefs.c:124 gnome/gprefs.c:149
msgid "Seconds"
-msgstr ""
+msgstr "Secondes"
-#: gnome/gprefs.c:142
-#, fuzzy
-msgid "Anonymous FTP password :"
-msgstr "mot de passe pour ftp anonyme:"
+#: gnome/gprefs.c:127
+msgid "Anonymous FTP password:"
+msgstr "Mot de passe pour FTP anonyme:"
-#: gnome/gprefs.c:146
-#, fuzzy
+#: gnome/gprefs.c:131
msgid "Always use FTP proxy"
-msgstr "&Toujours utiliser la proxy ftp"
+msgstr "Toujours utiliser la proxy FTP"
-#: gnome/gprefs.c:155
-#, fuzzy
+#: gnome/gprefs.c:140
msgid "Fast directory reload"
-msgstr " Label du r�pertoire "
+msgstr "Rechargement rapide du r�pertoire"
-#: gnome/gprefs.c:159
+#: gnome/gprefs.c:144
msgid "Compute totals before copying files"
-msgstr ""
+msgstr "Calculer les totaux avant de copier les fichiers"
-#: gnome/gprefs.c:163
+#: gnome/gprefs.c:148
#, fuzzy
msgid "FTP directory cache timeout :"
msgstr "d�lai d'expiration du cache pour ftpfs"
-#: gnome/gprefs.c:167
+#: gnome/gprefs.c:152
msgid "Allow customization of icons in icon view"
msgstr ""
-#: gnome/gprefs.c:176
-#, fuzzy
+#: gnome/gprefs.c:161
msgid "File display"
-msgstr "Fichier: %s "
+msgstr "Affichages des fichiers"
-#: gnome/gprefs.c:180
+#: gnome/gprefs.c:165
msgid "Confirmation"
msgstr "Confirmation"
-#: gnome/gprefs.c:184
+#: gnome/gprefs.c:169
msgid "VFS"
msgstr "SVF"
-#: gnome/gprefs.c:188
+#: gnome/gprefs.c:173
#, fuzzy
msgid "Caching"
msgstr "Recherche de %s"
+#: gnome/gprefs.c:452
+msgid "Preferences"
+msgstr "Pr�f�rences"
+
#: gnome/gprop.c:58 gnome/gprop.c:75
msgid "Filename"
msgstr "NomDuFichier"
@@ -771,63 +1156,10 @@
msgid "File mode (permissions)"
msgstr "Mode du fichier (permissions)"
-#: gnome/gprop.c:259
-msgid "Current mode: "
-msgstr "Mode actuel: "
-
-#. Headings
-#: gnome/gprop.c:272
-msgid "Read"
-msgstr "Lire"
-
-#: gnome/gprop.c:273
-msgid "Write"
-msgstr "Ecrire"
-
-#: gnome/gprop.c:274
-msgid "Exec"
-msgstr "Exec"
-
-#: gnome/gprop.c:275
-msgid "Special"
-msgstr "Sp�cial"
-
-#. Permissions
-#: gnome/gprop.c:279
-msgid "User"
-msgstr "Utilisateur"
-
-#. Group
-#: gnome/gprop.c:280 gnome/gprop.c:405 src/screen.c:439
-msgid "Group"
-msgstr "Groupe"
-
-#: gnome/gprop.c:281
-msgid "Other"
-msgstr "Autre"
-
-#. Special
-#: gnome/gprop.c:285
-msgid "Set UID"
-msgstr ""
-
-#: gnome/gprop.c:286
-msgid "Set GID"
-msgstr ""
-
-#: gnome/gprop.c:287
-msgid "Sticky"
-msgstr ""
-
#: gnome/gprop.c:321 gnome/gprop.c:347
msgid "<Unknown>"
msgstr "<Inconnu>"
-#. Owner
-#: gnome/gprop.c:390 src/screen.c:438
-msgid "Owner"
-msgstr "Propri�taire"
-
#: gnome/gprop.c:494
msgid "General"
msgstr "G�n�ral"
@@ -836,248 +1168,236 @@
msgid "Title"
msgstr "Titre"
-#: gnome/gprop.c:521 gnome/gscreen.c:2271
-msgid "Icon"
-msgstr "Icone"
-
#: gnome/gprop.c:535
msgid "Select icon"
msgstr "S�lectionnez une icone"
-#: gnome/gscreen.c:1569
+#: gnome/gscreen.c:1472
+msgid "Rescan Directory"
+msgstr "Rafraichir R�pertoire"
+
+#: gnome/gscreen.c:1472
+msgid "Reloads the current directory"
+msgstr "Recharger le r�pertoire courrant"
+
+#: gnome/gscreen.c:1474
+msgid "New folder"
+msgstr "Nouveau r�pertoire"
+
+#: gnome/gscreen.c:1474
+msgid "Creates a new folder here"
+msgstr "Cr��r un nouveau r�pertoire ici"
+
+#: gnome/gscreen.c:1652
msgid "All files"
msgstr "Tous les fichiers"
-#: gnome/gscreen.c:1571
+#: gnome/gscreen.c:1654
msgid "Archives and compressed files"
msgstr "Archives et fichiers compress�s"
-#: gnome/gscreen.c:1573
+#: gnome/gscreen.c:1656
msgid "RPM/DEB files"
msgstr "Fichiers RPM/DEB"
-#: gnome/gscreen.c:1575
+#: gnome/gscreen.c:1658
msgid "Text/Document files"
msgstr "Documents textes"
-#: gnome/gscreen.c:1577
+#: gnome/gscreen.c:1660
msgid "HTML and SGML files"
msgstr "Fichiers HTML et SGML"
-#: gnome/gscreen.c:1579
+#: gnome/gscreen.c:1662
msgid "Postscript and PDF files"
msgstr "Fichiers Postscript et PDF"
-#: gnome/gscreen.c:1581
+#: gnome/gscreen.c:1664
msgid "Spreadsheet files"
msgstr "Fichiers de tableurs"
-#: gnome/gscreen.c:1583
+#: gnome/gscreen.c:1666
msgid "Image files"
msgstr "Fichiers images"
-#: gnome/gscreen.c:1586
+#: gnome/gscreen.c:1669
msgid "Video/animation files"
msgstr "Fichiers animation/video"
-#: gnome/gscreen.c:1588
+#: gnome/gscreen.c:1671
msgid "Audio files"
msgstr "Fichier audio"
-#: gnome/gscreen.c:1590
+#: gnome/gscreen.c:1673
msgid "C program files"
msgstr "Fichiers programmes C"
-#: gnome/gscreen.c:1592
+#: gnome/gscreen.c:1675
msgid "C++ program files"
msgstr "Fichiers programmes C++"
-#: gnome/gscreen.c:1594
+#: gnome/gscreen.c:1677
msgid "Objective-C program files"
msgstr "Fichiers programmes Objective-C"
-#: gnome/gscreen.c:1596
+#: gnome/gscreen.c:1679
msgid "Scheme program files"
msgstr "Fichiers programmes Scheme"
-#: gnome/gscreen.c:1598
+#: gnome/gscreen.c:1681
msgid "Assembler program files"
msgstr "Fichiers programmes assembleur"
-#: gnome/gscreen.c:1600
+#: gnome/gscreen.c:1683
msgid "Misc. program files"
msgstr "Fichiers programmes divers"
-#: gnome/gscreen.c:1602
+#: gnome/gscreen.c:1685
msgid "Font files"
msgstr "Fichiers polices"
-#: gnome/gscreen.c:1729
+#: gnome/gscreen.c:1812
#, c-format
msgid "Search: %s"
msgstr "Rechercher: %s"
-#: gnome/gscreen.c:1739
+#: gnome/gscreen.c:1822
#, c-format
msgid "%s bytes in %d file"
msgstr " %s octets dans %d fichier"
-#: gnome/gscreen.c:1739
+#: gnome/gscreen.c:1822
#, c-format
msgid "%s bytes in %d files"
msgstr " %s octets dans %d fichiers"
-#: gnome/gscreen.c:1765 src/screen.c:677
+#: gnome/gscreen.c:1848 src/screen.c:677
msgid "<readlink failed>"
msgstr "<echec de readlink>"
-#: gnome/gscreen.c:1819
+#: gnome/gscreen.c:1902
msgid "Filter"
msgstr "Filtre"
-#: gnome/gscreen.c:2271
-msgid "Switch view to an Icon view"
-msgstr ""
-
-#: gnome/gscreen.c:2273
-#, fuzzy
-msgid "Brief"
-msgstr "Ecrire"
-
-#: gnome/gscreen.c:2273
-msgid "Switch view to show just file name and type"
-msgstr ""
-
-#: gnome/gscreen.c:2275
-#, fuzzy
-msgid "Detailed"
-msgstr " Echec de la duplication "
-
-#: gnome/gscreen.c:2275
-msgid "Switch view to show detailed file statistics"
-msgstr ""
-
-#: gnome/gscreen.c:2277
-#, fuzzy
-msgid "Custom"
-msgstr "Vue Personalis�e"
-
-#: gnome/gscreen.c:2277
-msgid "Switch view to show custom determined statistics."
-msgstr ""
-
-#: gnome/gscreen.c:2282
+#: gnome/gscreen.c:2348
msgid "Back"
msgstr ""
-#: gnome/gscreen.c:2282
+#: gnome/gscreen.c:2348
msgid "Go to the previously visited directory"
msgstr ""
-#: gnome/gscreen.c:2284
-#, fuzzy
+#: gnome/gscreen.c:2350
msgid "Up"
-msgstr "&Haut"
+msgstr "Haut"
-#: gnome/gscreen.c:2284
+#: gnome/gscreen.c:2350
msgid "Go up a level in the directory heirarchy"
-msgstr ""
+msgstr "Remonter d'un niveau dans la hi�rarchie"
-#: gnome/gscreen.c:2286
-#, fuzzy
+#: gnome/gscreen.c:2352
msgid "Forward"
-msgstr "Format"
+msgstr "Avant"
-#: gnome/gscreen.c:2286
-#, fuzzy
+#: gnome/gscreen.c:2352
msgid "Go to the next directory"
-msgstr " Impossible de changer de r�pertoire"
+msgstr "Aller au r�pertoire suivant"
-#: gnome/gscreen.c:2289
-#, fuzzy
+#: gnome/gscreen.c:2355 src/tree.c:1020
+msgid "Rescan"
+msgstr "Rafraichir"
+
+#: gnome/gscreen.c:2355
+msgid "Rescan the current directory"
+msgstr "Rafraichir le r�pertoire courant"
+
+#: gnome/gscreen.c:2358
msgid "Home"
-msgstr "&Home"
+msgstr "Personnel"
-#: gnome/gscreen.c:2289
-#, fuzzy
+#: gnome/gscreen.c:2358
msgid "Go to your home directory"
-msgstr "R�pertoire 'Home'"
+msgstr "Aller � votre r�pertoire personnel"
-#: gnome/gscreen.c:2429
+#: gnome/gscreen.c:2504
msgid "Location:"
msgstr "Emplacement: "
-#: gnome/gtools.c:104 src/boxes.c:138 src/boxes.c:278 src/boxes.c:378
-#: src/boxes.c:466 src/boxes.c:646 src/boxes.c:728 src/boxes.c:783
-#: src/boxes.c:894 src/filegui.c:807 src/find.c:151 src/layout.c:369
-#: src/option.c:144 src/wtools.c:289 src/wtools.c:561
+#. 1
+#: gnome/gtools.c:110 gtkedit/editcmd.c:344 gtkedit/editcmd.c:1187
+#: gtkedit/editcmd.c:1272 gtkedit/editcmd.c:2868 gtkedit/editoptions.c:71
+#: src/boxes.c:138 src/boxes.c:278 src/boxes.c:378 src/boxes.c:466
+#: src/boxes.c:646 src/boxes.c:728 src/boxes.c:783 src/boxes.c:898
+#: src/filegui.c:838 src/find.c:171 src/layout.c:369 src/option.c:144
+#: src/wtools.c:289 src/wtools.c:563
msgid "&Ok"
msgstr "&Ok"
-#: gnome/gview.c:119 src/view.c:683
+#: gnome/gview.c:135 src/view.c:683
#, c-format
msgid "Offset 0x%08x"
msgstr "D�calage 0x%08x"
-#: gnome/gview.c:121 src/view.c:685
+#: gnome/gview.c:137 src/view.c:685
#, c-format
msgid "Col %d"
msgstr "Col %d"
-#: gnome/gview.c:125 src/view.c:689
+#: gnome/gview.c:141 src/view.c:689
#, c-format
msgid "%s bytes"
msgstr "%s octets"
-#: gnome/gview.c:289
+#: gnome/gview.c:305
msgid "_Goto line"
msgstr "_Aller � la ligne"
-#: gnome/gview.c:290
+#: gnome/gview.c:306
msgid "Jump to a specified line number"
msgstr "Aller au num�ro de ligne sp�cifi�"
-#: gnome/gview.c:292
+#: gnome/gview.c:308
#, fuzzy
msgid "_Monitor file"
msgstr "Fichiers polices"
-#: gnome/gview.c:292
+#: gnome/gview.c:308
msgid "Monitor file growing"
msgstr ""
-#: gnome/gview.c:299
+#: gnome/gview.c:315
msgid "Regexp search"
msgstr "Recherche une expression r�guli�re"
-#: gnome/gview.c:300
+#: gnome/gview.c:316
msgid "Regular expression search"
msgstr "Recherche d'une expression r�guli�re"
-#: gnome/gview.c:309
+#: gnome/gview.c:325
msgid "_Wrap"
msgstr "_C�sure"
-#: gnome/gview.c:309
+#: gnome/gview.c:326
msgid "Wrap the text"
msgstr ""
-#: gnome/gview.c:315
+#. Can not use this one yet, as it destroys the viewer, need to fix that
+#: gnome/gview.c:329
+msgid "_Parsed view"
+msgstr ""
+
+#: gnome/gview.c:332
msgid "_Formatted"
msgstr "_Format�"
-#: gnome/gview.c:317
+#: gnome/gview.c:334
msgid "_Hex"
msgstr "_H�xa"
-#: gnome/gview.c:324
+#: gnome/gview.c:340
msgid "_Search"
msgstr "_Rechercher"
-#: gnome/gview.c:325
-msgid "_Mode"
-msgstr "_Mode"
-
#: gnome/gwidget.c:90
msgid "ok"
msgstr "ok"
@@ -1090,11 +1410,11 @@
msgid "help"
msgstr "aide"
-#: gnome/gwidget.c:96 src/file.c:2190
+#: gnome/gwidget.c:96 src/file.c:2252
msgid "yes"
msgstr "oui"
-#: gnome/gwidget.c:98 src/file.c:2188
+#: gnome/gwidget.c:98 src/file.c:2250
msgid "no"
msgstr "non"
@@ -1107,31 +1427,31 @@
msgstr "arr�ter"
#. The file-name is printed after the ':'
-#: gtkedit/edit.c:129 gtkedit/edit.c:224 gtkedit/edit.c:231 gtkedit/edit.c:238
-#: gtkedit/edit.c:245 gtkedit/edit.c:251 gtkedit/edit.c:308 gtkedit/edit.c:344
-#: gtkedit/editcmd.c:1932 gtkedit/editwidget.c:947 src/dir.c:375
-#: src/screen.c:2306 src/tree.c:692 src/tree.c:698 src/wtools.c:222
+#: gtkedit/edit.c:131 gtkedit/edit.c:226 gtkedit/edit.c:233 gtkedit/edit.c:240
+#: gtkedit/edit.c:247 gtkedit/edit.c:253 gtkedit/edit.c:310 gtkedit/edit.c:346
+#: gtkedit/editcmd.c:1954 gtkedit/editwidget.c:952 src/dir.c:386
+#: src/screen.c:2326 src/tree.c:692 src/tree.c:698 src/wtools.c:222
#: vfs/fish.c:224
msgid " Error "
msgstr " Erreur "
-#: gtkedit/edit.c:129 gtkedit/edit.c:231
+#: gtkedit/edit.c:131 gtkedit/edit.c:233
msgid " Failed trying to open file for reading: "
msgstr " Impossible d'ouvrir le fichier en lecture: "
-#: gtkedit/edit.c:238
+#: gtkedit/edit.c:240
msgid " Cannot get size/permissions info on file: "
msgstr " Impossible d'obtenir taille et permissions du fichier: "
-#: gtkedit/edit.c:245
+#: gtkedit/edit.c:247
msgid " Not an ordinary file: "
msgstr " Ce n'est pas un fichier ordinaire: "
-#: gtkedit/edit.c:251
+#: gtkedit/edit.c:253
msgid " File is too large: "
msgstr " Fichier trop gros: "
-#: gtkedit/edit.c:252
+#: gtkedit/edit.c:254
msgid ""
" \n"
" Increase edit.h:MAXBUF and recompile the editor. "
@@ -1139,108 +1459,142 @@
" \n"
" Augmentez edit.h:MAXBUF et recompilez l'�diteur. "
-#: gtkedit/edit.c:308 gtkedit/edit.c:344
+#: gtkedit/edit.c:310 gtkedit/edit.c:346
msgid " Error allocating memory "
msgstr " Erreur d'allocation m�moire "
-#: gtkedit/editcmd.c:468
+#: gtkedit/editcmd.c:337
+msgid "Quick save "
+msgstr "Sauvegarde rapide "
+
+#: gtkedit/editcmd.c:338
+msgid "Safe save "
+msgstr "Sauvegarde s�curis�e"
+
+#: gtkedit/editcmd.c:339
+msgid "Do backups -->"
+msgstr "Faire des sauvegardes -->"
+
+#. NLS for hotkeys?
+#: gtkedit/editcmd.c:342 gtkedit/editcmd.c:1139 gtkedit/editcmd.c:1185
+#: gtkedit/editcmd.c:1270 gtkedit/editcmd.c:2866 gtkedit/editoptions.c:68
+#: src/achown.c:71 src/boxes.c:139 src/boxes.c:279 src/boxes.c:376
+#: src/boxes.c:464 src/boxes.c:644 src/boxes.c:727 src/boxes.c:781
+#: src/chmod.c:114 src/chown.c:79 src/cmd.c:856 src/filegui.c:821
+#: src/find.c:171 src/hotlist.c:138 src/hotlist.c:814 src/hotlist.c:911
+#: src/layout.c:370 src/learn.c:59 src/option.c:145 src/panelize.c:86
+#: src/view.c:404 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561
+msgid "&Cancel"
+msgstr "&Annuler"
+
+#: gtkedit/editcmd.c:348
+msgid "Extension:"
+msgstr "Extension:"
+
+#. NLS ?
+#: gtkedit/editcmd.c:355
+msgid " Edit Save Mode "
+msgstr ""
+
+#: gtkedit/editcmd.c:479
msgid " Save As "
msgstr " Enregistrer Sous "
#. Warning message with a query to continue or cancel the operation
-#: gtkedit/editcmd.c:482 gtkedit/editcmd.c:801 gtkedit/editcmd.c:831
-#: gtkedit/editcmd.c:978 gtkedit/editcmd.c:1075 src/ext.c:294 src/file.c:606
-#: src/help.c:318 src/main.c:665 src/screen.c:2064 src/subshell.c:700
-#: src/subshell.c:726 src/utilunix.c:382 src/utilunix.c:386 src/utilunix.c:452
-#: vfs/mcfs.c:169
+#: gtkedit/editcmd.c:493 gtkedit/editcmd.c:812 gtkedit/editcmd.c:842
+#: gtkedit/editcmd.c:989 gtkedit/editcmd.c:1086 src/ext.c:301 src/file.c:619
+#: src/help.c:318 src/main.c:694 src/screen.c:2083 src/subshell.c:705
+#: src/subshell.c:731 src/utilunix.c:388 src/utilunix.c:392 src/utilunix.c:463
+#: vfs/mcfs.c:170
msgid " Warning "
msgstr " Attention "
-#: gtkedit/editcmd.c:483
+#: gtkedit/editcmd.c:494
msgid " A file already exists with this name. "
msgstr " Un fichier portant le meme nom existe d�j�. "
#. Push buttons to over-write the current file, or cancel the operation
-#: gtkedit/editcmd.c:485
+#: gtkedit/editcmd.c:496
msgid "Overwrite"
msgstr "Ecraser"
-#: gtkedit/editcmd.c:485 gtkedit/editcmd.c:774 gtkedit/editcmd.c:801
-#: gtkedit/editcmd.c:831 gtkedit/editcmd.c:978 gtkedit/editcmd.c:1565
+#: gtkedit/editcmd.c:496 gtkedit/editcmd.c:558 gtkedit/editcmd.c:785
+#: gtkedit/editcmd.c:812 gtkedit/editcmd.c:842 gtkedit/editcmd.c:989
+#: gtkedit/editcmd.c:1581
msgid "Cancel"
msgstr "Annuler"
-#: gtkedit/editcmd.c:501
+#: gtkedit/editcmd.c:512
msgid " Save as "
msgstr " Enregistrer Sous "
-#: gtkedit/editcmd.c:501 gtkedit/editcmd.c:2594
+#: gtkedit/editcmd.c:512 gtkedit/editcmd.c:2636
msgid " Error trying to save file. "
msgstr " Erreur lors de l'enregistrement du fichier. "
#. This heads the delete macro error dialog box
-#: gtkedit/editcmd.c:617 gtkedit/editcmd.c:625 gtkedit/editcmd.c:650
+#: gtkedit/editcmd.c:628 gtkedit/editcmd.c:636 gtkedit/editcmd.c:661
msgid " Delete macro "
msgstr " Effacer macro "
#. 'Open' = load temp file
-#: gtkedit/editcmd.c:619
+#: gtkedit/editcmd.c:630
msgid " Error trying to open temp file "
msgstr " Erreur en essayant d'ouvrir un fichier temporaire "
#. 'Open' = load temp file
-#: gtkedit/editcmd.c:627 gtkedit/editcmd.c:688 gtkedit/editcmd.c:756
+#: gtkedit/editcmd.c:638 gtkedit/editcmd.c:699 gtkedit/editcmd.c:767
msgid " Error trying to open macro file "
msgstr " Erreur lors de l'ouverture du fichier de macros "
-#: gtkedit/editcmd.c:632 gtkedit/editcmd.c:640 gtkedit/editcmd.c:676
-#: gtkedit/editcmd.c:731
+#: gtkedit/editcmd.c:643 gtkedit/editcmd.c:651 gtkedit/editcmd.c:687
+#: gtkedit/editcmd.c:742
#, c-format
msgid "key '%d 0': "
msgstr "touche '%d 0': "
-#: gtkedit/editcmd.c:651
+#: gtkedit/editcmd.c:662
msgid " Error trying to overwrite macro file "
msgstr " Erreur lors de l'�crasement du fichier de macros "
#. This heads the 'Macro' dialog box
-#: gtkedit/editcmd.c:668
+#: gtkedit/editcmd.c:679
msgid " Macro "
msgstr " Macro "
#. Input line for a single key press follows the ':'
-#: gtkedit/editcmd.c:670
+#: gtkedit/editcmd.c:681
msgid " Press the macro's new hotkey: "
msgstr " Pressez sur la touche a assigner � la macro: "
#. This heads the 'Save Macro' dialog box
-#: gtkedit/editcmd.c:688
+#: gtkedit/editcmd.c:699
msgid " Save macro "
msgstr " Enregistrer macro "
-#: gtkedit/editcmd.c:698 gtkedit/editcmd.c:705
+#: gtkedit/editcmd.c:709 gtkedit/editcmd.c:716
msgid " Delete Macro "
msgstr " Effacer Macro "
#. This heads the 'Load Macro' dialog box
-#: gtkedit/editcmd.c:755
+#: gtkedit/editcmd.c:766
msgid " Load macro "
msgstr " Charger macro "
-#: gtkedit/editcmd.c:769 gtkedit/editcmd.c:771
+#: gtkedit/editcmd.c:780 gtkedit/editcmd.c:782
msgid " Confirm save file? : "
msgstr " Voulez-vous vraiment enregistrer? : "
#. Buttons to 'Confirm save file' query
-#: gtkedit/editcmd.c:774
+#: gtkedit/editcmd.c:785
msgid " Save file "
msgstr " Enregistrer fichier "
-#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 src/view.c:1964
+#: gtkedit/editcmd.c:785 gtkedit/editwidget.c:1066 src/view.c:1987
msgid "Save"
msgstr "Sauver"
-#: gtkedit/editcmd.c:801 gtkedit/editcmd.c:831
+#: gtkedit/editcmd.c:812 gtkedit/editcmd.c:842
msgid ""
" Current text was modified without a file save. \n"
" Continue discards these changes. "
@@ -1248,169 +1602,237 @@
" Le fichier courant a �t� modifi� sans avoir �t� sauv�. \n"
" Continuer annule les changements. "
-#: gtkedit/editcmd.c:801 gtkedit/editcmd.c:831 gtkedit/editcmd.c:978
+#: gtkedit/editcmd.c:812 gtkedit/editcmd.c:842 gtkedit/editcmd.c:989
+#: src/main.c:3076
msgid "Continue"
msgstr "Continuer"
#. Heads the 'Load' file dialog box
-#: gtkedit/editcmd.c:820 gtkedit/editcmd.c:834
+#: gtkedit/editcmd.c:831 gtkedit/editcmd.c:845
msgid " Load "
msgstr " Ouvrir "
-#: gtkedit/editcmd.c:820
+#: gtkedit/editcmd.c:831
msgid " Error trying to open file for reading "
msgstr " Erreur en essayant d'ouvrir le fichier en lecture "
-#: gtkedit/editcmd.c:978 gtkedit/editcmd.c:1075
+#: gtkedit/editcmd.c:989 gtkedit/editcmd.c:1086
msgid " Block is large, you may not be able to undo this action. "
msgstr ""
" Le block est gros et il est possible que vous ne puissiez pas annuler ce "
"changement. "
-#: gtkedit/editcmd.c:1075
+#: gtkedit/editcmd.c:1086
msgid " Continue "
msgstr " Continuer "
-#: gtkedit/editcmd.c:1075
+#: gtkedit/editcmd.c:1086
msgid " Cancel "
msgstr " Annuler "
+#: gtkedit/editcmd.c:1141 src/filegui.c:596
+msgid "al&L"
+msgstr ""
+
+#: gtkedit/editcmd.c:1143 src/file.c:2174 src/filegui.c:266
+msgid "&Skip"
+msgstr "&Suivant"
+
+#: gtkedit/editcmd.c:1145
+msgid "&Replace"
+msgstr "&Remplacer"
+
#. This is for the confirm replace dialog box. The replaced string comes after the ':'
-#: gtkedit/editcmd.c:1136 gtkedit/editcmd.c:1563
+#: gtkedit/editcmd.c:1151 gtkedit/editcmd.c:1579
msgid " Replace with: "
msgstr " Remplacer avec: "
+#: gtkedit/editcmd.c:1155
+msgid " Confirm replace "
+msgstr " Confirmer remplacement "
+
+#: gtkedit/editcmd.c:1189 gtkedit/editcmd.c:1274
+msgid "scanf &Expression"
+msgstr "&Expression scanf"
+
+#: gtkedit/editcmd.c:1191
+msgid "replace &All"
+msgstr "Tout rempl&acer"
+
+#: gtkedit/editcmd.c:1193
+msgid "pr&Ompt on replace"
+msgstr "C&onfirmation avant remplacement"
+
+#: gtkedit/editcmd.c:1195 gtkedit/editcmd.c:1276
+msgid "&Backwards"
+msgstr "Vers le &haut"
+
+#: gtkedit/editcmd.c:1197 gtkedit/editcmd.c:1278
+msgid "&Regular expression"
+msgstr "Expression &r�guli�re"
+
+#: gtkedit/editcmd.c:1199 gtkedit/editcmd.c:1280
+msgid "&Whole words only"
+msgstr "&Mots entiers seulement"
+
+#: gtkedit/editcmd.c:1201 gtkedit/editcmd.c:1282
+msgid "case &Sensitive"
+msgstr "re&spect de la case"
+
+#: gtkedit/editcmd.c:1205
+msgid " Enter replacement argument order eg. 3,2,1,4 "
+msgstr " Entrez l'ordre des arguments (ex: 3,2,1,4): "
+
+#: gtkedit/editcmd.c:1209
+#, fuzzy
+msgid " Enter replacement string:"
+msgstr " Entrez le texte � rechercher:"
+
+#: gtkedit/editcmd.c:1213 gtkedit/editcmd.c:1286 src/view.c:1912
+msgid " Enter search string:"
+msgstr " Entrez le texte � rechercher:"
+
#. Heads the 'Replace' dialog box
-#: gtkedit/editcmd.c:1140 gtkedit/editcmd.c:1217 gtkedit/editcmd.c:1467
-#: gtkedit/editcmd.c:1561 gtkedit/editcmd.c:2094 gtkedit/editcmd.c:2125
-#: gtkedit/editcmd.c:2127
+#: gtkedit/editcmd.c:1232 gtkedit/editcmd.c:1483 gtkedit/editcmd.c:1577
+#: gtkedit/editcmd.c:2128 gtkedit/editcmd.c:2159 gtkedit/editcmd.c:2161
msgid " Replace "
msgstr " Remplacer "
#. Heads the 'Search' dialog box
-#: gtkedit/editcmd.c:1285 gtkedit/editcmd.c:1461 gtkedit/editcmd.c:2196
-#: src/view.c:1446 src/view.c:1536 src/view.c:1658 src/view.c:1857
-#: src/view.c:1889
+#: gtkedit/editcmd.c:1300 gtkedit/editcmd.c:1477 gtkedit/editcmd.c:2230
+#: src/view.c:1467 src/view.c:1566 src/view.c:1688 src/view.c:1880
+#: src/view.c:1912
msgid " Search "
msgstr " Rechercher "
#. An input line comes after the ':'
-#: gtkedit/editcmd.c:1335
+#: gtkedit/editcmd.c:1349
msgid " Enter search text : "
msgstr " Entrez le texte � rechercher : "
-#: gtkedit/editcmd.c:1342
+#: gtkedit/editcmd.c:1356
msgid " Enter replace text : "
msgstr " Entrez le texte de substitution : "
-#: gtkedit/editcmd.c:1346
-msgid " Enter argument order : "
+#: gtkedit/editcmd.c:1359 gtkedit/editcmd.c:1360
+#, c-format
+msgid ""
+"You can enter regexp substrings with %s (not \\1, \\2 like sed) then use "
+"\"Enter...order\""
+msgstr ""
+
+#: gtkedit/editcmd.c:1362
+#, fuzzy
+msgid " Enter argument (or substring) order : "
msgstr " Entrez l'ordre des arguments : "
#. Tool hint
-#: gtkedit/editcmd.c:1350 gtkedit/editcmd.c:1351
-msgid "Enter the order of replacement of your scanf format specifiers"
+#: gtkedit/editcmd.c:1366 gtkedit/editcmd.c:1367
+#, fuzzy
+msgid ""
+"Enter the order of replacement of your scanf format specifiers or regexp "
+"substrings"
msgstr "Entrer l'ordre de remplacement des sp�cificateurs de format scanf"
#. The following are check boxes
-#: gtkedit/editcmd.c:1356
+#: gtkedit/editcmd.c:1372
msgid " Whole words only "
msgstr " Mots entiers seulement "
-#: gtkedit/editcmd.c:1358
+#: gtkedit/editcmd.c:1374
msgid " Case sensitive "
msgstr " Respect de la case "
-#: gtkedit/editcmd.c:1361
+#: gtkedit/editcmd.c:1377
msgid " Regular expression "
msgstr " Expression r�guli�re "
-#: gtkedit/editcmd.c:1362 gtkedit/editcmd.c:1363
+#: gtkedit/editcmd.c:1378 gtkedit/editcmd.c:1379
msgid "See the regex man page for how to compose a regular expression"
msgstr ""
"Consultez la page de manuel 'regex' pour savoir comment composer une "
"expression reguli�re"
-#: gtkedit/editcmd.c:1369
+#: gtkedit/editcmd.c:1385
msgid " Backwards "
msgstr " Vers le haut "
#. Tool hint
-#: gtkedit/editcmd.c:1371 gtkedit/editcmd.c:1372
+#: gtkedit/editcmd.c:1387 gtkedit/editcmd.c:1388
msgid "Warning: Searching backward can be slow"
msgstr "Attention: La recherche vers le haut peut �tre lente"
-#: gtkedit/editcmd.c:1385
+#: gtkedit/editcmd.c:1401
msgid " Prompt on replace "
msgstr " Confirmation avant remplacement "
#. Tool hint
-#: gtkedit/editcmd.c:1387
+#: gtkedit/editcmd.c:1403
msgid "Ask before making each replacement"
msgstr " Confirmation avant chaque remplacement"
-#: gtkedit/editcmd.c:1389
+#: gtkedit/editcmd.c:1405
msgid " Replace all "
msgstr " Tout remplacer "
-#: gtkedit/editcmd.c:1392
+#: gtkedit/editcmd.c:1408
msgid " Scanf expression "
msgstr " Expression scanf "
#. Tool hint
-#: gtkedit/editcmd.c:1394
+#: gtkedit/editcmd.c:1410
msgid "Allows entering of a C format string, see the scanf man page"
msgstr "Permet d'entrer une chaine en format C, cf la page de manuel scanf"
#. Tool hint
-#: gtkedit/editcmd.c:1399
+#: gtkedit/editcmd.c:1415
msgid "Begin search, Enter"
msgstr "Tapez Entr�e pour commencer la recherche"
#. Tool hint
-#: gtkedit/editcmd.c:1402
+#: gtkedit/editcmd.c:1418
msgid "Abort this dialog, Esc"
msgstr "Tapez Echap., pour fermer ce dialogue"
#. Buttons for the confirm replace dialog box.
-#: gtkedit/editcmd.c:1565
+#: gtkedit/editcmd.c:1581
msgid "Replace"
msgstr "Remplacer"
-#: gtkedit/editcmd.c:1565
+#: gtkedit/editcmd.c:1581
msgid "Skip"
msgstr "Suivant"
-#: gtkedit/editcmd.c:1565
+#: gtkedit/editcmd.c:1581
msgid "Replace all"
msgstr "Tout remplacer"
-#: gtkedit/editcmd.c:1932
+#: gtkedit/editcmd.c:1954
msgid ""
" Invalid regular expression, or scanf expression with to many conversions "
msgstr ""
" Expression r�guli�re invalide, ou expression scanf avec trop de conversions "
#. "Invalid regexp string or scanf string"
-#: gtkedit/editcmd.c:2096
+#: gtkedit/editcmd.c:2130
msgid " Error in replacement format string. "
msgstr " Erreur dans la chaine de remplacement de format. "
-#: gtkedit/editcmd.c:2124
+#: gtkedit/editcmd.c:2158
#, c-format
msgid " %ld replacements made. "
msgstr " %ld remplacements effectu�s. "
-#: gtkedit/editcmd.c:2127 gtkedit/editcmd.c:2196
+#: gtkedit/editcmd.c:2161 gtkedit/editcmd.c:2230
msgid " Search string not found. "
msgstr " Chaine non trouv�e. "
#. Confirm 'Quit' dialog box
-#: gtkedit/editcmd.c:2220 gtkedit/editcmd.c:2235 gtkedit/editcmd.c:2238
+#: gtkedit/editcmd.c:2254 gtkedit/editcmd.c:2269 gtkedit/editcmd.c:2272
msgid " Quit "
msgstr " Quiter "
-#: gtkedit/editcmd.c:2221 gtkedit/editcmd.c:2239
+#: gtkedit/editcmd.c:2255 gtkedit/editcmd.c:2273
msgid ""
" Current text was modified without a file save. \n"
" Save with exit? "
@@ -1418,226 +1840,659 @@
" Ce texte a �t� modifi� sans etre sauv�. \n"
" Sauver en sortant? "
-#: gtkedit/editcmd.c:2235
+#: gtkedit/editcmd.c:2269
msgid " File was modified, Save with exit? "
msgstr " Le fichier a �t� modifi�, Sauver et quitter? "
-#: gtkedit/editcmd.c:2235
+#: gtkedit/editcmd.c:2269
msgid "Cancel quit"
msgstr "Annuler quitter"
-#: gtkedit/editcmd.c:2239
+#: gtkedit/editcmd.c:2273
msgid " &Cancel quit "
msgstr " &Annuler quitter "
-#: gtkedit/editcmd.c:2239
+#: gtkedit/editcmd.c:2273
msgid " &Yes "
msgstr " &Oui "
-#: gtkedit/editcmd.c:2239
+#: gtkedit/editcmd.c:2273
msgid " &No "
msgstr " &Non "
-#: gtkedit/editcmd.c:2434 gtkedit/editcmd.c:2509
+#: gtkedit/editcmd.c:2476 gtkedit/editcmd.c:2551
msgid " Copy to clipboard "
msgstr " Copier dans le presse-papiers "
-#: gtkedit/editcmd.c:2434 gtkedit/editcmd.c:2456 gtkedit/editcmd.c:2509
-#: gtkedit/editcmd.c:2522
+#: gtkedit/editcmd.c:2476 gtkedit/editcmd.c:2498 gtkedit/editcmd.c:2551
+#: gtkedit/editcmd.c:2564
msgid " Unable to save to file. "
msgstr " Impossible de sauver dans un fichier. "
-#: gtkedit/editcmd.c:2456 gtkedit/editcmd.c:2522
+#: gtkedit/editcmd.c:2498 gtkedit/editcmd.c:2564
msgid " Cut to clipboard "
msgstr " Couper vers le presse-papiers "
-#: gtkedit/editcmd.c:2544 gtkedit/editcmd.c:2548 gtkedit/editcmd.c:2553
-#: gtkedit/editcmd.c:2556 src/view.c:1829
+#: gtkedit/editcmd.c:2586 gtkedit/editcmd.c:2590 gtkedit/editcmd.c:2595
+#: gtkedit/editcmd.c:2598 src/view.c:1852
msgid " Goto line "
msgstr " Aller � la ligne "
-#: gtkedit/editcmd.c:2544 gtkedit/editcmd.c:2548 gtkedit/editcmd.c:2553
-#: gtkedit/editcmd.c:2556
+#: gtkedit/editcmd.c:2586 gtkedit/editcmd.c:2590 gtkedit/editcmd.c:2595
+#: gtkedit/editcmd.c:2598
msgid " Enter line: "
msgstr " Entrez la ligne: "
-#: gtkedit/editcmd.c:2577 gtkedit/editcmd.c:2594
+#: gtkedit/editcmd.c:2619 gtkedit/editcmd.c:2636
msgid " Save Block "
msgstr " Sauver le Block "
-#: gtkedit/editcmd.c:2628
+#: gtkedit/editcmd.c:2670
msgid " Insert File "
msgstr " Ins�rer Fichier "
-#: gtkedit/editcmd.c:2643
+#: gtkedit/editcmd.c:2685
msgid " Insert file "
msgstr " Ins�rer fichier "
-#: gtkedit/editcmd.c:2643
+#: gtkedit/editcmd.c:2685
msgid " Error trying to insert file. "
msgstr " Erreur en essayant d'ins�rer le fichier. "
#. Not essential to translate
-#: gtkedit/editcmd.c:2663
+#: gtkedit/editcmd.c:2705
msgid " Sort block "
msgstr " Trier block "
#. Not essential to translate
-#: gtkedit/editcmd.c:2663 gtkedit/editcmd.c:2717
+#: gtkedit/editcmd.c:2705 gtkedit/editcmd.c:2759
msgid " You must first highlight a block of text. "
msgstr " You devez d'abord s�lectionner un bloc de texte. "
-#: gtkedit/editcmd.c:2670
+#: gtkedit/editcmd.c:2712
msgid " Run Sort "
msgstr " Trier "
#. Not essential to translate
-#: gtkedit/editcmd.c:2672
+#: gtkedit/editcmd.c:2714
msgid " Enter sort options (see manpage) separated by whitespace: "
msgstr " Entrez les options de tri (cf: sort(1)) s�par�es par des espaces: "
-#: gtkedit/editcmd.c:2683 gtkedit/editcmd.c:2689
+#: gtkedit/editcmd.c:2725 gtkedit/editcmd.c:2731
msgid " Sort "
msgstr " Trier "
#. Not essential to translate
-#: gtkedit/editcmd.c:2685
+#: gtkedit/editcmd.c:2727
msgid " Error trying to execute sort command "
msgstr " Erreur lors de l'ex�cution de la commande de tri "
#. Not essential to translate
-#: gtkedit/editcmd.c:2691
+#: gtkedit/editcmd.c:2733
msgid " Sort returned non-zero: "
msgstr " Le code de retour du tri est non nul: "
#. Not essential to translate
-#: gtkedit/editcmd.c:2715 gtkedit/editcmd.c:2745
+#: gtkedit/editcmd.c:2757 gtkedit/editcmd.c:2787
msgid " Process block "
msgstr " Process block "
-#. Not essential to translate
-#: gtkedit/editcmd.c:2747
-msgid " Error trying to stat file "
-msgstr " Error trying to stat file "
+#. Not essential to translate
+#: gtkedit/editcmd.c:2789
+msgid " Error trying to stat file "
+msgstr " Error trying to stat file "
+
+#: gtkedit/editcmd.c:2859
+msgid " Mail "
+msgstr " Mail "
+
+#: gtkedit/editcmd.c:2872
+msgid " Copies to"
+msgstr " Copies vers"
+
+#: gtkedit/editcmd.c:2876
+msgid " Subject"
+msgstr " Sujet"
+
+#: gtkedit/editcmd.c:2880
+msgid " To"
+msgstr " Vers"
+
+#: gtkedit/editcmd.c:2882
+msgid " mail -s <subject> -c <cc> <to>"
+msgstr " mail -s <sujet> -c <cc> <destinataire>"
+
+#: gtkedit/editoptions.c:36
+msgid "Intuitive"
+msgstr "Intuitif"
+
+#: gtkedit/editoptions.c:36
+msgid "Emacs"
+msgstr "Emacs"
+
+#: gtkedit/editoptions.c:39
+msgid "None"
+msgstr "Aucun"
+
+#: gtkedit/editoptions.c:39
+msgid "Dynamic paragraphing"
+msgstr "Paragraphage automatique"
+
+#: gtkedit/editoptions.c:39
+msgid "Type writer wrap"
+msgstr "C�sure \"machine � �crire\""
+
+#. 2
+#: gtkedit/editoptions.c:74
+#, fuzzy
+msgid "Word wrap line length : "
+msgstr " Entrez la longueur de ligne, 0 pour d�sactiver: "
+
+#. 4
+#: gtkedit/editoptions.c:80
+msgid "Tab spacing : "
+msgstr "Espacement des tabulations: "
+
+#: gtkedit/editoptions.c:88
+msgid "synta&X highlighting"
+msgstr "Coloration synta&Xique"
+
+#. 7
+#: gtkedit/editoptions.c:94
+msgid "confir&M before saving"
+msgstr "confir&Mer avant de sauvegarder"
+
+#. 8
+#: gtkedit/editoptions.c:97
+msgid "fill tabs with &Spaces"
+msgstr "remplir les tabulations avec des e&Spaces"
+
+#. 9
+#: gtkedit/editoptions.c:100
+msgid "&Return does autoindent"
+msgstr ""
+
+#. 10
+#: gtkedit/editoptions.c:103
+msgid "&Backspace through tabs"
+msgstr ""
+
+#. 11
+#: gtkedit/editoptions.c:106
+msgid "&Fake half tabs"
+msgstr ""
+
+#. 13
+#: gtkedit/editoptions.c:112
+msgid "Wrap mode"
+msgstr "Mode de c�sure"
+
+#. 15
+#: gtkedit/editoptions.c:118
+msgid "Key emulation"
+msgstr "Emulation de touches"
+
+#: gtkedit/editoptions.c:159
+msgid " Editor options "
+msgstr " Options de l'Editeur "
+
+#. Not essential to translate
+#: gtkedit/editwidget.c:312
+msgid "Error initialising editor.\n"
+msgstr "Erreur lors de l'initialisation de l'�diteur.\n"
+
+#: gtkedit/editwidget.c:1065 src/help.c:806 src/main.c:1691 src/screen.c:2304
+#: src/screen.c:2334 src/tree.c:1018 src/view.c:1982
+msgid "Help"
+msgstr "Aide"
+
+#: gtkedit/editwidget.c:1067
+msgid "Mark"
+msgstr "Marquer"
+
+#: gtkedit/editwidget.c:1068
+msgid "Replac"
+msgstr "Remplac"
+
+#: gtkedit/editwidget.c:1071 src/view.c:1995
+msgid "Search"
+msgstr "Chercher"
+
+#: gtkedit/editwidget.c:1074 src/main.c:1693
+msgid "PullDn"
+msgstr "Menu"
+
+#: gtkedit/editwidget.c:1075 src/help.c:818 src/main.c:1694 src/view.c:1984
+#: src/view.c:2004
+msgid "Quit"
+msgstr "Quitter"
+
+#: gtkedit/editmenu.c:57
+msgid " Word wrap "
+msgstr " C�sure automatique "
+
+#. Not essential to translate
+#: gtkedit/editmenu.c:59
+msgid " Enter line length, 0 for off: "
+msgstr " Entrez la longueur de ligne, 0 pour d�sactiver: "
+
+#: gtkedit/editmenu.c:70
+msgid " About "
+msgstr " A Propos "
+
+#: gtkedit/editmenu.c:71
+msgid ""
+"\n"
+" Cooledit v2.1\n"
+"\n"
+" Copyright (C) 1996 the Free Software Foundation\n"
+"\n"
+" A user friendly text editor written\n"
+" for the Midnight Commander.\n"
+msgstr ""
+"\n"
+" Cooledit v2.1\n"
+"\n"
+" Copyright (C) 1996 the Free Software Foundation\n"
+"\n"
+" Un editeur de texte convivial �crit\n"
+" pour Midnight Commander.\n"
+
+#: gtkedit/editmenu.c:119 gtkedit/editmenu.c:135
+msgid "&Open/load... C-o"
+msgstr "&Ouvrir/charger.. C-o"
+
+#: gtkedit/editmenu.c:120
+msgid "&New C-n"
+msgstr "&Nouveau C-n"
+
+#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138
+msgid "&Save F2"
+msgstr "&Sauver F2"
+
+#: gtkedit/editmenu.c:123 gtkedit/editmenu.c:139
+msgid "save &As... F12"
+msgstr "Enregistrer sous.. F12"
+
+#: gtkedit/editmenu.c:125 gtkedit/editmenu.c:141
+msgid "&Insert file... F15"
+msgstr "&Ins�rer fichier.. F15"
+
+#: gtkedit/editmenu.c:126
+msgid "copy to &File... C-f"
+msgstr "copier vers &Fichier... C-f"
+
+#: gtkedit/editmenu.c:128 gtkedit/editmenu.c:144
+msgid "a&Bout... "
+msgstr "A Propos... "
+
+#: gtkedit/editmenu.c:130 gtkedit/editmenu.c:146
+msgid "&Quit F10"
+msgstr "&Quitter F10"
+
+#: gtkedit/editmenu.c:136
+msgid "&New C-x k"
+msgstr "&Nouveau C-x k"
+
+#: gtkedit/editmenu.c:142
+msgid "copy to &File... "
+msgstr "copier vers &Fichier..."
+
+#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168
+msgid "&Toggle Mark F3"
+msgstr "&Inverser Marque F3"
+
+#: gtkedit/editmenu.c:152 gtkedit/editmenu.c:169
+msgid "&Mark Columns S-F3"
+msgstr "&Marquer Colonnes S-F3"
+
+#: gtkedit/editmenu.c:154 gtkedit/editmenu.c:171
+msgid "toggle &Ins/overw Ins"
+msgstr "echange &Ins�re/�crasemt"
+
+#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173
+msgid "&Copy F5"
+msgstr "&Copier F5"
+
+#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174
+msgid "&Move F6"
+msgstr "&D�placer F6"
+
+#: gtkedit/editmenu.c:158 gtkedit/editmenu.c:175
+msgid "&Delete F8"
+msgstr "&Supprimer F8"
+
+#: gtkedit/editmenu.c:160 gtkedit/editmenu.c:177
+msgid "&Undo C-u"
+msgstr "&Undo C-u"
+
+#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179
+msgid "&Beginning C-PgUp"
+msgstr "d�&But C-PgUp"
+
+#: gtkedit/editmenu.c:163 gtkedit/editmenu.c:180
+msgid "&End C-PgDn"
+msgstr "&End C-PgDn"
+
+#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192
+msgid "&Search... F7"
+msgstr "Rechercher... F7"
+
+#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193
+msgid "search &Again F17"
+msgstr "Chercher � nouve&Au F17"
+
+#: gtkedit/editmenu.c:187 gtkedit/editmenu.c:194
+msgid "&Replace... F4"
+msgstr "&Remplacer... F4"
+
+#: gtkedit/editmenu.c:199 gtkedit/editmenu.c:221
+msgid "&Goto line... M-l"
+msgstr "Aller � la ligne... M-l"
+
+#: gtkedit/editmenu.c:201 gtkedit/editmenu.c:223
+msgid "insert &Literal... C-q"
+msgstr "ins�rer un &Literal... C-q"
+
+#: gtkedit/editmenu.c:203 gtkedit/editmenu.c:225
+msgid "&Refresh screen C-l"
+msgstr "&Rafraichir l'�cran C-l"
+
+#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227
+msgid "&Start record macro C-r"
+msgstr "Commencer � enregistrer une macro C-r"
+
+#: gtkedit/editmenu.c:206 gtkedit/editmenu.c:228
+msgid "&Finish record macro... C-r"
+msgstr "Terminer l'enregistrement de macro... C-r"
+
+#: gtkedit/editmenu.c:207
+msgid "&Execute macro... C-a, KEY"
+msgstr "&Ex�cuter macro... C-a, TOUCHE"
+
+#: gtkedit/editmenu.c:208 gtkedit/editmenu.c:230
+msgid "delete macr&O... "
+msgstr "effacer macr&O... "
+
+#: gtkedit/editmenu.c:210 gtkedit/editmenu.c:232
+msgid "insert &Date/time "
+msgstr "ins�rer &Date/heure "
+
+#: gtkedit/editmenu.c:212 gtkedit/editmenu.c:234
+msgid "format p&Aragraph M-p"
+msgstr "formater p&Aragraphe M-p"
+
+#: gtkedit/editmenu.c:213
+msgid "'ispell' s&Pell check C-p"
+msgstr "correction orthographique 'is&Pell' C-p"
+
+#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236
+msgid "sor&T... M-t"
+msgstr "&Trier... M-t"
+
+#: gtkedit/editmenu.c:215 gtkedit/editmenu.c:237
+msgid "'indent' &C Formatter F19"
+msgstr "Formatteur &C 'indent' F19"
+
+#: gtkedit/editmenu.c:216
+msgid "&Mail... "
+msgstr "&Mail... "
+
+#: gtkedit/editmenu.c:229
+msgid "&Execute macro... C-x e, KEY"
+msgstr "&Ex�cuter macro... C-x e, TOUCHE"
+
+#: gtkedit/editmenu.c:235
+msgid "'ispell' s&Pell check M-$"
+msgstr "correction orthographique 'is&Pell' M-$"
+
+#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253
+msgid "&General... "
+msgstr "&G�n�ral... "
+
+#: gtkedit/editmenu.c:245 gtkedit/editmenu.c:254
+msgid "&Save mode..."
+msgstr "Mode &Sauvegarde..."
+
+#: gtkedit/editmenu.c:247 gtkedit/editmenu.c:256 src/main.c:1325
+msgid "&Layout..."
+msgstr "Pr�sentation..."
+
+#. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t'
+#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:392
+#: src/chmod.c:164 src/chown.c:130
+msgid " File "
+msgstr " Fichier "
+
+#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276 gtkedit/editmenu.c:408
+msgid " Edit "
+msgstr " Editer "
+
+#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277
+msgid " Sear/Repl "
+msgstr " Cherch/Rempl "
+
+#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278 gtkedit/editmenu.c:448
+msgid " Command "
+msgstr " Commande "
+
+#: gtkedit/editmenu.c:270 gtkedit/editmenu.c:279
+msgid " Options "
+msgstr " Options "
+
+#: gtkedit/editmenu.c:393
+msgid "Open...\tC-o"
+msgstr "Ouvrir...\tC-o"
+
+#: gtkedit/editmenu.c:394
+msgid "New\tC-n"
+msgstr "Nouveau\tC-n"
+
+#: gtkedit/editmenu.c:396
+msgid "Save\tF2"
+msgstr "Sauver\tF2"
+
+#: gtkedit/editmenu.c:397
+msgid "Save as...\tF12"
+msgstr "Enregistrer sous...\tF12"
+
+#: gtkedit/editmenu.c:399
+msgid "Insert file...\tF15"
+msgstr "Ins�rer fichier...\tF15"
+
+#: gtkedit/editmenu.c:400
+msgid "Copy to file...\tC-f"
+msgstr "Copier vers fichier...\tC-f"
+
+#. Tool hint
+#: gtkedit/editmenu.c:403
+msgid "Disk operations"
+msgstr "Op�rations disque"
+
+#: gtkedit/editmenu.c:409
+msgid "Toggle mark\tF3"
+msgstr "Echange Marque\tF3"
+
+#: gtkedit/editmenu.c:410
+msgid "Toggle mark columns\tC-b"
+msgstr "Echange Marque\tC-b"
+
+#: gtkedit/editmenu.c:412
+#, fuzzy
+msgid "Toggle book mark\tC-M-Ins"
+msgstr "Echange Marque\tF3"
+
+#: gtkedit/editmenu.c:413
+msgid "Previous book mark\tC-M-Up"
+msgstr ""
-#: gtkedit/editcmd.c:2817
-msgid " Mail "
-msgstr " Mail "
+#: gtkedit/editmenu.c:414
+msgid "Next book mark\tC-M-Down"
+msgstr ""
-#: gtkedit/editoptions.c:37
-msgid "None"
-msgstr "Aucun"
+#: gtkedit/editmenu.c:415
+msgid "Flush book marks"
+msgstr ""
-#: gtkedit/editoptions.c:37
-msgid "Dynamic paragraphing"
-msgstr "Paragraphage automatique"
+#: gtkedit/editmenu.c:417
+msgid "Toggle insert/overwrite\tIns"
+msgstr "Echange ins�re/�crasement\tIns"
-#: gtkedit/editoptions.c:37
-msgid "Type writer wrap"
-msgstr "C�sure \"machine � �crire\""
+#: gtkedit/editmenu.c:419
+#, fuzzy
+msgid "Copy block to cursor\tF5"
+msgstr "Copier le block dans le presse-papier\tC-Ins"
-#. 13
-#: gtkedit/editoptions.c:100
-msgid "Wrap mode"
-msgstr "Mode de c�sure"
+#: gtkedit/editmenu.c:420
+msgid "Move block to cursor\tF6"
+msgstr ""
-#. 15
-#: gtkedit/editoptions.c:106
-msgid "Key emulation"
-msgstr "Emulation de touches"
+#: gtkedit/editmenu.c:421
+msgid "Delete block\tF8/C-Del"
+msgstr "Effacer block\tF8/C-Del"
-#. Not essential to translate
-#: gtkedit/editwidget.c:310
-msgid "Error initialising editor.\n"
-msgstr "Erreur lors de l'initialisation de l'�diteur.\n"
+#: gtkedit/editmenu.c:423
+msgid "Copy block to clipbrd\tC-Ins"
+msgstr "Copier le block dans le presse-papier\tC-Ins"
-#: gtkedit/editwidget.c:1060 src/help.c:806 src/main.c:1668 src/screen.c:2284
-#: src/screen.c:2314 src/tree.c:1018 src/view.c:1959
-msgid "Help"
-msgstr "Aide"
+#: gtkedit/editmenu.c:424
+msgid "Cut block to clipbrd\tS-Del"
+msgstr "Couper le block vers le presse-papier\tS-Del"
-#: gtkedit/editwidget.c:1062
-msgid "Mark"
-msgstr "Marquer"
+#: gtkedit/editmenu.c:425
+msgid "Paste block from clipbrd\tS-Ins"
+msgstr "Coller le block du presse-papier\tS-Ins"
-#: gtkedit/editwidget.c:1063
-msgid "Replac"
-msgstr "Remplacer"
+#: gtkedit/editmenu.c:426
+msgid "Selection history\tM-Ins"
+msgstr "Historique de la s�lection\tM-Ins"
-#: gtkedit/editwidget.c:1066 src/view.c:1972
-msgid "Search"
-msgstr "Chercher"
+#: gtkedit/editmenu.c:428
+msgid "Undo\tC-BackSpace"
+msgstr ""
-#: gtkedit/editwidget.c:1069 src/main.c:1670
-msgid "PullDn"
-msgstr "Menu"
+#. Tool hint
+#: gtkedit/editmenu.c:431
+msgid "Manipulating blocks of text"
+msgstr "Manipulation de blocs de texte"
+
+#: gtkedit/editmenu.c:436
+msgid " Srch/Replce "
+msgstr " Chercher/Remplacer "
+
+#: gtkedit/editmenu.c:437
+msgid "Search...\tF7"
+msgstr "Rechercher...\tF7"
+
+#: gtkedit/editmenu.c:438
+msgid "Search again\tF17"
+msgstr "Chercher � nouveau\tF17"
+
+#: gtkedit/editmenu.c:439
+msgid "Replace...\tF4"
+msgstr "Remplacer...\tF4"
+
+#: gtkedit/editmenu.c:440
+msgid "Replace again\tF14"
+msgstr "Remplacer � nouveau\tF14"
-#: gtkedit/editwidget.c:1070 src/help.c:818 src/main.c:1671 src/view.c:1961
-#: src/view.c:1981
-msgid "Quit"
-msgstr "Quiter"
+#. Tool hint
+#: gtkedit/editmenu.c:443
+msgid "Search for and replace text"
+msgstr "Chercher et remplacer texte"
+
+#: gtkedit/editmenu.c:449
+msgid "Goto line...\tM-l"
+msgstr "Aller � la ligne...\tM-l"
+
+#: gtkedit/editmenu.c:451
+msgid "Start record macro\tC-r"
+msgstr "Commencer � enregistrer une macro\tC-r"
+
+#: gtkedit/editmenu.c:452
+msgid "Finish record macro...\tC-r"
+msgstr "Terminer l'enregistrement de macro...\tC-r"
+
+#: gtkedit/editmenu.c:453
+msgid "Execute macro...\tC-a, KEY"
+msgstr "Ex�cuter macro...\tC-a, TOUCHE"
+
+#: gtkedit/editmenu.c:454
+msgid "Delete macro...\t"
+msgstr "Effacer macro...\t"
+
+#: gtkedit/editmenu.c:456
+msgid "Insert date/time\tC-d"
+msgstr "Ins�rer date/heure\tC-d"
+
+#: gtkedit/editmenu.c:457
+msgid "Format paragraph\tM-p"
+msgstr "Formater paragraphe\tM-p"
+
+#: gtkedit/editmenu.c:459
+msgid "Refresh display\tC-l"
+msgstr "Rafraichir l'affichage\tC-l"
+
+#. Tool hint
+#: gtkedit/editmenu.c:462
+msgid "Macros and internal commands"
+msgstr "Macros et commandes internes"
#: gtkedit/gtkedit.c:65
msgid "&Dismiss"
msgstr ""
-#: gtkedit/gtkedit.c:110
+#: gtkedit/gtkedit.c:66
+msgid " Enter file name: "
+msgstr " Entrez le nom de fichier: "
+
+#: gtkedit/gtkedit.c:111
msgid "The Quick Brown Fox Jumps Over The Lazy Dog"
msgstr "The Quick Brown Fox Jumps Over The Lazy Dog"
-#: gtkedit/gtkedit.c:801
+#: gtkedit/gtkedit.c:802
msgid ""
"gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n"
msgstr ""
"gtkedit.c: la variable d'environnement HOME n'est pas positionn�e et il n'y "
"a pas d'entr�es dans /etc/passwd - abandon\n"
-#: gtkedit/gtkedit.c:1289
+#: gtkedit/gtkedit.c:1290
msgid "Clear the edit buffer"
msgstr "Vider le tampon d'�dition"
-#: gtkedit/gtkedit.c:1294
+#: gtkedit/gtkedit.c:1295
msgid "Insert File"
msgstr "Ins�rer Fichier"
-#: gtkedit/gtkedit.c:1294
+#: gtkedit/gtkedit.c:1295
msgid "Insert text from a file"
msgstr "Ins�rer du texte � partir d'un fichier"
-#: gtkedit/gtkedit.c:1296
+#: gtkedit/gtkedit.c:1297
msgid "Copy to file"
msgstr "Copier dans un fichier"
-#: gtkedit/gtkedit.c:1296
+#: gtkedit/gtkedit.c:1297
msgid "copy a block to a file"
msgstr "copier un bloc dans un fichier"
-#: gtkedit/gtkedit.c:1336
+#: gtkedit/gtkedit.c:1337
msgid "Search/Replace"
msgstr "Chercher/Remplacer"
-#: gtkedit/syntax.c:3180 gtkedit/syntax.c:3187
+#: gtkedit/syntax.c:1339 gtkedit/syntax.c:1346
msgid " Load syntax file "
msgstr " Chargement du fichier de syntaxe "
-#: gtkedit/syntax.c:3180
+#: gtkedit/syntax.c:1339
msgid " File access error "
msgstr " erreur d'acces au fichier "
-#: gtkedit/syntax.c:3186
+#: gtkedit/syntax.c:1345
#, c-format
-msgid " Syntax error in file %s on line %d "
-msgstr " Erreur de syntaxe dans le fichier %s � la ligne %d "
-
-#: src/achown.c:71 src/boxes.c:139 src/boxes.c:279 src/boxes.c:376
-#: src/boxes.c:464 src/boxes.c:644 src/boxes.c:727 src/boxes.c:781
-#: src/chmod.c:114 src/chown.c:79 src/cmd.c:856 src/filegui.c:790
-#: src/find.c:151 src/hotlist.c:138 src/hotlist.c:814 src/hotlist.c:911
-#: src/layout.c:370 src/learn.c:59 src/option.c:145 src/panelize.c:86
-#: src/view.c:404 src/wtools.c:111 src/wtools.c:386 src/wtools.c:559
-#: src/wtools.c:640
-msgid "&Cancel"
-msgstr "&Annuler"
+msgid " Error in file %s on line %d "
+msgstr " Erreur dans le fichier %s � la ligne %d "
#: src/achown.c:72 src/chmod.c:115 src/chown.c:80
msgid "&Set"
@@ -1671,10 +2526,6 @@
msgid "Flag"
msgstr "Drapeau"
-#: src/achown.c:378
-msgid "Mode"
-msgstr "Mode"
-
#: src/achown.c:383
#, c-format
msgid "%6d of %d"
@@ -1717,27 +2568,27 @@
msgid " I can't run the Advanced Chown command on a tarfs "
msgstr " Je ne peut pas utiliser le Chown Avanc� sur un tarfs "
-#: src/background.c:178
+#: src/background.c:181
msgid "Background process:"
msgstr "T�che de fond:"
-#: src/background.c:284 src/file.c:2113
+#: src/background.c:287 src/file.c:2173
msgid " Background process error "
msgstr " Erreur de t�che de fond "
-#: src/background.c:291
+#: src/background.c:294
msgid " Child died unexpectedly "
msgstr " Terminaison inattendue du processus fils"
-#: src/background.c:293
+#: src/background.c:296
msgid " Unknown error in child "
msgstr " Erreur inconnue dans le processus fils "
-#: src/background.c:308
+#: src/background.c:311
msgid " Background protocol error "
msgstr " Erreur de protocole de fond "
-#: src/background.c:309
+#: src/background.c:312
msgid ""
" Background process sent us a request for more arguments \n"
" than we can handle. \n"
@@ -1861,39 +2712,30 @@
msgstr "cd"
#: src/boxes.c:796
-#, fuzzy
msgid "Symbolic link"
-msgstr "Nom du lien symbolique:"
-
-#: src/boxes.c:801
-msgid "Symbolic link filename:"
-msgstr "Nom du lien symbolique:"
-
-#: src/boxes.c:803
-msgid "Existing filename (filename symlink will point to):"
-msgstr "Fichier existant (vers lequel le lien va pointer):"
+msgstr "Lien symbolique"
-#: src/boxes.c:832
+#: src/boxes.c:833
msgid "Running "
msgstr "En cours "
-#: src/boxes.c:833 src/find.c:671
+#: src/boxes.c:834 src/find.c:716 src/find.c:957
msgid "Stopped"
msgstr "Stopp�"
-#: src/boxes.c:891
+#: src/boxes.c:895
msgid "&Stop"
msgstr "&Stopper"
-#: src/boxes.c:892
+#: src/boxes.c:896
msgid "&Resume"
msgstr "&Reprendre"
-#: src/boxes.c:893
+#: src/boxes.c:897
msgid "&Kill"
msgstr "&Kill"
-#: src/boxes.c:932
+#: src/boxes.c:936
msgid "Background Jobs"
msgstr "T�ches de fond"
@@ -1977,10 +2819,6 @@
msgid " Permission "
msgstr " Permission "
-#: src/chmod.c:164 src/chown.c:130
-msgid " File "
-msgstr " Fichier "
-
#: src/chmod.c:169
msgid "Use SPACE to change"
msgstr "Utilisez ESPACE pour changer"
@@ -2203,7 +3041,7 @@
msgid " Link "
msgstr " Lien "
-#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1621
+#: src/cmd.c:1032 src/cmd.c:1171 src/file.c:1685
msgid " to:"
msgstr " vers:"
@@ -2217,84 +3055,86 @@
msgid " symlink: %s "
msgstr " lien symbolique: %s "
-#: src/cmd.c:1102
-msgid " Symlink "
-msgstr " Lien Symbolique "
-
-#: src/cmd.c:1102
-msgid " points to:"
-msgstr " pointant vers:"
+#: src/cmd.c:1130
+#, c-format
+msgid " Symlink `%s' points to: "
+msgstr " Le lien symbolique `%s' pointe vers: "
-#: src/cmd.c:1107
+#: src/cmd.c:1135
msgid " Edit symlink "
msgstr " Editer le lien symbolique "
-#: src/cmd.c:1113
+#: src/cmd.c:1140
+#, fuzzy, c-format
+msgid " edit symlink, unable to remove %s: %s "
+msgstr " editer le lien symbolique: %s "
+
+#: src/cmd.c:1144
#, c-format
msgid " edit symlink: %s "
msgstr " editer le lien symbolique: %s "
-#: src/cmd.c:1137
+#: src/cmd.c:1171
msgid " Link symbolically "
msgstr " Lier symboliquement "
-#: src/cmd.c:1138
+#: src/cmd.c:1172
msgid " Relative symlink "
msgstr " Lien symbolique relatif "
-#: src/cmd.c:1149
+#: src/cmd.c:1183
#, c-format
msgid " relative symlink: %s "
msgstr " lien symbolique relatif: %s "
-#: src/cmd.c:1252
+#: src/cmd.c:1286
msgid " Enter machine name (F1 for details): "
msgstr " Entrez le nom de la machine (F1 pour les d�tails): "
-#: src/cmd.c:1276
+#: src/cmd.c:1310
#, c-format
msgid " Could not chdir to %s "
msgstr " Impossible d'aller dans %s "
-#: src/cmd.c:1283
+#: src/cmd.c:1317
msgid " Link to a remote machine "
msgstr " Lien vers une machine distante "
-#: src/cmd.c:1289
+#: src/cmd.c:1323
msgid " FTP to machine "
msgstr " FTP vers machine "
-#: src/cmd.c:1299
+#: src/cmd.c:1333
msgid " Socket source routing setup "
msgstr ""
-#: src/cmd.c:1300
+#: src/cmd.c:1334
msgid " Enter host name to use as a source routing hop: "
msgstr ""
-#: src/cmd.c:1307
+#: src/cmd.c:1341
msgid " Host name "
msgstr " Nom de l'Hote "
-#: src/cmd.c:1307
+#: src/cmd.c:1341
msgid " Error while looking up IP address "
msgstr " Erreur lors de la recherche de l'adresse IP "
-#: src/cmd.c:1318
+#: src/cmd.c:1352
msgid " Undelete files on an ext2 file system "
msgstr ""
-#: src/cmd.c:1319
+#: src/cmd.c:1353
msgid ""
" Enter device (without /dev/) to undelete\n"
" files on: (F1 for details)"
msgstr ""
-#: src/cmd.c:1369
+#: src/cmd.c:1403
msgid " Setup saved to ~/"
msgstr " Configuration sauv�e dans ~/"
-#: src/cmd.c:1374
+#: src/cmd.c:1408
msgid " Setup "
msgstr " Configuration "
@@ -2328,69 +3168,69 @@
"\n"
"\n"
-#: src/dir.c:53
+#: src/dir.c:61
msgid "&Unsorted"
msgstr "Non tri�"
-#: src/dir.c:54
+#: src/dir.c:62
msgid "&Name"
msgstr "&Nom"
-#: src/dir.c:55
+#: src/dir.c:63
msgid "&Extension"
msgstr "&Extension"
-#: src/dir.c:56
+#: src/dir.c:64
msgid "&Modify time"
msgstr "date de &Modification"
-#: src/dir.c:57
+#: src/dir.c:65
msgid "&Access time"
msgstr "date d'&Acc�s"
-#: src/dir.c:58
+#: src/dir.c:66
msgid "&Change time"
msgstr "date de &Changement"
-#: src/dir.c:59
+#: src/dir.c:67
msgid "&Size"
msgstr "Taille"
-#: src/dir.c:60
+#: src/dir.c:68
msgid "&Inode"
msgstr "&I-noeud"
#. New sort orders
-#: src/dir.c:63
+#: src/dir.c:71
msgid "&Type"
msgstr "&Type"
-#: src/dir.c:64
+#: src/dir.c:72
msgid "&Links"
msgstr "&Liens"
-#: src/dir.c:65
+#: src/dir.c:73
msgid "N&GID"
msgstr "N&GID"
-#: src/dir.c:66
+#: src/dir.c:74
msgid "N&UID"
msgstr "N&UID"
-#: src/dir.c:67
+#: src/dir.c:75
msgid "&Owner"
msgstr "pr&Opri�taire"
-#: src/dir.c:68
+#: src/dir.c:76
msgid "&Group"
msgstr "&Groupe"
-#: src/dir.c:375
+#: src/dir.c:386
#, c-format
msgid "File exists but can not be stat-ed: %s %s"
msgstr ""
-#: src/dir.c:633
+#: src/dir.c:662
msgid "Unknown"
msgstr "Inconnu"
@@ -2407,42 +3247,42 @@
msgid " Parameter "
msgstr " Param�tre "
-#: src/ext.c:294
+#: src/ext.c:301
msgid " Can't execute commands on a Virtual File System directory "
msgstr ""
" Impossible d'ex�cuter une commande sur un r�pertoire du Syst�me de Fichiers "
"Virtuel"
-#: src/ext.c:391
+#: src/ext.c:398
msgid " file error"
msgstr " erreur de fichier"
-#: src/ext.c:392
+#: src/ext.c:399
msgid "Format of the "
msgstr "Format du "
-#: src/ext.c:410
+#: src/ext.c:417
msgid " file error "
msgstr " erreur de fichier "
-#: src/ext.c:411
+#: src/ext.c:418
msgid "Format of the ~/"
msgstr "Format du ~/"
-#: src/ext.c:411
+#: src/ext.c:418
msgid ""
" file has changed\n"
"with version 3.0. You may want either to\n"
"copy it from "
msgstr ""
-#: src/ext.c:413
+#: src/ext.c:420
msgid ""
"mc.ext or use that\n"
"file as an example of how to write it.\n"
msgstr ""
-#: src/ext.c:415
+#: src/ext.c:422
msgid "mc.ext will be used for this moment."
msgstr "mc.ext sera utilis� pour l'instant."
@@ -2495,7 +3335,7 @@
" Impossible de cr��r le lien symbolique cible \"%s\" \n"
" %s "
-#: src/file.c:510
+#: src/file.c:509
#, c-format
msgid ""
" Cannot overwrite directory \"%s\" \n"
@@ -2504,7 +3344,7 @@
" Impossible d'�craser le r�pertoire \"%s\" \n"
" %s "
-#: src/file.c:519
+#: src/file.c:518
#, c-format
msgid ""
" Cannot stat source file \"%s\" \n"
@@ -2513,12 +3353,12 @@
" Impossible d'ouvrir le fichier source \"%s\" \n"
" %s "
-#: src/file.c:532
+#: src/file.c:531
#, c-format
msgid " `%s' and `%s' are the same file. "
msgstr " Les fichiers `%s' et `%s' sont identiques. "
-#: src/file.c:565
+#: src/file.c:574
#, c-format
msgid ""
" Cannot create special file \"%s\" \n"
@@ -2527,7 +3367,7 @@
" Impossible d'ouvrir le fichier sp�cial \"%s\" \n"
" %s "
-#: src/file.c:574 src/file.c:794
+#: src/file.c:583 src/file.c:812
#, c-format
msgid ""
" Cannot chown target file \"%s\" \n"
@@ -2536,7 +3376,7 @@
" Impossible d'ex�cuter chown sur le fichier cible \"%s\" \n"
" %s "
-#: src/file.c:583 src/file.c:809
+#: src/file.c:592 src/file.c:831
#, c-format
msgid ""
" Cannot chmod target file \"%s\" \n"
@@ -2545,7 +3385,7 @@
" Impossible d'ex�cuter chmod sur le fichier cible \"%s\" \n"
" %s "
-#: src/file.c:596
+#: src/file.c:609
#, c-format
msgid ""
" Cannot open source file \"%s\" \n"
@@ -2554,11 +3394,11 @@
" Impossible d'ouvrir le fichier source \"%s\" \n"
" %s "
-#: src/file.c:606
+#: src/file.c:619
msgid " Reget failed, about to overwrite file "
msgstr ""
-#: src/file.c:612
+#: src/file.c:625
#, c-format
msgid ""
" Cannot fstat source file \"%s\" \n"
@@ -2567,7 +3407,7 @@
" Impossible d'ex�cuter fstat sur le fichier source \"%s\" \n"
" %s "
-#: src/file.c:633
+#: src/file.c:651
#, c-format
msgid ""
" Cannot create target file \"%s\" \n"
@@ -2576,7 +3416,7 @@
" Impossible de cr��r le fichier cible \"%s\" \n"
" %s "
-#: src/file.c:647
+#: src/file.c:665
#, c-format
msgid ""
" Cannot fstat target file \"%s\" \n"
@@ -2585,7 +3425,7 @@
" Impossible d'ex�cuter fstat sur le fichier cible \"%s\" \n"
" %s "
-#: src/file.c:678
+#: src/file.c:696
#, c-format
msgid ""
" Cannot read source file \"%s\" \n"
@@ -2594,7 +3434,7 @@
" Impossible de lire le fichier source \"%s\" \n"
" %s "
-#: src/file.c:708
+#: src/file.c:726
#, c-format
msgid ""
" Cannot write target file \"%s\" \n"
@@ -2603,11 +3443,11 @@
" Impossible d'�crire le fichier cible \"%s\" \n"
" %s "
-#: src/file.c:727
+#: src/file.c:745
msgid "(stalled)"
msgstr "(ca rame � donf)"
-#: src/file.c:765
+#: src/file.c:783
#, c-format
msgid ""
" Cannot close source file \"%s\" \n"
@@ -2616,7 +3456,7 @@
" Impossible de fermer le fichier source \"%s\" \n"
" %s "
-#: src/file.c:774
+#: src/file.c:792
#, c-format
msgid ""
" Cannot close target file \"%s\" \n"
@@ -2625,19 +3465,19 @@
" Impossible de fermer le fichier cible \"%s\" \n"
" %s "
-#: src/file.c:784
+#: src/file.c:802
msgid "Incomplete file was retrieved. Keep it?"
msgstr ""
-#: src/file.c:785
+#: src/file.c:803
msgid "&Delete"
msgstr "&Effacer"
-#: src/file.c:785 src/hotlist.c:1443
+#: src/file.c:803 src/hotlist.c:1443
msgid "&Keep"
msgstr ""
-#: src/file.c:854
+#: src/file.c:876
#, c-format
msgid ""
" Cannot stat source directory \"%s\" \n"
@@ -2646,7 +3486,7 @@
" Impossible de lire le r�pertoire source \"%s\" \n"
" %s "
-#: src/file.c:877
+#: src/file.c:899
#, c-format
msgid ""
" Source directory \"%s\" is not a directory \n"
@@ -2654,7 +3494,7 @@
msgstr " Le r�pertoire source \"%s\" n'en est pas un %s "
#. we found a cyclic symbolic link
-#: src/file.c:885
+#: src/file.c:907
#, c-format
msgid ""
" Cannot copy cyclic symbolic link \n"
@@ -2663,7 +3503,7 @@
" Impossible de copier un lien symbolique cyclique \n"
" `%s' "
-#: src/file.c:938
+#: src/file.c:964
#, c-format
msgid ""
" Cannot create target directory \"%s\" \n"
@@ -2672,7 +3512,7 @@
" Impossible de cr��r le r�pertoire cible \"%s\" \n"
" %s "
-#: src/file.c:956
+#: src/file.c:987
#, c-format
msgid ""
" Cannot chown target directory \"%s\" \n"
@@ -2682,7 +3522,7 @@
" %s "
#. Source doesn't exist
-#: src/file.c:1066
+#: src/file.c:1100
#, c-format
msgid ""
" Cannot stat file \"%s\" \n"
@@ -2691,17 +3531,17 @@
" Impossible d'ouvrir \"%s\" \n"
" %s "
-#: src/file.c:1088
+#: src/file.c:1122
#, c-format
msgid " `%s' and `%s' are the same file "
msgstr " `%s' et `%s' sont le m�me fichier "
-#: src/file.c:1095
+#: src/file.c:1129
#, c-format
msgid " Cannot overwrite directory `%s' "
msgstr " Impossible d'�craser le r�pertoire `%s' "
-#: src/file.c:1128
+#: src/file.c:1172
#, c-format
msgid ""
" Cannot move file \"%s\" to \"%s\" \n"
@@ -2710,7 +3550,7 @@
" Impossible de d�placer le fichier \"%s\" vers \"%s\" \n"
" %s "
-#: src/file.c:1148
+#: src/file.c:1192
#, c-format
msgid ""
" Cannot remove file \"%s\" \n"
@@ -2719,17 +3559,17 @@
" Impossible de supprimer le fichier \"%s\" \n"
" %s "
-#: src/file.c:1198
+#: src/file.c:1246
#, c-format
msgid " Cannot overwrite directory \"%s\" %s "
msgstr " Impossible d'�craser le r�pertoire \"%s\" %s "
-#: src/file.c:1200
+#: src/file.c:1248
#, c-format
msgid " Cannot overwrite file \"%s\" %s "
msgstr " Impossible d'�craser le fichier \"%s\" %s "
-#: src/file.c:1223
+#: src/file.c:1275
#, c-format
msgid ""
" Cannot move directory \"%s\" to \"%s\" \n"
@@ -2738,7 +3578,7 @@
" Impossible de d�placer le r�pertoire \"%s\" dans \"%s\" \n"
" %s "
-#: src/file.c:1286
+#: src/file.c:1338
#, c-format
msgid ""
" Cannot delete file \"%s\" \n"
@@ -2747,7 +3587,7 @@
" Impossible de supprimer \"%s\" \n"
" %s "
-#: src/file.c:1344 src/file.c:1411 src/file.c:1440
+#: src/file.c:1399 src/file.c:1469 src/file.c:1501
#, c-format
msgid ""
" Cannot remove directory \"%s\" \n"
@@ -2756,7 +3596,7 @@
" Impossible de supprimer le r�pertoire \"%s\" \n"
" %s "
-#: src/file.c:1476
+#: src/file.c:1540
msgid " Internal error: get_file \n"
msgstr " Erreur interne: get_file\n"
@@ -2769,344 +3609,360 @@
#. * (I don't use spaces around the words, because someday they could be
#. * dropped, when widgets get smarter)
#.
-#: src/file.c:1597
+#: src/file.c:1661
msgid "1Copy"
msgstr "1Copier"
-#: src/file.c:1597
+#: src/file.c:1661
msgid "1Move"
msgstr "1D�placer"
-#: src/file.c:1597
+#: src/file.c:1661
msgid "1Delete"
msgstr "1Effacer"
-#: src/file.c:1612
+#: src/file.c:1676
#, c-format
msgid "%o %f \"%s\"%m"
msgstr ""
-#: src/file.c:1613
+#: src/file.c:1677
#, c-format
msgid "%o %d %f%m"
msgstr ""
-#: src/file.c:1615
+#: src/file.c:1679
#, c-format
msgid "%o %f \"%s\"%e"
msgstr ""
-#: src/file.c:1616
+#: src/file.c:1680
#, c-format
msgid "%o %d %f%e"
msgstr ""
-#: src/file.c:1620
+#: src/file.c:1684
msgid "file"
msgstr "fichier"
-#: src/file.c:1620
+#: src/file.c:1684
msgid "files"
msgstr "fichiers"
-#: src/file.c:1620
+#: src/file.c:1684
msgid "directory"
msgstr "r�pertoire"
-#: src/file.c:1620
+#: src/file.c:1684
msgid "directories"
msgstr "r�pertoires"
-#: src/file.c:1621
+#: src/file.c:1685
msgid "files/directories"
msgstr "fichiers/r�pertoires"
-#: src/file.c:1621
+#: src/file.c:1685
msgid " with source mask:"
msgstr ""
-#: src/file.c:1769
+#: src/file.c:1837
msgid " Can't operate on \"..\"! "
msgstr " Impossible d'op�rer sur \"..\"! "
-#: src/file.c:1788
+#: src/file.c:1856
msgid "Yes"
msgstr "Oui"
-#: src/file.c:1788
+#: src/file.c:1856
msgid "No"
msgstr "Non"
-#: src/file.c:1841
+#: src/file.c:1909
msgid " Sorry, I could not put the job in background "
msgstr " D�sol�, je ne peux pas passer la t�che en t�che de fond "
-#: src/file.c:1924 src/file.c:2029
+#: src/file.c:1997 src/file.c:2081
msgid " Internal failure "
msgstr " Erreur interne "
-#: src/file.c:1924 src/file.c:2029
+#: src/file.c:1997 src/file.c:2081
msgid " Unknown file operation "
msgstr " Op�ration sur fichier inconnue "
-#: src/file.c:1943
+#: src/file.c:2012
#, c-format
msgid ""
" Destination \"%s\" must be a directory \n"
" %s "
msgstr " La destination \"%s\" doit �tre un r�pertoire %s "
-#: src/file.c:2114 src/filegui.c:263
-msgid "&Skip"
-msgstr "&Suivant"
-
-#: src/file.c:2114
+#: src/file.c:2174
msgid "&Retry"
msgstr "&Re-essayer"
-#: src/file.c:2114 src/file.c:2173 src/filegui.c:260 src/filegui.c:562
+#: src/file.c:2174 src/file.c:2235 src/filegui.c:263 src/filegui.c:591
msgid "&Abort"
msgstr "&Interrompre"
-#: src/file.c:2164
+#: src/file.c:2226
msgid ""
"\n"
" Directory not empty. \n"
" Delete it recursively? "
msgstr ""
-#: src/file.c:2165
+#: src/file.c:2227
msgid ""
"\n"
" Background process: Directory not empty \n"
" Delete it recursively? "
msgstr ""
-#: src/file.c:2166
-#, fuzzy
-msgid " Delete: "
-msgstr " Effacer "
-
-#: src/file.c:2172
+#: src/file.c:2234
msgid "a&ll"
msgstr ""
-#: src/file.c:2172 src/filegui.c:565
+#: src/file.c:2234 src/filegui.c:594
msgid "non&E"
msgstr ""
-#: src/file.c:2182
+#: src/file.c:2244
msgid " Type 'yes' if you REALLY want to delete "
msgstr " Tapez 'yes' si vous voulez vraiment effacer "
-#: src/file.c:2184
+#: src/file.c:2246
msgid "all the directories "
msgstr "tous les r�pertoires "
-#: src/file.c:2186
+#: src/file.c:2248
msgid " Recursive Delete "
msgstr " D�l�tion R�cursive "
-#: src/file.c:2187
+#: src/file.c:2249
msgid " Background process: Recursive Delete "
msgstr " T�che de fond: D�l�tion R�cursive "
-#: src/filegui.c:404
+#: src/filegui.c:423
msgid "File"
msgstr "Fichier"
-#: src/filegui.c:425
+#: src/filegui.c:446
msgid "Count"
msgstr "Compter"
-#: src/filegui.c:444
+#: src/filegui.c:467
msgid "Bytes"
msgstr "Octets"
-#: src/filegui.c:479
+#: src/filegui.c:504
msgid "Source"
msgstr "Source"
-#: src/filegui.c:500
+#: src/filegui.c:527
msgid "Target"
msgstr "Cible"
-#: src/filegui.c:520
+#: src/filegui.c:549
msgid "Deleting"
msgstr "Effacement"
-#: src/filegui.c:560
+#: src/filegui.c:589
#, c-format
msgid "Target file \"%s\" already exists!"
msgstr "Le fichier cible \"%s\" existe d�j�!"
-#: src/filegui.c:563
+#: src/filegui.c:592
msgid "if &Size differs"
msgstr "&Si la taille diff�re"
-#: src/filegui.c:566
+#: src/filegui.c:595
msgid "&Update"
msgstr ""
-#: src/filegui.c:567
-msgid "al&L"
-msgstr ""
-
-#: src/filegui.c:568
+#: src/filegui.c:597
msgid "Overwrite all targets?"
msgstr ""
-#: src/filegui.c:570
+#: src/filegui.c:599
msgid "&Reget"
msgstr ""
-#: src/filegui.c:571
+#: src/filegui.c:600
msgid "ap&Pend"
msgstr ""
-#: src/filegui.c:574
+#: src/filegui.c:603
msgid "Overwrite this target?"
msgstr ""
-#: src/filegui.c:576
+#: src/filegui.c:605
#, c-format
msgid "Target date: %s, size %d"
msgstr ""
-#: src/filegui.c:578
+#: src/filegui.c:607
#, c-format
msgid "Source date: %s, size %d"
msgstr ""
-#: src/filegui.c:662
+#: src/filegui.c:691
msgid " File exists "
msgstr " Le fichier existe "
-#: src/filegui.c:663
+#: src/filegui.c:692
msgid " Background process: File exists "
msgstr ""
#. follow symlinks and preserve Attributes must be the first
-#: src/filegui.c:773
+#: src/filegui.c:804
msgid "preserve &Attributes"
msgstr "preserver les &Attributs"
#. &op_preserve
-#: src/filegui.c:775
+#: src/filegui.c:806
msgid "follow &Links"
msgstr "suivre les &Liens"
#. &file_mask_op_follow_links
-#: src/filegui.c:777
+#: src/filegui.c:808
msgid "to:"
msgstr "vers:"
-#: src/filegui.c:778
+#: src/filegui.c:809
msgid "&Using shell patterns"
msgstr "&Utiliser les \"shell patterns\""
-#: src/filegui.c:799
+#: src/filegui.c:830
msgid "&Background"
msgstr "&Fond"
-#: src/filegui.c:808
+#: src/filegui.c:839
msgid "&Stable Symlinks"
msgstr "Lien Symboliques &Stables"
#. &file_mask_stable_symlinks
-#: src/filegui.c:810
+#: src/filegui.c:841
msgid "&Dive into subdir if exists"
msgstr "&Plonger dans le sous-r�pertoire s'il existe"
-#: src/filegui.c:969
+#: src/filegui.c:1000
#, c-format
msgid ""
"Invalid source pattern `%s' \n"
" %s "
msgstr ""
-#: src/find.c:115
+#: src/find.c:130
msgid "&Suspend"
msgstr "&Suspendre"
-#: src/find.c:116
+#: src/find.c:131
msgid "Con&tinue"
msgstr "Con&tinuer"
-#: src/find.c:117
+#: src/find.c:132
msgid "&Chdir"
msgstr "&Chdir"
-#: src/find.c:118
+#: src/find.c:133
msgid "&Again"
msgstr "&Encore"
-#: src/find.c:119
+#: src/find.c:134
msgid "&Quit"
msgstr "&Quitter"
-#: src/find.c:120 src/panelize.c:89
+#: src/find.c:135 src/panelize.c:89
msgid "Pane&lize"
msgstr ""
-#: src/find.c:121
+#: src/find.c:136
msgid "&View - F3"
msgstr "&Voir - F3"
-#: src/find.c:122
+#: src/find.c:137
msgid "&Edit - F4"
msgstr "&Editer - F4"
-#: src/find.c:150
+#: src/find.c:170
msgid "Start at:"
msgstr "Commencer �:"
-#: src/find.c:150
+#: src/find.c:170
msgid "Filename:"
msgstr "Nom du Fichier:"
-#: src/find.c:150
+#: src/find.c:170
msgid "Content: "
msgstr "Contenu: "
-#: src/find.c:151 src/main.c:1199 src/main.c:1220
+#: src/find.c:171 src/main.c:1222 src/main.c:1243
msgid "&Tree"
msgstr "&Arbre"
-#: src/find.c:203
+#: src/find.c:223
msgid "Find File"
msgstr "Trouver Fichier"
-#: src/find.c:430
+#: src/find.c:452
#, c-format
msgid "Grepping in %s"
msgstr "Recherche dans %s"
-#: src/find.c:468
+#: src/find.c:490
msgid " Find/read "
msgstr " Trouver/lire "
-#: src/find.c:468
+#: src/find.c:490
msgid " Problem reading from child "
msgstr ""
-#: src/find.c:515
+#: src/find.c:537
msgid "Finished"
msgstr "Termin�"
-#: src/find.c:539 src/view.c:1446
+#: src/find.c:561 src/view.c:1467
#, c-format
msgid "Searching %s"
msgstr "Recherche de %s"
-#: src/find.c:671 src/find.c:788
+#: src/find.c:714 src/find.c:754
+msgid "Suspend"
+msgstr "Suspendre"
+
+#: src/find.c:714
+msgid "Restart"
+msgstr "Re-essayer"
+
+#: src/find.c:716 src/find.c:818 src/find.c:957 src/find.c:1053
msgid "Searching"
msgstr ""
-#: src/find.c:763
+#: src/find.c:747 src/find.c:1028
msgid "Find file"
msgstr "Trouver fichier"
+#. The buttons
+#: src/find.c:752
+msgid "Change to this directory"
+msgstr "Aller dans ce r�pertoire"
+
+#: src/find.c:753
+msgid "Search again"
+msgstr "Chercher � nouveau"
+
+#: src/find.c:758
+msgid "View this file"
+msgstr "Voir ce fichier"
+
+#: src/find.c:759
+msgid "Edit this file"
+msgstr "Editer ce fichier"
+
+#: src/find.c:760
+msgid "Send the results to a Panel"
+msgstr ""
+
#: src/fixhlp.c:171
msgid "Usage: fixhlp <width> <tocname>\n"
msgstr "Usage: fixhlp <largeur> <sujet>\n"
@@ -3593,7 +4449,7 @@
msgid "key, or click with the mouse to define it. Move around with Tab."
msgstr ""
-#: src/main.c:666
+#: src/main.c:695
msgid ""
" The Commander can't change to the directory that \n"
" the subshell claims you are in. Perhaps you have \n"
@@ -3601,251 +4457,247 @@
" extra access permissions with the \"su\" command? "
msgstr ""
-#: src/main.c:741
+#: src/main.c:770
msgid "Press any key to continue..."
msgstr "Appuyez sur une touche..."
-#: src/main.c:791
+#: src/main.c:820
msgid " The shell is already running a command "
msgstr " Le shell est d�j� en train d'ex�cuter une commande "
-#: src/main.c:1196 src/main.c:1217
+#: src/main.c:1219 src/main.c:1240
msgid "&Listing mode..."
msgstr "Mode de &Listage..."
-#: src/main.c:1197 src/main.c:1218
+#: src/main.c:1220 src/main.c:1241
msgid "&Quick view C-x q"
msgstr ""
-#: src/main.c:1198 src/main.c:1219
+#: src/main.c:1221 src/main.c:1242
msgid "&Info C-x i"
msgstr "&Info C-x i"
-#: src/main.c:1201 src/main.c:1222
+#: src/main.c:1224 src/main.c:1245
msgid "&Sort order..."
msgstr "Ordre de tri..."
-#: src/main.c:1203 src/main.c:1224
+#: src/main.c:1226 src/main.c:1247
msgid "&Filter..."
msgstr "&Filtre..."
-#: src/main.c:1206 src/main.c:1227
+#: src/main.c:1229 src/main.c:1250
msgid "&Network link..."
msgstr "Lien R�seau..."
-#: src/main.c:1207 src/main.c:1228
+#: src/main.c:1230 src/main.c:1251
msgid "FT&P link..."
msgstr "Lien FT&P..."
-#: src/main.c:1211 src/main.c:1232
+#: src/main.c:1234 src/main.c:1255
msgid "&Drive... M-d"
msgstr "Lecteur... M-d"
-#: src/main.c:1213 src/main.c:1234
+#: src/main.c:1236 src/main.c:1257
msgid "&Rescan C-r"
msgstr "&Rescanner C-r"
-#: src/main.c:1238
+#: src/main.c:1261
msgid "&User menu F2"
msgstr "Menu &Utilisateur F2"
-#: src/main.c:1239
+#: src/main.c:1262
msgid "&View F3"
msgstr "&Vue F3"
-#: src/main.c:1240
+#: src/main.c:1263
msgid "Vie&w file... "
msgstr "Voi&r fichier... "
-#: src/main.c:1241
+#: src/main.c:1264
msgid "&Filtered view M-!"
msgstr "Vue &Filtr�e M-!"
-#: src/main.c:1242
+#: src/main.c:1265
msgid "&Edit F4"
msgstr "&Editer F4"
-#: src/main.c:1243
+#: src/main.c:1266
msgid "&Copy F5"
msgstr "&Copier F5"
-#: src/main.c:1244
+#: src/main.c:1267
msgid "c&Hmod C-x c"
msgstr "c&Hmod C-x c"
-#: src/main.c:1246
+#: src/main.c:1269
msgid "&Link C-x l"
msgstr "&Lien C-x l"
-#: src/main.c:1247
+#: src/main.c:1270
msgid "&SymLink C-x s"
msgstr "Lien&Symb C-x s"
-#: src/main.c:1248
+#: src/main.c:1271
msgid "edit s&Ymlink C-x C-s"
msgstr "editer liens&Ymb C-x C-s"
-#: src/main.c:1249
+#: src/main.c:1272
msgid "ch&Own C-x o"
msgstr "ch&Own C-x o"
-#: src/main.c:1250
+#: src/main.c:1273
msgid "&Advanced chown "
msgstr "chown &Avanc� "
-#: src/main.c:1252
+#: src/main.c:1275
msgid "&Rename/Move F6"
msgstr "&Renommer/D�placer F6"
-#: src/main.c:1253
+#: src/main.c:1276
msgid "&Mkdir F7"
msgstr "&Mkdir F7"
-#: src/main.c:1254
+#: src/main.c:1277
msgid "&Delete F8"
msgstr "&Supprimer F8"
-#: src/main.c:1255
+#: src/main.c:1278
msgid "&Quick cd M-c"
msgstr ""
-#: src/main.c:1257
+#: src/main.c:1280
msgid "select &Group M-+"
msgstr "s�lectionner &Groupe M-+"
-#: src/main.c:1258
+#: src/main.c:1281
msgid "u&Nselect group M-\\"
msgstr "d�s�lectio&Nner groupe M-\\"
-#: src/main.c:1259
+#: src/main.c:1282
msgid "reverse selec&Tion M-*"
msgstr "s�lec&Tion invers�e M-*"
-#: src/main.c:1261
+#: src/main.c:1284
msgid "e&Xit F10"
msgstr "Q&uitter F10"
-#: src/main.c:1271
+#: src/main.c:1294
msgid "&Directory tree"
msgstr "&Arborescence des r�pertoires"
-#: src/main.c:1273
+#: src/main.c:1296
msgid "&Find file M-?"
msgstr "Rechercher &Fichier M-?"
-#: src/main.c:1274
+#: src/main.c:1297
msgid "s&Wap panels C-u"
msgstr "&Echanger panels C-u"
-#: src/main.c:1275
+#: src/main.c:1298
msgid "switch &Panels on/off C-o"
msgstr ""
-#: src/main.c:1276
+#: src/main.c:1299
msgid "&Compare directories C-x d"
msgstr "&Comparer r�pertoires C-x d"
-#: src/main.c:1277
+#: src/main.c:1300
msgid "e&Xternal panelize C-x !"
msgstr ""
-#: src/main.c:1278
+#: src/main.c:1301
msgid "show directory s&Izes"
msgstr "aff&Icher la taille des r�pertoires"
-#: src/main.c:1280
+#: src/main.c:1303
msgid "command &History"
msgstr "&Historique des commandes "
-#: src/main.c:1281
+#: src/main.c:1304
msgid "di&Rectory hotlist C-\\"
msgstr "&R�pertoire hotlist C-\\"
-#: src/main.c:1283
+#: src/main.c:1306
msgid "&Active VFS list C-x a"
msgstr ""
-#: src/main.c:1286
+#: src/main.c:1309
msgid "&Background jobs C-x j"
msgstr "Taches de fond C-x j"
-#: src/main.c:1290
+#: src/main.c:1313
msgid "&Undelete files (ext2fs only)"
msgstr ""
-#: src/main.c:1293
+#: src/main.c:1316
msgid "&Listing format edit"
msgstr ""
-#: src/main.c:1295
+#: src/main.c:1318
msgid "&Extension file edit"
msgstr ""
-#: src/main.c:1296
+#: src/main.c:1319
msgid "&Menu file edit"
msgstr ""
-#: src/main.c:1301
+#: src/main.c:1324
msgid "&Configuration..."
msgstr "&Configuration..."
-#: src/main.c:1302
-msgid "&Layout..."
-msgstr "Pr�sentation..."
-
-#: src/main.c:1303
+#: src/main.c:1326
msgid "c&Onfirmation..."
msgstr "c&Onfirmation..."
-#: src/main.c:1304
+#: src/main.c:1327
msgid "&Display bits..."
msgstr ""
-#: src/main.c:1306
+#: src/main.c:1329
msgid "learn &Keys..."
msgstr ""
-#: src/main.c:1309
+#: src/main.c:1332
msgid "&Virtual FS..."
msgstr "SF &Virtuel..."
-#: src/main.c:1312
+#: src/main.c:1335
msgid "&Save setup"
msgstr "enregi&Strer la configuration"
-#: src/main.c:1328 src/main.c:1330
+#: src/main.c:1351 src/main.c:1353
msgid " &Left "
msgstr " &Gauche "
-#: src/main.c:1330
+#: src/main.c:1353
msgid " &Above "
msgstr " &Au dessus "
-#: src/main.c:1333
+#: src/main.c:1356
msgid " &File "
msgstr " &Fichier "
-#: src/main.c:1334
+#: src/main.c:1357
msgid " &Command "
msgstr " &Commande "
-#: src/main.c:1335
+#: src/main.c:1358
msgid " &Options "
msgstr " &Options "
-#: src/main.c:1337 src/main.c:1339
+#: src/main.c:1360 src/main.c:1362
msgid " &Right "
msgstr " &Droite "
-#: src/main.c:1339
+#: src/main.c:1362
msgid " &Below "
msgstr " &En dessous "
-#: src/main.c:1394
+#: src/main.c:1417
msgid " Information "
msgstr " Information "
-#: src/main.c:1395
+#: src/main.c:1418
msgid ""
" Using the fast reload option may not reflect the exact \n"
" directory contents. In this cases you'll need to do a \n"
@@ -3853,64 +4705,156 @@
" the details. "
msgstr ""
-#: src/main.c:1669 src/screen.c:2285 src/screen.c:2315
+#: src/main.c:1692 src/screen.c:2305 src/screen.c:2335
msgid "Menu"
msgstr "Menu"
-#: src/main.c:1874
+#: src/main.c:1897
msgid "Thank you for using GNU Midnight Commander"
msgstr "Merci d'utiliser GNU Midnight Commander"
-#: src/main.c:2227
+#: src/main.c:2256
#, c-format
msgid "with mouse support on xterm%s.\n"
msgstr "avec support de la souris pour xterm%s.\n"
-#: src/main.c:2228
+#: src/main.c:2257
msgid " and the Linux console"
msgstr " et la console Linux"
-#: src/main.c:2323
+#: src/main.c:2352
msgid "The TERM environment variable is unset!\n"
msgstr "La variable d'environnement TERM n'est pas positionn�e!\n"
-#: src/main.c:2528
+#: src/main.c:2559
#, c-format
msgid "Library directory for the Midnight Commander: %s\n"
msgstr "R�pertoire biblioth�que pour Midnight Commander: %s\n"
-#: src/main.c:2539
+#: src/main.c:2570
msgid ""
"Option -m is obsolete. Please look at Display Bits... in the Option's menu\n"
msgstr ""
+#: src/main.c:2649
+msgid "Use to debug the background code"
+msgstr ""
+
+#: src/main.c:2655
+msgid "Request to run in color mode"
+msgstr ""
+
+#: src/main.c:2657
+msgid "Specifies a color configuration"
+msgstr ""
+
+#: src/main.c:2662
+msgid "Edits one file"
+msgstr "Edite un fichier"
+
#: src/main.c:2666
+msgid "Displays this help message"
+msgstr "Affiche ce message d'aide"
+
+#: src/main.c:2669
+msgid "Displays a help screen on how to change the color scheme"
+msgstr ""
+
+#: src/main.c:2672
+msgid "Log ftp dialog to specified file"
+msgstr ""
+
+#: src/main.c:2679
+msgid "Obsolete"
+msgstr "Obsolete"
+
+#: src/main.c:2681
+msgid "Requests to run in black and white"
+msgstr ""
+
+#: src/main.c:2683
+msgid "Disable mouse support in text version"
+msgstr "D�sactive le support de la souris pour la version texte"
+
+#: src/main.c:2686
+msgid "Disables subshell support"
+msgstr ""
+
+#: src/main.c:2690
+msgid "Prints working directory at program exit"
+msgstr ""
+
+#: src/main.c:2692
+msgid "Resets soft keys on HP terminals"
+msgstr ""
+
+#: src/main.c:2694
+msgid "To run on slow terminals"
+msgstr ""
+
+#: src/main.c:2697
+msgid "Use stickchars to draw"
+msgstr ""
+
+#: src/main.c:2701
+msgid "Enables subshell support (default)"
+msgstr ""
+
+#: src/main.c:2706
+msgid "Tries to use termcap instead of terminfo"
+msgstr ""
+
+#: src/main.c:2710
+msgid "Displays the current version"
+msgstr ""
+
+#: src/main.c:2712
+msgid "Launches the file viewer on a file"
+msgstr ""
+
+#: src/main.c:2714
+msgid "Forces xterm features"
+msgstr ""
+
+#: src/main.c:2716
msgid "Geometry for the window"
msgstr "G�om�trie de la fen�tre"
-#: src/main.c:2666
+#: src/main.c:2716
msgid "GEOMETRY"
msgstr "GEOMETRIE"
-#: src/main.c:2667
+#: src/main.c:2717
msgid "No windows opened at startup"
msgstr "Pas de fen�tre ouverte au lancement"
-#: src/main.c:2668
+#: src/main.c:2718
msgid "Force activation even if a server is already running"
msgstr ""
-#: src/main.c:2940
+#: src/main.c:2720
+msgid "Displays the directory that holds the .links startup files"
+msgstr ""
+
+#: src/main.c:2996
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:3014
+#: src/main.c:3072
+msgid ""
+"You are running the GNOME Midnight Commander as root. \n"
+"\n"
+"You will not be protected from severly damaging your system\n"
+"if you continue."
+msgstr ""
+
+#: src/main.c:3087
msgid " Notice "
msgstr " Note "
-#: src/main.c:3015
+#: src/main.c:3088
msgid ""
" The Midnight Commander configuration files \n"
" are now stored in the ~/.mc directory, the \n"
@@ -4034,7 +4978,7 @@
msgid " External panelize "
msgstr ""
-#: src/panelize.c:194 src/panelize.c:462
+#: src/panelize.c:194 src/panelize.c:458
msgid "External panelize"
msgstr ""
@@ -4066,7 +5010,7 @@
msgid "Cannot invoke command."
msgstr "Impossible d'invoquer la commande."
-#: src/panelize.c:462
+#: src/panelize.c:458
msgid "Pipe close failed"
msgstr "Echec de fermeture de tube"
@@ -4090,10 +5034,6 @@
msgid "CTime"
msgstr "CTime"
-#: src/screen.c:432
-msgid "Permission"
-msgstr "Permission"
-
#: src/screen.c:433
msgid "Perm"
msgstr "Perm"
@@ -4119,27 +5059,27 @@
msgid " %s bytes in %d file%s"
msgstr " %s octets dans %d fichier%s"
-#: src/screen.c:1289
+#: src/screen.c:1306
msgid "Unknow tag on display format: "
msgstr ""
-#: src/screen.c:2049
+#: src/screen.c:2068
msgid " Do you really want to execute? "
msgstr " Voulez-vous vraiment �x�cuter? "
-#: src/screen.c:2064
+#: src/screen.c:2083
msgid " No action taken "
msgstr " Aucune action effect�e "
-#: src/screen.c:2289 src/screen.c:2319 src/tree.c:1026
+#: src/screen.c:2309 src/screen.c:2339 src/tree.c:1026
msgid "RenMov"
msgstr ""
-#: src/screen.c:2290 src/screen.c:2320 src/tree.c:1030
+#: src/screen.c:2310 src/screen.c:2340 src/tree.c:1030
msgid "Mkdir"
msgstr "Mkdir"
-#: src/screen.c:2306
+#: src/screen.c:2326
#, c-format
msgid ""
" Can't chdir to %s \n"
@@ -4153,19 +5093,19 @@
msgid "Couldn't open named pipe %s\n"
msgstr "Impossible d'ouvrir le fichier nomm� %s\n"
-#: src/subshell.c:700
+#: src/subshell.c:705
msgid " The shell is still active. Quit anyway? "
msgstr " Le shell est encore actif. Quitter quand m�me? "
-#: src/subshell.c:726
+#: src/subshell.c:731
msgid " There are stopped jobs."
msgstr " Il y a des travaux suspendus."
-#: src/subshell.c:727
+#: src/subshell.c:732
msgid " Quit anyway? "
msgstr " Quitter quand m�me? "
-#: src/subshell.c:780
+#: src/subshell.c:785
#, c-format
msgid "Warning: Couldn't change to %s.\n"
msgstr ""
@@ -4224,10 +5164,6 @@
" Impossible d'aller dans le r�pertoire \"%s\" \n"
" %s "
-#: src/tree.c:1020
-msgid "Rescan"
-msgstr "Rafraichir"
-
#: src/tree.c:1022
msgid "Forget"
msgstr "Oublier"
@@ -4236,7 +5172,7 @@
msgid "Rmdir"
msgstr "Rmdir"
-#: src/treestore.c:354
+#: src/treestore.c:356
#, c-format
msgid ""
"Can't write to the %s file:\n"
@@ -4287,15 +5223,15 @@
msgid " User menu "
msgstr " Menu utilisateur "
-#: src/util.c:220
+#: src/util.c:228
msgid "name_trunc: too big"
msgstr "name_trunc: trop gros"
-#: src/utilunix.c:382
+#: src/utilunix.c:388
msgid " Pipe failed "
msgstr " Echec du tube "
-#: src/utilunix.c:386
+#: src/utilunix.c:392
msgid " Dup failed "
msgstr " Echec de la duplication "
@@ -4360,15 +5296,20 @@
msgid " [grow]"
msgstr " [augm.]"
-#: src/view.c:1536 src/view.c:1658
+#: src/view.c:1459
+#, c-format
+msgid "Searching for `%s'"
+msgstr "Recherche de `%s'"
+
+#: src/view.c:1566 src/view.c:1688
msgid " Search string not found "
msgstr " Chaine non trouv�e "
-#: src/view.c:1697
+#: src/view.c:1727
msgid " Invalid regular expression "
msgstr " Expression r�guli�re invalide "
-#: src/view.c:1827
+#: src/view.c:1850
#, c-format
msgid ""
" The current line number is %d.\n"
@@ -4377,63 +5318,59 @@
" Le num�ro de la ligne courante est %d.\n"
" Entrez le nouveau num�ro de ligne:"
-#: src/view.c:1857
+#: src/view.c:1880
msgid " Enter regexp:"
msgstr " Entrez l'expression r�guli�re:"
-#: src/view.c:1889
-msgid " Enter search string:"
-msgstr " Entrez le texte � rechercher:"
-
-#: src/view.c:1962
+#: src/view.c:1985
msgid "Ascii"
msgstr "Ascii"
-#: src/view.c:1962
+#: src/view.c:1985
msgid "Hex"
msgstr "H�xa"
-#: src/view.c:1963
+#: src/view.c:1986
msgid "Line"
msgstr "Ligne"
-#: src/view.c:1964
+#: src/view.c:1987
msgid "RxSrch"
msgstr "CherchER"
-#: src/view.c:1967
+#: src/view.c:1990
msgid "EdText"
msgstr ""
-#: src/view.c:1967
+#: src/view.c:1990
msgid "EdHex"
msgstr ""
-#: src/view.c:1969
+#: src/view.c:1992
msgid "UnWrap"
msgstr ""
-#: src/view.c:1969
+#: src/view.c:1992
msgid "Wrap"
msgstr "C�sure"
-#: src/view.c:1972
+#: src/view.c:1995
msgid "HxSrch"
msgstr "RechHx"
-#: src/view.c:1975
+#: src/view.c:1998
msgid "Raw"
msgstr ""
-#: src/view.c:1975
+#: src/view.c:1998
msgid "Parse"
msgstr "Analyser"
-#: src/view.c:1979
+#: src/view.c:2002
msgid "Unform"
msgstr ""
-#: src/view.c:1979
+#: src/view.c:2002
msgid "Format"
msgstr "Format"
@@ -4632,18 +5569,6 @@
msgid "NumLock on keypad"
msgstr "NumLock sur pav� num�rique"
-#: src/wtools.c:587 vfs/vfs.c:1757
-msgid "Password:"
-msgstr "Mot de passe:"
-
-#: src/wtools.c:587
-msgid "Password"
-msgstr "Mot de passe"
-
-#: src/wtools.c:642
-msgid "Ok"
-msgstr "Ok"
-
#: vfs/extfs.c:266
#, c-format
msgid ""
@@ -4676,15 +5601,15 @@
"Le fichier ~/.netrc n'a pas un mode correct.\n"
"Enlevez le mot de passe ou corrigez le mode."
-#: vfs/mcfs.c:153
+#: vfs/mcfs.c:154
msgid " MCFS "
msgstr " MCFS "
-#: vfs/mcfs.c:153
+#: vfs/mcfs.c:154
msgid " The server does not support this version "
msgstr " Le serveur ne supporte pas cette version "
-#: vfs/mcfs.c:170
+#: vfs/mcfs.c:171
msgid ""
" The remote server is not running on a system port \n"
" you need a password to log in, but the information may \n"
@@ -4694,27 +5619,27 @@
" Vous devez donner un mot de passe pour entrer, mais cette \n"
" information peut etre d�tourn�e sur le serveur. Continuer? \n"
-#: vfs/mcfs.c:173
+#: vfs/mcfs.c:174
msgid " Yes "
msgstr " Oui "
-#: vfs/mcfs.c:173
+#: vfs/mcfs.c:174
msgid " No "
msgstr " Non "
-#: vfs/mcfs.c:175
+#: vfs/mcfs.c:176
msgid " The remote server is running on strange port. Giving up.\n"
msgstr " Le serveur distant utilise un port �trange. J'abandonne.\n"
-#: vfs/mcfs.c:187
+#: vfs/mcfs.c:188
msgid " MCFS Password required "
msgstr " Mot de passe MCFS requis "
-#: vfs/mcfs.c:201
+#: vfs/mcfs.c:202
msgid " Invalid password "
msgstr " Mot de passe incorrect "
-#: vfs/mcfs.c:321
+#: vfs/mcfs.c:322
msgid " Too many open connections "
msgstr " Trop de connexions ouvertes "
@@ -4746,237 +5671,65 @@
"%s\n"
"ne ressemble pas � une archive tar."
-#~ msgid " Word wrap "
-#~ msgstr " C�sure automatique "
-
-#~ msgid " Enter line length, 0 for off: "
-#~ msgstr " Entrez la longueur de ligne, 0 pour d�sactiver: "
-
-#, fuzzy
-#~ msgid " About "
-#~ msgstr "_A Propos"
-
-#~ msgid "&Open/load... C-o"
-#~ msgstr "&Ouvrir/charger.. C-o"
-
-#~ msgid "&New C-n"
-#~ msgstr "&Nouveau C-n"
-
-#~ msgid "&Save F2"
-#~ msgstr "&Sauver F2"
-
-#~ msgid "save &As... F12"
-#~ msgstr "Enregistrer sous.. F12"
-
-#~ msgid "&Insert file... F15"
-#~ msgstr "&Ins�rer fichier.. F15"
-
-#~ msgid "copy to &File... C-f"
-#~ msgstr "copier vers &Fichier... C-f"
-
-#~ msgid "a&Bout... "
-#~ msgstr "A Propos... "
-
-#~ msgid "&Quit F10"
-#~ msgstr "&Quitter F10"
-
-#~ msgid "&New C-x k"
-#~ msgstr "&Nouveau C-x k"
-
-#~ msgid "copy to &File... "
-#~ msgstr "copier vers &Fichier..."
-
-#~ msgid "&Toggle Mark F3"
-#~ msgstr "&Inverser Marque F3"
-
-#~ msgid "&Mark Columns S-F3"
-#~ msgstr "&Marquer Colonnes S-F3"
-
-#~ msgid "toggle &Ins/overw Ins"
-#~ msgstr "echange &Ins�re/�crasemt"
-
-#~ msgid "&Copy F5"
-#~ msgstr "&Copier F5"
-
-#~ msgid "&Move F6"
-#~ msgstr "&D�placer F6"
-
-#~ msgid "&Delete F8"
-#~ msgstr "&Supprimer F8"
-
-#~ msgid "&Undo C-u"
-#~ msgstr "&Undo C-u"
-
-#~ msgid "&Beginning C-PgUp"
-#~ msgstr "d�&But C-PgUp"
-
-#~ msgid "&End C-PgDn"
-#~ msgstr "&End C-PgDn"
-
-#~ msgid "&Search... F7"
-#~ msgstr "Rechercher... F7"
-
-#~ msgid "search &Again F17"
-#~ msgstr "Chercher � nouve&Au F17"
-
-#~ msgid "&Replace... F4"
-#~ msgstr "&Remplacer... F4"
-
-#~ msgid "&Goto line... M-l"
-#~ msgstr "Aller � la ligne... M-l"
-
-#~ msgid "insert &Literal... C-q"
-#~ msgstr "ins�rer un &Literal... C-q"
-
-#~ msgid "&Refresh screen C-l"
-#~ msgstr "&Rafraichir l'�cran C-l"
-
-#~ msgid "&Start record macro C-r"
-#~ msgstr "Commencer � enregistrer une macro C-r"
+#~ msgid "Opens a new window"
+#~ msgstr "Ouvre une nouvelle fen�tre"
-#~ msgid "&Finish record macro... C-r"
-#~ msgstr "Terminer l'enregistrement de macro... C-r"
+#~ msgid "_New"
+#~ msgstr "_Nouveau"
-#~ msgid "&Execute macro... C-a, KEY"
-#~ msgstr "&Ex�cuter macro... C-a, TOUCHE"
+#~ msgid "_Open"
+#~ msgstr "_Ouvrir"
-#~ msgid "delete macr&O... "
-#~ msgstr "effacer macr&O... "
+#~ msgid "Opens the selected files"
+#~ msgstr "Ouvre les fichiers s�lectionn�s"
-#~ msgid "insert &Date/time "
-#~ msgstr "ins�rer &Date/heure "
+#~ msgid "Delete files from disk"
+#~ msgstr "Effacer les fichiers du disque"
-#~ msgid "format p&Aragraph M-p"
-#~ msgstr "formater p&Aragraphe M-p"
+#~ msgid "C_lose"
+#~ msgstr "_Fermer"
-#~ msgid "'ispell' s&Pell check C-p"
-#~ msgstr "correction orthographique 'is&Pell' C-p"
+#~ msgid "Close this panel"
+#~ msgstr "Fermer de panel"
-#~ msgid "sor&T... M-t"
-#~ msgstr "&Trier... M-t"
+#~ msgid "Partial View"
+#~ msgstr "Vue Partielle"
-#~ msgid "'indent' &C Formatter F19"
-#~ msgstr "Formatteur &C 'indent' F19"
+#~ msgid "Full View"
+#~ msgstr "Vue Compl�te"
-#~ msgid "&Mail... "
-#~ msgstr "&Mail... "
+#~ msgid "_Active VFS list..."
+#~ msgstr "Liste des VFS _actifs..."
-#~ msgid "&Execute macro... C-x e, KEY"
-#~ msgstr "&Ex�cuter macro... C-x e, TOUCHE"
+#~ msgid "List of active virtual file systems"
+#~ msgstr "Liste des syst�mes de fichiers virtuels actifs"
-#~ msgid "'ispell' s&Pell check M-$"
-#~ msgstr "correction orthographique 'is&Pell' M-$"
-
-#~ msgid "&General... "
-#~ msgstr "&G�n�ral... "
-
-#~ msgid "&Save mode..."
-#~ msgstr "Mode &Sauvegarde..."
-
-#~ msgid " Edit "
-#~ msgstr " Editer "
-
-#~ msgid " Sear/Repl "
-#~ msgstr " Cherch/Rempl "
-
-#~ msgid " Command "
-#~ msgstr " Commande "
-
-#~ msgid " Options "
-#~ msgstr " Options "
-
-#~ msgid "Open...\tC-o"
-#~ msgstr "Ouvrir...\tC-o"
-
-#~ msgid "New\tC-n"
-#~ msgstr "Nouveau\tC-n"
-
-#~ msgid "Save\tF2"
-#~ msgstr "Sauver\tF2"
-
-#~ msgid "Save as...\tF12"
-#~ msgstr "Enregistrer sous...\tF12"
-
-#~ msgid "Insert file...\tF15"
-#~ msgstr "Ins�rer fichier...\tF15"
-
-#~ msgid "Copy to file...\tC-f"
-#~ msgstr "Copier vers fichier...\tC-f"
-
-#~ msgid "Disk operations"
-#~ msgstr "Op�rations disque"
-
-#~ msgid "Toggle mark\tF3"
-#~ msgstr "Echange Marque\tF3"
-
-#~ msgid "Toggle mark columns\tC-b"
-#~ msgstr "Echange Marque\tC-b"
-
-#~ msgid "Toggle insert/overwrite\tIns"
-#~ msgstr "Echange ins�re/�crasement\tIns"
-
-#~ msgid "Delete block\tF8/C-Del"
-#~ msgstr "Effacer block\tF8/C-Del"
-
-#~ msgid "Copy block to clipbrd\tC-Ins"
-#~ msgstr "Copier le block dans le presse-papier\tC-Ins"
-
-#~ msgid "Cut block to clipbrd\tS-Del"
-#~ msgstr "Couper le block vers le presse-papier\tS-Del"
-
-#~ msgid "Paste block from clipbrd\tS-Ins"
-#~ msgstr "Coller le block du presse-papier\tS-Ins"
-
-#~ msgid "Selection history\tM-Ins"
-#~ msgstr "Historique de la s�lection\tM-Ins"
-
-#~ msgid "Manipulating blocks of text"
-#~ msgstr "Manipulation de blocs de texte"
-
-#~ msgid " Srch/Replce "
-#~ msgstr " Chercher/Remplacer "
-
-#~ msgid "Search...\tF7"
-#~ msgstr "Rechercher...\tF7"
-
-#~ msgid "Search again\tF17"
-#~ msgstr "Chercher � nouveau\tF17"
-
-#~ msgid "Replace...\tF4"
-#~ msgstr "Remplacer...\tF4"
-
-#~ msgid "Replace again\tF14"
-#~ msgstr "Remplacer � nouveau\tF14"
-
-#~ msgid "Search for and replace text"
-#~ msgstr "Chercher et remplacer texte"
-
-#~ msgid "Goto line...\tM-l"
-#~ msgstr "Aller � la ligne...\tM-l"
+#~ msgid "_About"
+#~ msgstr "_A Propos"
-#~ msgid "Start record macro\tC-r"
-#~ msgstr "Commencer � enregistrer une macro\tC-r"
+#~ msgid "Information on this program"
+#~ msgstr "Informations sur ce programme"
-#~ msgid "Finish record macro...\tC-r"
-#~ msgstr "Terminer l'enregistrement de macro...\tC-r"
+#~ msgid "_File"
+#~ msgstr "_Fichier"
-#~ msgid "Execute macro...\tC-a, KEY"
-#~ msgstr "Ex�cuter macro...\tC-a, TOUCHE"
+#~ msgid "_Edit"
+#~ msgstr "_Editer"
-#~ msgid "Delete macro...\t"
-#~ msgstr "Effacer macro...\t"
+#~ msgid "Open with"
+#~ msgstr "Ouvrir avec"
-#~ msgid "Insert date/time\tC-d"
-#~ msgstr "Ins�rer date/heure\tC-d"
+#~ msgid "Move/rename..."
+#~ msgstr "D�placer/renommer..."
-#~ msgid "Format paragraph\tM-p"
-#~ msgstr "Formater paragraphe\tM-p"
+#~ msgid "_Mode"
+#~ msgstr "_Mode"
-#~ msgid "Refresh display\tC-l"
-#~ msgstr "Rafraichir l'affichage\tC-l"
+#~ msgid " Symlink "
+#~ msgstr " Lien Symbolique "
-#~ msgid "Macros and internal commands"
-#~ msgstr "Macros et commandes internes"
+#~ msgid "Ok"
+#~ msgstr "Ok"
#~ msgid "Open/Load"
#~ msgstr "Ouvrir/Charger"
@@ -4996,9 +5749,6 @@
#~ msgid "Save the current edit buffer as filename"
#~ msgstr "Enregistrer le tampon d'�dition courant dans un fichier"
-#~ msgid "Exit"
-#~ msgstr "Quiter"
-
#~ msgid "Quit editor"
#~ msgstr "Quiter l'�diteur"
@@ -5055,9 +5805,6 @@
#~ msgid "Do you want to delete "
#~ msgstr "Voulez-vous vraiment effacer "
-
-#~ msgid "Open with..."
-#~ msgstr "Ouvrir avec..."
#~ msgid " Could not open %s directory"
#~ msgstr " Impossible d'ouvrir le r�pertoire %s"
diff -ruN old/mc-4.5.27/po/mc.pot new/mc-4.5.28/po/mc.pot
--- old/mc-4.5.27/po/mc.pot Thu Mar 18 20:42:36 1999
+++ new/mc-4.5.28/po/mc.pot Fri Mar 26 15:30:48 1999
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-03-18 19:56-0500\n"
+"POT-Creation-Date: 1999-03-26 12:19-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,12 +18,13 @@
msgid " Emacs key: "
msgstr ""
-#: edit/edit_key_translator.c:133
+#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148
msgid " Execute Macro "
msgstr ""
#. Input line for a single key press follows the ':'
-#: edit/edit_key_translator.c:133 gtkedit/editcmd.c:707 gtkedit/editcmd.c:716
+#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148
+#: gtkedit/editcmd.c:709 gtkedit/editcmd.c:718
msgid " Press macro hotkey: "
msgstr ""
@@ -35,133 +36,135 @@
msgid " Press any key: "
msgstr ""
-#: gnome/gcmd.c:56
+#: gnome/gcmd.c:57
msgid " There is no other panel to compare contents to "
msgstr ""
-#: gnome/gcmd.c:112
+#: gnome/gcmd.c:113
msgid "GNU Midnight Commander"
msgstr ""
-#: gnome/gcmd.c:115
+#: gnome/gcmd.c:116
msgid "The GNOME edition of the Midnight Commander file manager."
msgstr ""
-#: gnome/gcmd.c:127 src/main.c:844 src/screen.c:2067
+#: gnome/gcmd.c:128 src/main.c:847 src/screen.c:2060
msgid " The Midnight Commander "
msgstr ""
-#: gnome/gcmd.c:128 src/main.c:845
+#: gnome/gcmd.c:129 src/main.c:848
msgid " Do you really want to quit the Midnight Commander? "
msgstr ""
-#: gnome/gcmd.c:129 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1859
-#: src/file.c:2231 src/filegui.c:602 src/hotlist.c:1035 src/main.c:846
-#: src/screen.c:2069 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
+#: gnome/gcmd.c:130 gtkedit/editcmd.c:2269 src/cmd.c:251 src/file.c:1859
+#: src/file.c:2233 src/filegui.c:602 src/hotlist.c:1035 src/main.c:849
+#: src/screen.c:2062 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
#: src/view.c:404
msgid "&Yes"
msgstr ""
-#: gnome/gcmd.c:129 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1859
-#: src/file.c:2231 src/filegui.c:601 src/hotlist.c:1035 src/main.c:846
-#: src/screen.c:2069 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
+#: gnome/gcmd.c:130 gtkedit/editcmd.c:2269 src/cmd.c:251 src/file.c:1859
+#: src/file.c:2233 src/filegui.c:601 src/hotlist.c:1035 src/main.c:849
+#: src/screen.c:2062 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
#: src/view.c:404
msgid "&No"
msgstr ""
-#: gnome/gcmd.c:268
+#: gnome/gcmd.c:269
msgid "Sort By"
msgstr ""
#. we define this up here so we can pass it in to our callback
-#: gnome/gcmd.c:273
+#: gnome/gcmd.c:274
msgid "Ignore case sensitivity."
msgstr ""
-#: gnome/gcmd.c:281 src/chmod.c:150 src/screen.c:425
+#: gnome/gcmd.c:282 gnome/gcustom-layout.c:43 src/chmod.c:150 src/screen.c:395
msgid "Name"
msgstr ""
-#: gnome/gcmd.c:288
+#: gnome/gcmd.c:289
msgid "File Type"
msgstr ""
-#: gnome/gcmd.c:294 src/screen.c:426 src/screen.c:427
+#: gnome/gcmd.c:295 gnome/gcustom-layout.c:47 src/screen.c:396
+#: src/screen.c:397
msgid "Size"
msgstr ""
-#: gnome/gcmd.c:300
+#: gnome/gcmd.c:301
msgid "Time Last Accessed"
msgstr ""
-#: gnome/gcmd.c:306
+#: gnome/gcmd.c:307
msgid "Time Last Modified"
msgstr ""
-#: gnome/gcmd.c:312
+#: gnome/gcmd.c:313
msgid "Time Last Changed"
msgstr ""
-#: gnome/gcmd.c:326
+#: gnome/gcmd.c:327
msgid "Reverse the order."
msgstr ""
-#: gnome/gcmd.c:389
+#: gnome/gcmd.c:390
msgid "Enter name."
msgstr ""
-#: gnome/gcmd.c:395
+#: gnome/gcmd.c:396
msgid "Enter label for command:"
msgstr ""
-#: gnome/gcmd.c:494
+#: gnome/gcmd.c:495
msgid "Find all core files"
msgstr ""
-#: gnome/gcmd.c:497 src/panelize.c:350
+#: gnome/gcmd.c:498 src/panelize.c:350
msgid "Find rejects after patching"
msgstr ""
-#: gnome/gcmd.c:541
+#: gnome/gcmd.c:542
msgid "Run Command"
msgstr ""
#. Frame 1
-#: gnome/gcmd.c:546
+#: gnome/gcmd.c:547
msgid "Preset Commands"
msgstr ""
-#: gnome/gcmd.c:563
+#. add add/remove buttons in center
+#: gnome/gcmd.c:564 gnome/gcustom-layout.c:185
msgid "Add"
msgstr ""
-#: gnome/gcmd.c:567
+#: gnome/gcmd.c:568 gnome/gcustom-layout.c:186
msgid "Remove"
msgstr ""
#. Frame 2
-#: gnome/gcmd.c:575
+#: gnome/gcmd.c:576
msgid "Run this Command"
msgstr ""
-#: gnome/gcmd.c:582
+#: gnome/gcmd.c:583
msgid "Command: "
msgstr ""
-#: gnome/gcmd.c:645
+#: gnome/gcmd.c:646
msgid "Set Filter"
msgstr ""
-#: gnome/gcmd.c:650 gnome/gcmd.c:691 gnome/gcmd.c:696 gnome/gcmd.c:700
-#: gnome/gscreen.c:2516
+#: gnome/gcmd.c:651 gnome/gcmd.c:692 gnome/gcmd.c:697 gnome/gcmd.c:701
+#: gnome/gscreen.c:2525
msgid "Show all files"
msgstr ""
-#: gnome/gcmd.c:657
+#: gnome/gcmd.c:658
msgid "."
msgstr ""
-#: gnome/gcmd.c:673
+#: gnome/gcmd.c:674
msgid ""
"Enter a filter here for files in the panel view.\n"
"\n"
@@ -169,197 +172,291 @@
"*.gif will show just gif images"
msgstr ""
-#: gnome/gcmd.c:675
+#: gnome/gcmd.c:676
msgid "Enter a Regular Expression to filter files in the panel view."
msgstr ""
-#: gnome/gcmd.c:732 gnome/gpopup.c:53
+#: gnome/gcmd.c:733
msgid " Open with..."
msgstr ""
-#: gnome/gcmd.c:733 gnome/gpopup.c:54
+#: gnome/gcmd.c:734
msgid "Enter extra arguments:"
msgstr ""
-#: gnome/gdesktop.c:420 gnome/gdesktop.c:2070
+#: gnome/gcmd.c:796
+msgid "Desktop entry properties"
+msgstr ""
+
+#: gnome/gcustom-layout.c:36
+msgid "Access Time"
+msgstr ""
+
+#: gnome/gcustom-layout.c:37
+msgid "Creation Time"
+msgstr ""
+
+#. Group
+#: gnome/gcustom-layout.c:38 gnome/gnome-file-property-dialog.c:776
+#: gnome/gnome-file-property-dialog.c:940 gnome/gprop.c:280 gnome/gprop.c:405
+#: src/screen.c:409
+msgid "Group"
+msgstr ""
+
+#: gnome/gcustom-layout.c:39
+msgid "Group ID"
+msgstr ""
+
+#: gnome/gcustom-layout.c:40
+msgid "Inode Number"
+msgstr ""
+
+#: gnome/gcustom-layout.c:41 src/achown.c:378
+msgid "Mode"
+msgstr ""
+
+#: gnome/gcustom-layout.c:42
+msgid "Modification Time"
+msgstr ""
+
+#: gnome/gcustom-layout.c:44
+msgid "Number of Hard Links"
+msgstr ""
+
+#. Owner
+#: gnome/gcustom-layout.c:45 gnome/gnome-file-property-dialog.c:925
+#: gnome/gprop.c:390 src/screen.c:408
+msgid "Owner"
+msgstr ""
+
+#: gnome/gcustom-layout.c:46 src/screen.c:402
+msgid "Permission"
+msgstr ""
+
+#: gnome/gcustom-layout.c:48
+msgid "Size (short)"
+msgstr ""
+
+#: gnome/gcustom-layout.c:49
+msgid "Type"
+msgstr ""
+
+#: gnome/gcustom-layout.c:50
+msgid "User ID"
+msgstr ""
+
+#: gnome/gcustom-layout.c:144
+msgid "Possible Columns"
+msgstr ""
+
+#: gnome/gcustom-layout.c:164
+msgid "Displayed Columns"
+msgstr ""
+
+#: gnome/gcustom-layout.c:306
+msgid "Custom View"
+msgstr ""
+
+#: gnome/gdesktop.c:416 gnome/gdesktop.c:2067
msgid "Warning"
msgstr ""
-#: gnome/gdesktop.c:421
+#: gnome/gdesktop.c:417
#, c-format
msgid "Could not open %s; will not have desktop icons"
msgstr ""
-#: gnome/gdesktop.c:1014
+#: gnome/gdesktop.c:1010
msgid "While running the mount/umount command"
msgstr ""
-#: gnome/gdesktop.c:1083
+#: gnome/gdesktop.c:1079
msgid "While running the eject command"
msgstr ""
-#: gnome/gdesktop.c:1136 gnome/gicon.c:154 gnome/gtools.c:52
+#: gnome/gdesktop.c:1132 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:2066
+#: gnome/gdesktop.c:2063
msgid "Home directory"
msgstr ""
-#: gnome/gdesktop.c:2071
+#: gnome/gdesktop.c:2068
#, c-format
msgid "Could not symlink %s to %s; will not have initial desktop icons."
msgstr ""
-#: gnome/gdesktop.c:2400 gnome/glayout.c:355
+#: gnome/gdesktop.c:2409
+msgid ""
+"Unable to locate the file:\n"
+"background-properties-capplet\n"
+"in your path.\n"
+"\n"
+"We are unable to set the background."
+msgstr ""
+
+#: gnome/gdesktop.c:2418 gnome/glayout.c:361
msgid "_Terminal"
msgstr ""
-#: gnome/gdesktop.c:2400 gnome/glayout.c:355
+#: gnome/gdesktop.c:2418 gnome/glayout.c:361
msgid "Launch a new terminal in the current directory"
msgstr ""
#. If this ever changes, make sure you update create_new_menu accordingly.
-#: gnome/gdesktop.c:2402 gnome/glayout.c:357
+#: gnome/gdesktop.c:2420 gnome/glayout.c:363
msgid "_Directory..."
msgstr ""
-#: gnome/gdesktop.c:2402 gnome/glayout.c:357
+#: gnome/gdesktop.c:2420 gnome/glayout.c:363
msgid "Creates a new directory"
msgstr ""
-#: gnome/gdesktop.c:2410 gnome/glayout.c:440
+#: gnome/gdesktop.c:2421
+msgid "_Launcher..."
+msgstr ""
+
+#: gnome/gdesktop.c:2421
+msgid "Creates a new launcher"
+msgstr ""
+
+#: gnome/gdesktop.c:2429 gnome/glayout.c:448
msgid "Arrange Icons"
msgstr ""
-#: gnome/gdesktop.c:2411
+#: gnome/gdesktop.c:2430
msgid "Create New Window"
msgstr ""
-#: gnome/gdesktop.c:2413
-msgid "Rescan Mountable Devices"
+#: gnome/gdesktop.c:2432
+msgid "Recreate Desktop Shortcuts"
msgstr ""
-#: gnome/gdesktop.c:2414 gnome/glayout.c:443
+#: gnome/gdesktop.c:2433 gnome/glayout.c:451
msgid "Rescan Desktop"
msgstr ""
-#: gnome/gdialogs.c:59
-msgid "To: "
+#: gnome/gdesktop.c:2434
+msgid "Configure Background Image"
msgstr ""
#: gnome/gdialogs.c:60
-msgid "Copying from: "
+msgid "To: "
msgstr ""
#: gnome/gdialogs.c:61
+msgid "Copying from: "
+msgstr ""
+
+#: gnome/gdialogs.c:62
msgid "Deleting file: "
msgstr ""
-#: gnome/gdialogs.c:368
+#: gnome/gdialogs.c:370
msgid "Files Exist"
msgstr ""
-#: gnome/gdialogs.c:383
+#: gnome/gdialogs.c:385
msgid ""
"Some of the files you are trying to copy already exist in the destination "
"folder. Please select the action to be performed."
msgstr ""
-#: gnome/gdialogs.c:396
+#: gnome/gdialogs.c:398
msgid "Prompt me before overwriting any file."
msgstr ""
-#: gnome/gdialogs.c:403
+#: gnome/gdialogs.c:405
msgid "Don't overwrite any files."
msgstr ""
-#: gnome/gdialogs.c:419
+#: gnome/gdialogs.c:421
msgid "Overwrite:"
msgstr ""
-#: gnome/gdialogs.c:426
+#: gnome/gdialogs.c:428
msgid "Older files."
msgstr ""
-#: gnome/gdialogs.c:432
+#: gnome/gdialogs.c:434
msgid "Files only if size differs."
msgstr ""
-#: gnome/gdialogs.c:438
+#: gnome/gdialogs.c:440
msgid "All files."
msgstr ""
-#: gnome/gdialogs.c:478
+#: gnome/gdialogs.c:480
msgid "File Exists"
msgstr ""
-#: gnome/gdialogs.c:484
+#: gnome/gdialogs.c:486
#, c-format
msgid "The target file already exists: %s"
msgstr ""
-#: gnome/gdialogs.c:491
+#: gnome/gdialogs.c:493
msgid "Replace it?"
msgstr ""
-#: gnome/gdialogs.c:565 gtkedit/editwidget.c:1067 src/file.c:802
-#: src/screen.c:2308 src/screen.c:2338 src/tree.c:1024
+#: gnome/gdialogs.c:567 gtkedit/editwidget.c:1069 src/file.c:802
+#: src/screen.c:2301 src/screen.c:2331 src/tree.c:1024
msgid "Copy"
msgstr ""
-#: gnome/gdialogs.c:568 gtkedit/editwidget.c:1068
+#: gnome/gdialogs.c:570 gtkedit/editwidget.c:1070
msgid "Move"
msgstr ""
-#: gnome/gdialogs.c:585
+#: gnome/gdialogs.c:587
msgid "Destination"
msgstr ""
-#: gnome/gdialogs.c:589
+#: gnome/gdialogs.c:591
msgid "Find Destination Folder"
msgstr ""
-#: gnome/gdialogs.c:594
+#: gnome/gdialogs.c:596
msgid "Copy as a background process"
msgstr ""
-#: gnome/gdialogs.c:614
+#: gnome/gdialogs.c:616
msgid "Advanced Options"
msgstr ""
-#: gnome/gdialogs.c:618
+#: gnome/gdialogs.c:620
msgid "Preserve symlinks"
msgstr ""
-#: gnome/gdialogs.c:628
+#: gnome/gdialogs.c:630
msgid "Follow links."
msgstr ""
-#: gnome/gdialogs.c:634
+#: gnome/gdialogs.c:636
msgid ""
"Selecting this will copy the files that symlinks point to instead of just "
"copying the link."
msgstr ""
-#: gnome/gdialogs.c:639
+#: gnome/gdialogs.c:641
msgid "Preserve file attributes."
msgstr ""
-#: gnome/gdialogs.c:644
+#: gnome/gdialogs.c:646
msgid "Preserves the permissions and the UID/GID if possible"
msgstr ""
-#: gnome/gdialogs.c:650
+#: gnome/gdialogs.c:652
msgid "Recursively copy subdirectories."
msgstr ""
-#: gnome/gdialogs.c:655
+#: gnome/gdialogs.c:657
msgid "If set, this will copy the directories recursively"
msgstr ""
-#: gnome/gdialogs.c:759
+#: gnome/gdialogs.c:761
#, c-format
msgid ""
"%s\n"
@@ -367,56 +464,58 @@
"Directory not empty. Delete it recursively?"
msgstr ""
-#: gnome/gdialogs.c:768 src/file.c:2226
+#: gnome/gdialogs.c:770 src/file.c:2228
msgid " Delete: "
msgstr ""
-#: gnome/gdialogs.c:772
+#: gnome/gdialogs.c:774
msgid "Do the same for the rest"
msgstr ""
-#: gnome/gdialogs.c:841
+#: gnome/gdialogs.c:843
msgid "Move Progress"
msgstr ""
-#: gnome/gdialogs.c:844
+#: gnome/gdialogs.c:846
msgid "Copy Progress"
msgstr ""
-#: gnome/gdialogs.c:847
+#: gnome/gdialogs.c:849
msgid "Delete Progress"
msgstr ""
-#: gnome/gdialogs.c:892
+#: gnome/gdialogs.c:894
msgid "File "
msgstr ""
-#: gnome/gdialogs.c:896
-msgid " is "
+#: gnome/gdialogs.c:898
+msgid "is "
msgstr ""
-#: gnome/gdialogs.c:899
-msgid " Done."
+#: gnome/gdialogs.c:901
+msgid "done."
msgstr ""
-#: gnome/gdialogs.c:959 src/wtools.c:585 vfs/vfs.c:1762
+#. Translators should take care as "Password" or its translations
+#. are used to identify password boxes and hide characters with "*"
+#: gnome/gdialogs.c:961 src/wtools.c:587 vfs/vfs.c:1762
msgid "Password:"
msgstr ""
-#: gnome/gdialogs.c:959 src/wtools.c:585
+#: gnome/gdialogs.c:961
msgid "Password"
msgstr ""
#. Create the dialog
-#: gnome/gdialogs.c:991
+#: gnome/gdialogs.c:993
msgid "Symbolic Link"
msgstr ""
-#: gnome/gdialogs.c:1007 src/boxes.c:803
+#: gnome/gdialogs.c:1009 src/boxes.c:803
msgid "Existing filename (filename symlink will point to):"
msgstr ""
-#: gnome/gdialogs.c:1021 src/boxes.c:801
+#: gnome/gdialogs.c:1023 src/boxes.c:801
msgid "Symbolic link filename:"
msgstr ""
@@ -519,210 +618,447 @@
msgstr ""
#. GNOMEUIINFO_ITEM_NONE(N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd },
-#: gnome/glayout.c:378
+#: gnome/glayout.c:384
msgid "_Copy..."
msgstr ""
-#: gnome/glayout.c:378
+#: gnome/glayout.c:384
msgid "Copy files"
msgstr ""
-#: gnome/glayout.c:379
+#: gnome/glayout.c:385
msgid "_Delete..."
msgstr ""
-#: gnome/glayout.c:379
+#: gnome/glayout.c:385
msgid "Delete files"
msgstr ""
-#: gnome/glayout.c:380
+#: gnome/glayout.c:386
msgid "_Move..."
msgstr ""
-#: gnome/glayout.c:380
+#: gnome/glayout.c:386
msgid "Rename or move files"
msgstr ""
-#: gnome/glayout.c:382
+#: gnome/glayout.c:388
msgid "Show directory sizes"
msgstr ""
-#: gnome/glayout.c:382
+#: gnome/glayout.c:388
msgid "Shows the disk space used by each directory"
msgstr ""
-#: gnome/glayout.c:389
+#: gnome/glayout.c:395
msgid "Select _All"
msgstr ""
-#: gnome/glayout.c:389
+#: gnome/glayout.c:395
msgid "Select all files in the current Panel"
msgstr ""
-#: gnome/glayout.c:391
+#: gnome/glayout.c:397
msgid "_Select Files..."
msgstr ""
-#: gnome/glayout.c:391
+#: gnome/glayout.c:397
msgid "Select a group of files"
msgstr ""
-#: gnome/glayout.c:392
+#: gnome/glayout.c:398
msgid "_Invert Selection"
msgstr ""
-#: gnome/glayout.c:392
+#: gnome/glayout.c:398
msgid "Reverses the list of tagged files"
msgstr ""
-#: gnome/glayout.c:394
+#: gnome/glayout.c:400
msgid "_Rescan Directory"
msgstr ""
-#: gnome/glayout.c:394
+#: gnome/glayout.c:400
msgid "Rescan the directory contents"
msgstr ""
-#: gnome/glayout.c:401
+#: gnome/glayout.c:407
msgid "_Sort By..."
msgstr ""
-#: gnome/glayout.c:401
+#: gnome/glayout.c:407
msgid "Confirmation settings"
msgstr ""
-#: gnome/glayout.c:402
+#: gnome/glayout.c:408
msgid "_Filter View..."
msgstr ""
-#: gnome/glayout.c:402
+#: gnome/glayout.c:408
msgid "Global option settings"
msgstr ""
-#: gnome/glayout.c:409
+#: gnome/glayout.c:415
msgid "_Find File..."
msgstr ""
-#: gnome/glayout.c:409
+#: gnome/glayout.c:415
msgid "Locate files on disk"
msgstr ""
#. { GNOME_APP_UI_ITEM, N_("_Compare panels..."), N_("Compare two panel contents"), gnome_compare_panels },
-#: gnome/glayout.c:412
+#: gnome/glayout.c:418
+msgid "_Edit mime types..."
+msgstr ""
+
+#: gnome/glayout.c:418
+msgid "Edits the MIME type bindings"
+msgstr ""
+
+#: gnome/glayout.c:420
msgid "_Run Command..."
msgstr ""
-#: gnome/glayout.c:412
+#: gnome/glayout.c:420
msgid "Runs a command"
msgstr ""
-#: gnome/glayout.c:414
+#: gnome/glayout.c:422
msgid "_Run Command in panel..."
msgstr ""
-#: gnome/glayout.c:414
+#: gnome/glayout.c:422
msgid "Run a command and put the results in a panel"
msgstr ""
-#: gnome/glayout.c:424
+#: gnome/glayout.c:432
msgid "_Background jobs..."
msgstr ""
-#: gnome/glayout.c:424
+#: gnome/glayout.c:432
msgid "List of background operations"
msgstr ""
-#: gnome/glayout.c:427
+#: gnome/glayout.c:435
msgid "Exit"
msgstr ""
-#: gnome/glayout.c:427
+#: gnome/glayout.c:435
msgid "Terminates the file manager and the desktop"
msgstr ""
-#: gnome/glayout.c:442
+#: gnome/glayout.c:450
msgid "Rescan System Devices"
msgstr ""
-#: gnome/glayout.c:450 gnome/glayout.c:460
+#: gnome/glayout.c:458 gnome/glayout.c:468
msgid "_Layout"
msgstr ""
-#: gnome/glayout.c:451 gnome/glayout.c:461
+#: gnome/glayout.c:459 gnome/glayout.c:469
msgid "_Commands"
msgstr ""
-#: gnome/glayout.c:452
+#: gnome/glayout.c:460
msgid "_Desktop"
msgstr ""
-#: gnome/glayout.c:453 gnome/glayout.c:462
+#: gnome/glayout.c:461 gnome/glayout.c:470
msgid "_Help"
msgstr ""
-#: gnome/glayout.c:600
+#: gnome/glayout.c:610
msgid "File/New/Directory..."
msgstr ""
-#: gnome/gpopup.c:252 gnome/gpopup.c:255
-msgid "Properties"
+#. we set the file part
+#: gnome/gnome-file-property-dialog.c:170
+msgid "Full Name: "
msgstr ""
-#: gnome/gpopup.c:253 gnome/gpopup.c:254 gtkedit/editwidget.c:1070
-#: src/screen.c:2311 src/screen.c:2341
-msgid "Delete"
+#: gnome/gnome-file-property-dialog.c:178
+msgid "File Name"
msgstr ""
-#: gnome/gpopup.c:256
-msgid "Mount device"
+#: gnome/gnome-file-property-dialog.c:201
+msgid "File Type: "
msgstr ""
-#: gnome/gpopup.c:257
-msgid "Unmount device"
+#: gnome/gnome-file-property-dialog.c:207
+msgid "File Type: Symbolic Link"
msgstr ""
-#: gnome/gpopup.c:258
-msgid "Eject device"
+#: gnome/gnome-file-property-dialog.c:212
+msgid "Target Name: INVALID LINK"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:215
+msgid "Target Name: "
msgstr ""
-#: gnome/gpopup.c:260 gnome/gpopup.c:261
+#: gnome/gnome-file-property-dialog.c:220
+msgid "File Type: Directory"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:222
+msgid "File Type: Character Device"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:224
+msgid "File Type: Block Device"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:226
+msgid "File Type: Socket"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:228
+msgid "File Type: FIFO"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:238
+#: gnome/gnome-file-property-dialog.c:242
+#: gnome/gnome-file-property-dialog.c:248
+msgid "File Size: "
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:238
+msgid " bytes"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:242
+msgid " KBytes ("
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:243
+#: gnome/gnome-file-property-dialog.c:249
+msgid " bytes)"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:248
+msgid " MBytes ("
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:256
+msgid "File Size: N/A"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:267
+msgid "File Created on: "
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:276
+msgid "Last Modified on: "
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:285
+msgid "Last Accessed on: "
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:303
+msgid "URL:"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:310
+msgid "Caption:"
+msgstr ""
+
+#. we do open first
+#: gnome/gnome-file-property-dialog.c:469 gnome/gpopup2.c:187
msgid "Open"
msgstr ""
-#: gnome/gpopup.c:262
-msgid "Open with"
+#: gnome/gnome-file-property-dialog.c:479
+msgid "Use default Open action"
msgstr ""
-#: gnome/gpopup.c:263 src/screen.c:2306 src/screen.c:2336
+#: gnome/gnome-file-property-dialog.c:489
+msgid "Drop Action"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:491 gnome/gpopup2.c:194
+#: src/screen.c:2299 src/screen.c:2329
msgid "View"
msgstr ""
-#: gnome/gpopup.c:264
-msgid "View unfiltered"
+#: gnome/gnome-file-property-dialog.c:502
+msgid "Use default Drop action"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:504
+msgid "Use default View action"
msgstr ""
-#: gnome/gpopup.c:265 src/screen.c:2307 src/screen.c:2337 src/view.c:1991
+#: gnome/gnome-file-property-dialog.c:513 gnome/gpopup2.c:196
+#: src/screen.c:2300 src/screen.c:2330 src/view.c:1991
msgid "Edit"
msgstr ""
-#: gnome/gpopup.c:267
-msgid "Move/rename..."
+#: gnome/gnome-file-property-dialog.c:523
+msgid "Use default Edit action"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:577 gnome/gprop.c:521
+msgid "Icon"
+msgstr ""
+
+#. We must be a file or a link to a file.
+#: gnome/gnome-file-property-dialog.c:611
+msgid "File Actions"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:616
+msgid "Open action"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:617
+msgid "Needs terminal to run"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:742
+msgid "File Permissions"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:753 gnome/gprop.c:259
+msgid "Current mode: "
+msgstr ""
+
+#. Headings
+#: gnome/gnome-file-property-dialog.c:768 gnome/gprop.c:272
+msgid "Read"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:769 gnome/gprop.c:273
+msgid "Write"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:770 gnome/gprop.c:274
+msgid "Exec"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:771 gnome/gprop.c:275
+msgid "Special"
+msgstr ""
+
+#. Permissions
+#: gnome/gnome-file-property-dialog.c:775 gnome/gprop.c:279
+msgid "User"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:777 gnome/gprop.c:281
+msgid "Other"
+msgstr ""
+
+#. Special
+#: gnome/gnome-file-property-dialog.c:781 gnome/gprop.c:285
+msgid "Set UID"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:782 gnome/gprop.c:286
+msgid "Set GID"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:783 gnome/gprop.c:287
+msgid "Sticky"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:1074
+msgid "URL"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:1077
+msgid "Statistics"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:1083
+msgid "Options"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:1086
+msgid "Permissions"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:1089
+msgid " Properties"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:1140
+msgid "You entered an invalid username"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:1185
+msgid "You must rename your file to something"
+msgstr ""
+
+#: gnome/gnome-file-property-dialog.c:1191
+msgid "You cannot rename a file to something containing a '/' character"
msgstr ""
-#: gnome/gpopup.c:268
+#. the first label
+#: gnome/gnome-open-dialog.c:379
+msgid "Select an application to open \""
+msgstr ""
+
+#: gnome/gnome-open-dialog.c:390
+msgid "Select a file to run with"
+msgstr ""
+
+#. the file tree
+#: gnome/gnome-open-dialog.c:401
+msgid "Applications"
+msgstr ""
+
+#: gnome/gnome-open-dialog.c:417
+msgid "Program to run"
+msgstr ""
+
+#: gnome/gpopup2.c:188
+msgid "Mount device"
+msgstr ""
+
+#: gnome/gpopup2.c:189
+msgid "Unmount device"
+msgstr ""
+
+#: gnome/gpopup2.c:190
+msgid "Eject device"
+msgstr ""
+
+#: gnome/gpopup2.c:193
+msgid "Open with..."
+msgstr ""
+
+#: gnome/gpopup2.c:195
+msgid "View Unfiltered"
+msgstr ""
+
+#: gnome/gpopup2.c:198
msgid "Copy..."
msgstr ""
-#: gnome/gpopup.c:270
-msgid "Link..."
+#: gnome/gpopup2.c:199 gtkedit/editwidget.c:1072 src/screen.c:2304
+#: src/screen.c:2334
+msgid "Delete"
+msgstr ""
+
+#: gnome/gpopup2.c:200
+msgid "Move..."
msgstr ""
-#: gnome/gpopup.c:271
+#: gnome/gpopup2.c:201
+msgid "Hard Link..."
+msgstr ""
+
+#: gnome/gpopup2.c:202
msgid "Symlink..."
msgstr ""
-#: gnome/gpopup.c:272
-msgid "Edit symlink..."
+#: gnome/gpopup2.c:203
+msgid "Edit Symlink..."
+msgstr ""
+
+#: gnome/gpopup2.c:205
+msgid "Properties..."
msgstr ""
#: gnome/gprefs.c:81
@@ -833,63 +1169,10 @@
msgid "File mode (permissions)"
msgstr ""
-#: gnome/gprop.c:259
-msgid "Current mode: "
-msgstr ""
-
-#. Headings
-#: gnome/gprop.c:272
-msgid "Read"
-msgstr ""
-
-#: gnome/gprop.c:273
-msgid "Write"
-msgstr ""
-
-#: gnome/gprop.c:274
-msgid "Exec"
-msgstr ""
-
-#: gnome/gprop.c:275
-msgid "Special"
-msgstr ""
-
-#. Permissions
-#: gnome/gprop.c:279
-msgid "User"
-msgstr ""
-
-#. Group
-#: gnome/gprop.c:280 gnome/gprop.c:405 src/screen.c:439
-msgid "Group"
-msgstr ""
-
-#: gnome/gprop.c:281
-msgid "Other"
-msgstr ""
-
-#. Special
-#: gnome/gprop.c:285
-msgid "Set UID"
-msgstr ""
-
-#: gnome/gprop.c:286
-msgid "Set GID"
-msgstr ""
-
-#: gnome/gprop.c:287
-msgid "Sticky"
-msgstr ""
-
#: gnome/gprop.c:321 gnome/gprop.c:347
msgid "<Unknown>"
msgstr ""
-#. Owner
-#: gnome/gprop.c:390 src/screen.c:438
-msgid "Owner"
-msgstr ""
-
#: gnome/gprop.c:494
msgid "General"
msgstr ""
@@ -898,168 +1181,164 @@
msgid "Title"
msgstr ""
-#: gnome/gprop.c:521
-msgid "Icon"
-msgstr ""
-
#: gnome/gprop.c:535
msgid "Select icon"
msgstr ""
-#: gnome/gscreen.c:1468
+#: gnome/gscreen.c:1472
msgid "Rescan Directory"
msgstr ""
-#: gnome/gscreen.c:1468
+#: gnome/gscreen.c:1472
msgid "Reloads the current directory"
msgstr ""
-#: gnome/gscreen.c:1470
+#: gnome/gscreen.c:1474
msgid "New folder"
msgstr ""
-#: gnome/gscreen.c:1470
+#: gnome/gscreen.c:1474
msgid "Creates a new folder here"
msgstr ""
-#: gnome/gscreen.c:1648
+#: gnome/gscreen.c:1652
msgid "All files"
msgstr ""
-#: gnome/gscreen.c:1650
+#: gnome/gscreen.c:1654
msgid "Archives and compressed files"
msgstr ""
-#: gnome/gscreen.c:1652
+#: gnome/gscreen.c:1656
msgid "RPM/DEB files"
msgstr ""
-#: gnome/gscreen.c:1654
+#: gnome/gscreen.c:1658
msgid "Text/Document files"
msgstr ""
-#: gnome/gscreen.c:1656
+#: gnome/gscreen.c:1660
msgid "HTML and SGML files"
msgstr ""
-#: gnome/gscreen.c:1658
+#: gnome/gscreen.c:1662
msgid "Postscript and PDF files"
msgstr ""
-#: gnome/gscreen.c:1660
+#: gnome/gscreen.c:1664
msgid "Spreadsheet files"
msgstr ""
-#: gnome/gscreen.c:1662
+#: gnome/gscreen.c:1666
msgid "Image files"
msgstr ""
-#: gnome/gscreen.c:1665
+#: gnome/gscreen.c:1669
msgid "Video/animation files"
msgstr ""
-#: gnome/gscreen.c:1667
+#: gnome/gscreen.c:1671
msgid "Audio files"
msgstr ""
-#: gnome/gscreen.c:1669
+#: gnome/gscreen.c:1673
msgid "C program files"
msgstr ""
-#: gnome/gscreen.c:1671
+#: gnome/gscreen.c:1675
msgid "C++ program files"
msgstr ""
-#: gnome/gscreen.c:1673
+#: gnome/gscreen.c:1677
msgid "Objective-C program files"
msgstr ""
-#: gnome/gscreen.c:1675
+#: gnome/gscreen.c:1679
msgid "Scheme program files"
msgstr ""
-#: gnome/gscreen.c:1677
+#: gnome/gscreen.c:1681
msgid "Assembler program files"
msgstr ""
-#: gnome/gscreen.c:1679
+#: gnome/gscreen.c:1683
msgid "Misc. program files"
msgstr ""
-#: gnome/gscreen.c:1681
+#: gnome/gscreen.c:1685
msgid "Font files"
msgstr ""
-#: gnome/gscreen.c:1808
+#: gnome/gscreen.c:1812
#, c-format
msgid "Search: %s"
msgstr ""
-#: gnome/gscreen.c:1818
+#: gnome/gscreen.c:1822
#, c-format
msgid "%s bytes in %d file"
msgstr ""
-#: gnome/gscreen.c:1818
+#: gnome/gscreen.c:1822
#, c-format
msgid "%s bytes in %d files"
msgstr ""
-#: gnome/gscreen.c:1844 src/screen.c:677
+#: gnome/gscreen.c:1848 src/screen.c:670
msgid "<readlink failed>"
msgstr ""
-#: gnome/gscreen.c:1898
+#: gnome/gscreen.c:1902
msgid "Filter"
msgstr ""
-#: gnome/gscreen.c:2338
+#: gnome/gscreen.c:2347
msgid "Back"
msgstr ""
-#: gnome/gscreen.c:2338
+#: gnome/gscreen.c:2347
msgid "Go to the previously visited directory"
msgstr ""
-#: gnome/gscreen.c:2340
+#: gnome/gscreen.c:2349
msgid "Up"
msgstr ""
-#: gnome/gscreen.c:2340
+#: gnome/gscreen.c:2349
msgid "Go up a level in the directory heirarchy"
msgstr ""
-#: gnome/gscreen.c:2342
+#: gnome/gscreen.c:2351
msgid "Forward"
msgstr ""
-#: gnome/gscreen.c:2342
+#: gnome/gscreen.c:2351
msgid "Go to the next directory"
msgstr ""
-#: gnome/gscreen.c:2345 src/tree.c:1020
+#: gnome/gscreen.c:2354 src/tree.c:1020
msgid "Rescan"
msgstr ""
-#: gnome/gscreen.c:2345
+#: gnome/gscreen.c:2354
msgid "Rescan the current directory"
msgstr ""
-#: gnome/gscreen.c:2348
+#: gnome/gscreen.c:2357
msgid "Home"
msgstr ""
-#: gnome/gscreen.c:2348
+#: gnome/gscreen.c:2357
msgid "Go to your home directory"
msgstr ""
-#: gnome/gscreen.c:2494
+#: gnome/gscreen.c:2503
msgid "Location:"
msgstr ""
#. 1
-#: gnome/gtools.c:110 gtkedit/editcmd.c:342 gtkedit/editcmd.c:1185
-#: gtkedit/editcmd.c:1270 gtkedit/editcmd.c:2847 gtkedit/editoptions.c:69
+#: gnome/gtools.c:110 gtkedit/editcmd.c:344 gtkedit/editcmd.c:1187
+#: gtkedit/editcmd.c:1272 gtkedit/editcmd.c:2868 gtkedit/editoptions.c:71
#: src/boxes.c:138 src/boxes.c:278 src/boxes.c:378 src/boxes.c:466
#: src/boxes.c:646 src/boxes.c:728 src/boxes.c:783 src/boxes.c:898
#: src/filegui.c:838 src/find.c:171 src/layout.c:369 src/option.c:144
@@ -1143,11 +1422,11 @@
msgid "help"
msgstr ""
-#: gnome/gwidget.c:96 src/file.c:2250
+#: gnome/gwidget.c:96 src/file.c:2252
msgid "yes"
msgstr ""
-#: gnome/gwidget.c:98 src/file.c:2248
+#: gnome/gwidget.c:98 src/file.c:2250
msgid "no"
msgstr ""
@@ -1160,55 +1439,55 @@
msgstr ""
#. The file-name is printed after the ':'
-#: gtkedit/edit.c:129 gtkedit/edit.c:224 gtkedit/edit.c:231 gtkedit/edit.c:238
-#: gtkedit/edit.c:245 gtkedit/edit.c:251 gtkedit/edit.c:308 gtkedit/edit.c:344
-#: gtkedit/editcmd.c:1945 gtkedit/editwidget.c:950 src/dir.c:386
-#: src/screen.c:2326 src/tree.c:692 src/tree.c:698 src/wtools.c:222
+#: gtkedit/edit.c:131 gtkedit/edit.c:226 gtkedit/edit.c:233 gtkedit/edit.c:240
+#: gtkedit/edit.c:247 gtkedit/edit.c:253 gtkedit/edit.c:310 gtkedit/edit.c:346
+#: gtkedit/editcmd.c:1954 gtkedit/editwidget.c:952 src/dir.c:386
+#: src/screen.c:2319 src/tree.c:692 src/tree.c:698 src/wtools.c:222
#: vfs/fish.c:224
msgid " Error "
msgstr ""
-#: gtkedit/edit.c:129 gtkedit/edit.c:231
+#: gtkedit/edit.c:131 gtkedit/edit.c:233
msgid " Failed trying to open file for reading: "
msgstr ""
-#: gtkedit/edit.c:238
+#: gtkedit/edit.c:240
msgid " Cannot get size/permissions info on file: "
msgstr ""
-#: gtkedit/edit.c:245
+#: gtkedit/edit.c:247
msgid " Not an ordinary file: "
msgstr ""
-#: gtkedit/edit.c:251
+#: gtkedit/edit.c:253
msgid " File is too large: "
msgstr ""
-#: gtkedit/edit.c:252
+#: gtkedit/edit.c:254
msgid ""
" \n"
" Increase edit.h:MAXBUF and recompile the editor. "
msgstr ""
-#: gtkedit/edit.c:308 gtkedit/edit.c:344
+#: gtkedit/edit.c:310 gtkedit/edit.c:346
msgid " Error allocating memory "
msgstr ""
-#: gtkedit/editcmd.c:335
+#: gtkedit/editcmd.c:337
msgid "Quick save "
msgstr ""
-#: gtkedit/editcmd.c:336
+#: gtkedit/editcmd.c:338
msgid "Safe save "
msgstr ""
-#: gtkedit/editcmd.c:337
+#: gtkedit/editcmd.c:339
msgid "Do backups -->"
msgstr ""
#. NLS for hotkeys?
-#: gtkedit/editcmd.c:340 gtkedit/editcmd.c:1137 gtkedit/editcmd.c:1183
-#: gtkedit/editcmd.c:1268 gtkedit/editcmd.c:2845 gtkedit/editoptions.c:66
+#: gtkedit/editcmd.c:342 gtkedit/editcmd.c:1139 gtkedit/editcmd.c:1185
+#: gtkedit/editcmd.c:1270 gtkedit/editcmd.c:2866 gtkedit/editoptions.c:68
#: src/achown.c:71 src/boxes.c:139 src/boxes.c:279 src/boxes.c:376
#: src/boxes.c:464 src/boxes.c:644 src/boxes.c:727 src/boxes.c:781
#: src/chmod.c:114 src/chown.c:79 src/cmd.c:856 src/filegui.c:821
@@ -1218,578 +1497,587 @@
msgid "&Cancel"
msgstr ""
-#: gtkedit/editcmd.c:346
+#: gtkedit/editcmd.c:348
msgid "Extension:"
msgstr ""
#. NLS ?
-#: gtkedit/editcmd.c:353
+#: gtkedit/editcmd.c:355
msgid " Edit Save Mode "
msgstr ""
-#: gtkedit/editcmd.c:477
+#: gtkedit/editcmd.c:479
msgid " Save As "
msgstr ""
#. Warning message with a query to continue or cancel the operation
-#: gtkedit/editcmd.c:491 gtkedit/editcmd.c:810 gtkedit/editcmd.c:840
-#: gtkedit/editcmd.c:987 gtkedit/editcmd.c:1084 src/ext.c:301 src/file.c:619
-#: src/help.c:318 src/main.c:691 src/screen.c:2083 src/subshell.c:705
+#: gtkedit/editcmd.c:493 gtkedit/editcmd.c:812 gtkedit/editcmd.c:842
+#: gtkedit/editcmd.c:989 gtkedit/editcmd.c:1086 src/ext.c:301 src/file.c:619
+#: src/help.c:318 src/main.c:694 src/screen.c:2076 src/subshell.c:705
#: src/subshell.c:731 src/utilunix.c:388 src/utilunix.c:392 src/utilunix.c:463
#: vfs/mcfs.c:170
msgid " Warning "
msgstr ""
-#: gtkedit/editcmd.c:492
+#: gtkedit/editcmd.c:494
msgid " A file already exists with this name. "
msgstr ""
#. Push buttons to over-write the current file, or cancel the operation
-#: gtkedit/editcmd.c:494
+#: gtkedit/editcmd.c:496
msgid "Overwrite"
msgstr ""
-#: gtkedit/editcmd.c:494 gtkedit/editcmd.c:556 gtkedit/editcmd.c:783
-#: gtkedit/editcmd.c:810 gtkedit/editcmd.c:840 gtkedit/editcmd.c:987
-#: gtkedit/editcmd.c:1578
+#: gtkedit/editcmd.c:496 gtkedit/editcmd.c:558 gtkedit/editcmd.c:785
+#: gtkedit/editcmd.c:812 gtkedit/editcmd.c:842 gtkedit/editcmd.c:989
+#: gtkedit/editcmd.c:1581
msgid "Cancel"
msgstr ""
-#: gtkedit/editcmd.c:510
+#: gtkedit/editcmd.c:512
msgid " Save as "
msgstr ""
-#: gtkedit/editcmd.c:510 gtkedit/editcmd.c:2615
+#: gtkedit/editcmd.c:512 gtkedit/editcmd.c:2636
msgid " Error trying to save file. "
msgstr ""
#. This heads the delete macro error dialog box
-#: gtkedit/editcmd.c:626 gtkedit/editcmd.c:634 gtkedit/editcmd.c:659
+#: gtkedit/editcmd.c:628 gtkedit/editcmd.c:636 gtkedit/editcmd.c:661
msgid " Delete macro "
msgstr ""
#. 'Open' = load temp file
-#: gtkedit/editcmd.c:628
+#: gtkedit/editcmd.c:630
msgid " Error trying to open temp file "
msgstr ""
#. 'Open' = load temp file
-#: gtkedit/editcmd.c:636 gtkedit/editcmd.c:697 gtkedit/editcmd.c:765
+#: gtkedit/editcmd.c:638 gtkedit/editcmd.c:699 gtkedit/editcmd.c:767
msgid " Error trying to open macro file "
msgstr ""
-#: gtkedit/editcmd.c:641 gtkedit/editcmd.c:649 gtkedit/editcmd.c:685
-#: gtkedit/editcmd.c:740
+#: gtkedit/editcmd.c:643 gtkedit/editcmd.c:651 gtkedit/editcmd.c:687
+#: gtkedit/editcmd.c:742
#, c-format
msgid "key '%d 0': "
msgstr ""
-#: gtkedit/editcmd.c:660
+#: gtkedit/editcmd.c:662
msgid " Error trying to overwrite macro file "
msgstr ""
#. This heads the 'Macro' dialog box
-#: gtkedit/editcmd.c:677
+#: gtkedit/editcmd.c:679
msgid " Macro "
msgstr ""
#. Input line for a single key press follows the ':'
-#: gtkedit/editcmd.c:679
+#: gtkedit/editcmd.c:681
msgid " Press the macro's new hotkey: "
msgstr ""
#. This heads the 'Save Macro' dialog box
-#: gtkedit/editcmd.c:697
+#: gtkedit/editcmd.c:699
msgid " Save macro "
msgstr ""
-#: gtkedit/editcmd.c:707 gtkedit/editcmd.c:714
+#: gtkedit/editcmd.c:709 gtkedit/editcmd.c:716
msgid " Delete Macro "
msgstr ""
#. This heads the 'Load Macro' dialog box
-#: gtkedit/editcmd.c:764
+#: gtkedit/editcmd.c:766
msgid " Load macro "
msgstr ""
-#: gtkedit/editcmd.c:778 gtkedit/editcmd.c:780
+#: gtkedit/editcmd.c:780 gtkedit/editcmd.c:782
msgid " Confirm save file? : "
msgstr ""
#. Buttons to 'Confirm save file' query
-#: gtkedit/editcmd.c:783
+#: gtkedit/editcmd.c:785
msgid " Save file "
msgstr ""
-#: gtkedit/editcmd.c:783 gtkedit/editwidget.c:1064 src/view.c:1987
+#: gtkedit/editcmd.c:785 gtkedit/editwidget.c:1066 src/view.c:1987
msgid "Save"
msgstr ""
-#: gtkedit/editcmd.c:810 gtkedit/editcmd.c:840
+#: gtkedit/editcmd.c:812 gtkedit/editcmd.c:842
msgid ""
" Current text was modified without a file save. \n"
" Continue discards these changes. "
msgstr ""
-#: gtkedit/editcmd.c:810 gtkedit/editcmd.c:840 gtkedit/editcmd.c:987
-#: src/main.c:3067
+#: gtkedit/editcmd.c:812 gtkedit/editcmd.c:842 gtkedit/editcmd.c:989
+#: src/main.c:3076
msgid "Continue"
msgstr ""
#. Heads the 'Load' file dialog box
-#: gtkedit/editcmd.c:829 gtkedit/editcmd.c:843
+#: gtkedit/editcmd.c:831 gtkedit/editcmd.c:845
msgid " Load "
msgstr ""
-#: gtkedit/editcmd.c:829
+#: gtkedit/editcmd.c:831
msgid " Error trying to open file for reading "
msgstr ""
-#: gtkedit/editcmd.c:987 gtkedit/editcmd.c:1084
+#: gtkedit/editcmd.c:989 gtkedit/editcmd.c:1086
msgid " Block is large, you may not be able to undo this action. "
msgstr ""
-#: gtkedit/editcmd.c:1084
+#: gtkedit/editcmd.c:1086
msgid " Continue "
msgstr ""
-#: gtkedit/editcmd.c:1084
+#: gtkedit/editcmd.c:1086
msgid " Cancel "
msgstr ""
-#: gtkedit/editcmd.c:1139 src/filegui.c:596
+#: gtkedit/editcmd.c:1141 src/filegui.c:596
msgid "al&L"
msgstr ""
-#: gtkedit/editcmd.c:1141 src/file.c:2172 src/filegui.c:266
+#: gtkedit/editcmd.c:1143 src/file.c:2174 src/filegui.c:266
msgid "&Skip"
msgstr ""
-#: gtkedit/editcmd.c:1143
+#: gtkedit/editcmd.c:1145
msgid "&Replace"
msgstr ""
#. This is for the confirm replace dialog box. The replaced string comes after the ':'
-#: gtkedit/editcmd.c:1149 gtkedit/editcmd.c:1576
+#: gtkedit/editcmd.c:1151 gtkedit/editcmd.c:1579
msgid " Replace with: "
msgstr ""
-#: gtkedit/editcmd.c:1153
+#: gtkedit/editcmd.c:1155
msgid " Confirm replace "
msgstr ""
-#: gtkedit/editcmd.c:1187 gtkedit/editcmd.c:1272
+#: gtkedit/editcmd.c:1189 gtkedit/editcmd.c:1274
msgid "scanf &Expression"
msgstr ""
-#: gtkedit/editcmd.c:1189
+#: gtkedit/editcmd.c:1191
msgid "replace &All"
msgstr ""
-#: gtkedit/editcmd.c:1191
+#: gtkedit/editcmd.c:1193
msgid "pr&Ompt on replace"
msgstr ""
-#: gtkedit/editcmd.c:1193 gtkedit/editcmd.c:1274
+#: gtkedit/editcmd.c:1195 gtkedit/editcmd.c:1276
msgid "&Backwards"
msgstr ""
-#: gtkedit/editcmd.c:1195 gtkedit/editcmd.c:1276
+#: gtkedit/editcmd.c:1197 gtkedit/editcmd.c:1278
msgid "&Regular expression"
msgstr ""
-#: gtkedit/editcmd.c:1197 gtkedit/editcmd.c:1278
+#: gtkedit/editcmd.c:1199 gtkedit/editcmd.c:1280
msgid "&Whole words only"
msgstr ""
-#: gtkedit/editcmd.c:1199 gtkedit/editcmd.c:1280
+#: gtkedit/editcmd.c:1201 gtkedit/editcmd.c:1282
msgid "case &Sensitive"
msgstr ""
-#: gtkedit/editcmd.c:1203
+#: gtkedit/editcmd.c:1205
msgid " Enter replacement argument order eg. 3,2,1,4 "
msgstr ""
-#: gtkedit/editcmd.c:1207
+#: gtkedit/editcmd.c:1209
msgid " Enter replacement string:"
msgstr ""
-#: gtkedit/editcmd.c:1211 gtkedit/editcmd.c:1284 src/view.c:1912
+#: gtkedit/editcmd.c:1213 gtkedit/editcmd.c:1286 src/view.c:1912
msgid " Enter search string:"
msgstr ""
#. Heads the 'Replace' dialog box
-#: gtkedit/editcmd.c:1230 gtkedit/editcmd.c:1480 gtkedit/editcmd.c:1574
-#: gtkedit/editcmd.c:2107 gtkedit/editcmd.c:2138 gtkedit/editcmd.c:2140
+#: gtkedit/editcmd.c:1232 gtkedit/editcmd.c:1483 gtkedit/editcmd.c:1577
+#: gtkedit/editcmd.c:2128 gtkedit/editcmd.c:2159 gtkedit/editcmd.c:2161
msgid " Replace "
msgstr ""
#. Heads the 'Search' dialog box
-#: gtkedit/editcmd.c:1298 gtkedit/editcmd.c:1474 gtkedit/editcmd.c:2209
+#: gtkedit/editcmd.c:1300 gtkedit/editcmd.c:1477 gtkedit/editcmd.c:2230
#: src/view.c:1467 src/view.c:1566 src/view.c:1688 src/view.c:1880
#: src/view.c:1912
msgid " Search "
msgstr ""
#. An input line comes after the ':'
-#: gtkedit/editcmd.c:1348
+#: gtkedit/editcmd.c:1349
msgid " Enter search text : "
msgstr ""
-#: gtkedit/editcmd.c:1355
+#: gtkedit/editcmd.c:1356
msgid " Enter replace text : "
msgstr ""
-#: gtkedit/editcmd.c:1359
-msgid " Enter argument order : "
+#: gtkedit/editcmd.c:1359 gtkedit/editcmd.c:1360
+#, c-format
+msgid ""
+"You can enter regexp substrings with %s (not \\1, \\2 like sed) then use "
+"\"Enter...order\""
+msgstr ""
+
+#: gtkedit/editcmd.c:1362
+msgid " Enter argument (or substring) order : "
msgstr ""
#. Tool hint
-#: gtkedit/editcmd.c:1363 gtkedit/editcmd.c:1364
-msgid "Enter the order of replacement of your scanf format specifiers"
+#: gtkedit/editcmd.c:1366 gtkedit/editcmd.c:1367
+msgid ""
+"Enter the order of replacement of your scanf format specifiers or regexp "
+"substrings"
msgstr ""
#. The following are check boxes
-#: gtkedit/editcmd.c:1369
+#: gtkedit/editcmd.c:1372
msgid " Whole words only "
msgstr ""
-#: gtkedit/editcmd.c:1371
+#: gtkedit/editcmd.c:1374
msgid " Case sensitive "
msgstr ""
-#: gtkedit/editcmd.c:1374
+#: gtkedit/editcmd.c:1377
msgid " Regular expression "
msgstr ""
-#: gtkedit/editcmd.c:1375 gtkedit/editcmd.c:1376
+#: gtkedit/editcmd.c:1378 gtkedit/editcmd.c:1379
msgid "See the regex man page for how to compose a regular expression"
msgstr ""
-#: gtkedit/editcmd.c:1382
+#: gtkedit/editcmd.c:1385
msgid " Backwards "
msgstr ""
#. Tool hint
-#: gtkedit/editcmd.c:1384 gtkedit/editcmd.c:1385
+#: gtkedit/editcmd.c:1387 gtkedit/editcmd.c:1388
msgid "Warning: Searching backward can be slow"
msgstr ""
-#: gtkedit/editcmd.c:1398
+#: gtkedit/editcmd.c:1401
msgid " Prompt on replace "
msgstr ""
#. Tool hint
-#: gtkedit/editcmd.c:1400
+#: gtkedit/editcmd.c:1403
msgid "Ask before making each replacement"
msgstr ""
-#: gtkedit/editcmd.c:1402
+#: gtkedit/editcmd.c:1405
msgid " Replace all "
msgstr ""
-#: gtkedit/editcmd.c:1405
+#: gtkedit/editcmd.c:1408
msgid " Scanf expression "
msgstr ""
#. Tool hint
-#: gtkedit/editcmd.c:1407
+#: gtkedit/editcmd.c:1410
msgid "Allows entering of a C format string, see the scanf man page"
msgstr ""
#. Tool hint
-#: gtkedit/editcmd.c:1412
+#: gtkedit/editcmd.c:1415
msgid "Begin search, Enter"
msgstr ""
#. Tool hint
-#: gtkedit/editcmd.c:1415
+#: gtkedit/editcmd.c:1418
msgid "Abort this dialog, Esc"
msgstr ""
#. Buttons for the confirm replace dialog box.
-#: gtkedit/editcmd.c:1578
+#: gtkedit/editcmd.c:1581
msgid "Replace"
msgstr ""
-#: gtkedit/editcmd.c:1578
+#: gtkedit/editcmd.c:1581
msgid "Skip"
msgstr ""
-#: gtkedit/editcmd.c:1578
+#: gtkedit/editcmd.c:1581
msgid "Replace all"
msgstr ""
-#: gtkedit/editcmd.c:1945
+#: gtkedit/editcmd.c:1954
msgid ""
" Invalid regular expression, or scanf expression with to many conversions "
msgstr ""
#. "Invalid regexp string or scanf string"
-#: gtkedit/editcmd.c:2109
+#: gtkedit/editcmd.c:2130
msgid " Error in replacement format string. "
msgstr ""
-#: gtkedit/editcmd.c:2137
+#: gtkedit/editcmd.c:2158
#, c-format
msgid " %ld replacements made. "
msgstr ""
-#: gtkedit/editcmd.c:2140 gtkedit/editcmd.c:2209
+#: gtkedit/editcmd.c:2161 gtkedit/editcmd.c:2230
msgid " Search string not found. "
msgstr ""
#. Confirm 'Quit' dialog box
-#: gtkedit/editcmd.c:2233 gtkedit/editcmd.c:2248 gtkedit/editcmd.c:2251
+#: gtkedit/editcmd.c:2254 gtkedit/editcmd.c:2269 gtkedit/editcmd.c:2272
msgid " Quit "
msgstr ""
-#: gtkedit/editcmd.c:2234 gtkedit/editcmd.c:2252
+#: gtkedit/editcmd.c:2255 gtkedit/editcmd.c:2273
msgid ""
" Current text was modified without a file save. \n"
" Save with exit? "
msgstr ""
-#: gtkedit/editcmd.c:2248
+#: gtkedit/editcmd.c:2269
msgid " File was modified, Save with exit? "
msgstr ""
-#: gtkedit/editcmd.c:2248
+#: gtkedit/editcmd.c:2269
msgid "Cancel quit"
msgstr ""
-#: gtkedit/editcmd.c:2252
+#: gtkedit/editcmd.c:2273
msgid " &Cancel quit "
msgstr ""
-#: gtkedit/editcmd.c:2252
+#: gtkedit/editcmd.c:2273
msgid " &Yes "
msgstr ""
-#: gtkedit/editcmd.c:2252
+#: gtkedit/editcmd.c:2273
msgid " &No "
msgstr ""
-#: gtkedit/editcmd.c:2455 gtkedit/editcmd.c:2530
+#: gtkedit/editcmd.c:2476 gtkedit/editcmd.c:2551
msgid " Copy to clipboard "
msgstr ""
-#: gtkedit/editcmd.c:2455 gtkedit/editcmd.c:2477 gtkedit/editcmd.c:2530
-#: gtkedit/editcmd.c:2543
+#: gtkedit/editcmd.c:2476 gtkedit/editcmd.c:2498 gtkedit/editcmd.c:2551
+#: gtkedit/editcmd.c:2564
msgid " Unable to save to file. "
msgstr ""
-#: gtkedit/editcmd.c:2477 gtkedit/editcmd.c:2543
+#: gtkedit/editcmd.c:2498 gtkedit/editcmd.c:2564
msgid " Cut to clipboard "
msgstr ""
-#: gtkedit/editcmd.c:2565 gtkedit/editcmd.c:2569 gtkedit/editcmd.c:2574
-#: gtkedit/editcmd.c:2577 src/view.c:1852
+#: gtkedit/editcmd.c:2586 gtkedit/editcmd.c:2590 gtkedit/editcmd.c:2595
+#: gtkedit/editcmd.c:2598 src/view.c:1852
msgid " Goto line "
msgstr ""
-#: gtkedit/editcmd.c:2565 gtkedit/editcmd.c:2569 gtkedit/editcmd.c:2574
-#: gtkedit/editcmd.c:2577
+#: gtkedit/editcmd.c:2586 gtkedit/editcmd.c:2590 gtkedit/editcmd.c:2595
+#: gtkedit/editcmd.c:2598
msgid " Enter line: "
msgstr ""
-#: gtkedit/editcmd.c:2598 gtkedit/editcmd.c:2615
+#: gtkedit/editcmd.c:2619 gtkedit/editcmd.c:2636
msgid " Save Block "
msgstr ""
-#: gtkedit/editcmd.c:2649
+#: gtkedit/editcmd.c:2670
msgid " Insert File "
msgstr ""
-#: gtkedit/editcmd.c:2664
+#: gtkedit/editcmd.c:2685
msgid " Insert file "
msgstr ""
-#: gtkedit/editcmd.c:2664
+#: gtkedit/editcmd.c:2685
msgid " Error trying to insert file. "
msgstr ""
#. Not essential to translate
-#: gtkedit/editcmd.c:2684
+#: gtkedit/editcmd.c:2705
msgid " Sort block "
msgstr ""
#. Not essential to translate
-#: gtkedit/editcmd.c:2684 gtkedit/editcmd.c:2738
+#: gtkedit/editcmd.c:2705 gtkedit/editcmd.c:2759
msgid " You must first highlight a block of text. "
msgstr ""
-#: gtkedit/editcmd.c:2691
+#: gtkedit/editcmd.c:2712
msgid " Run Sort "
msgstr ""
#. Not essential to translate
-#: gtkedit/editcmd.c:2693
+#: gtkedit/editcmd.c:2714
msgid " Enter sort options (see manpage) separated by whitespace: "
msgstr ""
-#: gtkedit/editcmd.c:2704 gtkedit/editcmd.c:2710
+#: gtkedit/editcmd.c:2725 gtkedit/editcmd.c:2731
msgid " Sort "
msgstr ""
#. Not essential to translate
-#: gtkedit/editcmd.c:2706
+#: gtkedit/editcmd.c:2727
msgid " Error trying to execute sort command "
msgstr ""
#. Not essential to translate
-#: gtkedit/editcmd.c:2712
+#: gtkedit/editcmd.c:2733
msgid " Sort returned non-zero: "
msgstr ""
#. Not essential to translate
-#: gtkedit/editcmd.c:2736 gtkedit/editcmd.c:2766
+#: gtkedit/editcmd.c:2757 gtkedit/editcmd.c:2787
msgid " Process block "
msgstr ""
#. Not essential to translate
-#: gtkedit/editcmd.c:2768
+#: gtkedit/editcmd.c:2789
msgid " Error trying to stat file "
msgstr ""
-#: gtkedit/editcmd.c:2838
+#: gtkedit/editcmd.c:2859
msgid " Mail "
msgstr ""
-#: gtkedit/editcmd.c:2851
+#: gtkedit/editcmd.c:2872
msgid " Copies to"
msgstr ""
-#: gtkedit/editcmd.c:2855
+#: gtkedit/editcmd.c:2876
msgid " Subject"
msgstr ""
-#: gtkedit/editcmd.c:2859
+#: gtkedit/editcmd.c:2880
msgid " To"
msgstr ""
-#: gtkedit/editcmd.c:2861
+#: gtkedit/editcmd.c:2882
msgid " mail -s <subject> -c <cc> <to>"
msgstr ""
-#: gtkedit/editoptions.c:34
+#: gtkedit/editoptions.c:36
msgid "Intuitive"
msgstr ""
-#: gtkedit/editoptions.c:34
+#: gtkedit/editoptions.c:36
msgid "Emacs"
msgstr ""
-#: gtkedit/editoptions.c:37
+#: gtkedit/editoptions.c:39
msgid "None"
msgstr ""
-#: gtkedit/editoptions.c:37
+#: gtkedit/editoptions.c:39
msgid "Dynamic paragraphing"
msgstr ""
-#: gtkedit/editoptions.c:37
+#: gtkedit/editoptions.c:39
msgid "Type writer wrap"
msgstr ""
#. 2
-#: gtkedit/editoptions.c:72
+#: gtkedit/editoptions.c:74
msgid "Word wrap line length : "
msgstr ""
#. 4
-#: gtkedit/editoptions.c:78
+#: gtkedit/editoptions.c:80
msgid "Tab spacing : "
msgstr ""
-#: gtkedit/editoptions.c:86
+#: gtkedit/editoptions.c:88
msgid "synta&X highlighting"
msgstr ""
#. 7
-#: gtkedit/editoptions.c:92
+#: gtkedit/editoptions.c:94
msgid "confir&M before saving"
msgstr ""
#. 8
-#: gtkedit/editoptions.c:95
+#: gtkedit/editoptions.c:97
msgid "fill tabs with &Spaces"
msgstr ""
#. 9
-#: gtkedit/editoptions.c:98
+#: gtkedit/editoptions.c:100
msgid "&Return does autoindent"
msgstr ""
#. 10
-#: gtkedit/editoptions.c:101
+#: gtkedit/editoptions.c:103
msgid "&Backspace through tabs"
msgstr ""
#. 11
-#: gtkedit/editoptions.c:104
+#: gtkedit/editoptions.c:106
msgid "&Fake half tabs"
msgstr ""
#. 13
-#: gtkedit/editoptions.c:110
+#: gtkedit/editoptions.c:112
msgid "Wrap mode"
msgstr ""
#. 15
-#: gtkedit/editoptions.c:116
+#: gtkedit/editoptions.c:118
msgid "Key emulation"
msgstr ""
-#: gtkedit/editoptions.c:157
+#: gtkedit/editoptions.c:159
msgid " Editor options "
msgstr ""
#. Not essential to translate
-#: gtkedit/editwidget.c:310
+#: gtkedit/editwidget.c:312
msgid "Error initialising editor.\n"
msgstr ""
-#: gtkedit/editwidget.c:1063 src/help.c:806 src/main.c:1688 src/screen.c:2304
-#: src/screen.c:2334 src/tree.c:1018 src/view.c:1982
+#: gtkedit/editwidget.c:1065 src/help.c:806 src/main.c:1691 src/screen.c:2297
+#: src/screen.c:2327 src/tree.c:1018 src/view.c:1982
msgid "Help"
msgstr ""
-#: gtkedit/editwidget.c:1065
+#: gtkedit/editwidget.c:1067
msgid "Mark"
msgstr ""
-#: gtkedit/editwidget.c:1066
+#: gtkedit/editwidget.c:1068
msgid "Replac"
msgstr ""
-#: gtkedit/editwidget.c:1069 src/view.c:1995
+#: gtkedit/editwidget.c:1071 src/view.c:1995
msgid "Search"
msgstr ""
-#: gtkedit/editwidget.c:1072 src/main.c:1690
+#: gtkedit/editwidget.c:1074 src/main.c:1693
msgid "PullDn"
msgstr ""
-#: gtkedit/editwidget.c:1073 src/help.c:818 src/main.c:1691 src/view.c:1984
+#: gtkedit/editwidget.c:1075 src/help.c:818 src/main.c:1694 src/view.c:1984
#: src/view.c:2004
msgid "Quit"
msgstr ""
-#: gtkedit/editmenu.c:56
+#: gtkedit/editmenu.c:57
msgid " Word wrap "
msgstr ""
#. Not essential to translate
-#: gtkedit/editmenu.c:58
+#: gtkedit/editmenu.c:59
msgid " Enter line length, 0 for off: "
msgstr ""
-#: gtkedit/editmenu.c:69
+#: gtkedit/editmenu.c:70
msgid " About "
msgstr ""
-#: gtkedit/editmenu.c:70
+#: gtkedit/editmenu.c:71
msgid ""
"\n"
" Cooledit v2.1\n"
@@ -1800,325 +2088,341 @@
" for the Midnight Commander.\n"
msgstr ""
-#: gtkedit/editmenu.c:118 gtkedit/editmenu.c:134
+#: gtkedit/editmenu.c:119 gtkedit/editmenu.c:135
msgid "&Open/load... C-o"
msgstr ""
-#: gtkedit/editmenu.c:119
+#: gtkedit/editmenu.c:120
msgid "&New C-n"
msgstr ""
-#: gtkedit/editmenu.c:121 gtkedit/editmenu.c:137
+#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138
msgid "&Save F2"
msgstr ""
-#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138
+#: gtkedit/editmenu.c:123 gtkedit/editmenu.c:139
msgid "save &As... F12"
msgstr ""
-#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140
+#: gtkedit/editmenu.c:125 gtkedit/editmenu.c:141
msgid "&Insert file... F15"
msgstr ""
-#: gtkedit/editmenu.c:125
+#: gtkedit/editmenu.c:126
msgid "copy to &File... C-f"
msgstr ""
-#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143
+#: gtkedit/editmenu.c:128 gtkedit/editmenu.c:144
msgid "a&Bout... "
msgstr ""
-#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145
+#: gtkedit/editmenu.c:130 gtkedit/editmenu.c:146
msgid "&Quit F10"
msgstr ""
-#: gtkedit/editmenu.c:135
+#: gtkedit/editmenu.c:136
msgid "&New C-x k"
msgstr ""
-#: gtkedit/editmenu.c:141
+#: gtkedit/editmenu.c:142
msgid "copy to &File... "
msgstr ""
-#: gtkedit/editmenu.c:150 gtkedit/editmenu.c:167
+#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168
msgid "&Toggle Mark F3"
msgstr ""
-#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168
+#: gtkedit/editmenu.c:152 gtkedit/editmenu.c:169
msgid "&Mark Columns S-F3"
msgstr ""
-#: gtkedit/editmenu.c:153 gtkedit/editmenu.c:170
+#: gtkedit/editmenu.c:154 gtkedit/editmenu.c:171
msgid "toggle &Ins/overw Ins"
msgstr ""
-#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172
+#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173
msgid "&Copy F5"
msgstr ""
-#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173
+#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174
msgid "&Move F6"
msgstr ""
-#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174
+#: gtkedit/editmenu.c:158 gtkedit/editmenu.c:175
msgid "&Delete F8"
msgstr ""
-#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176
+#: gtkedit/editmenu.c:160 gtkedit/editmenu.c:177
msgid "&Undo C-u"
msgstr ""
-#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178
+#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179
msgid "&Beginning C-PgUp"
msgstr ""
-#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179
+#: gtkedit/editmenu.c:163 gtkedit/editmenu.c:180
msgid "&End C-PgDn"
msgstr ""
-#: gtkedit/editmenu.c:184 gtkedit/editmenu.c:191
+#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192
msgid "&Search... F7"
msgstr ""
-#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192
+#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193
msgid "search &Again F17"
msgstr ""
-#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193
+#: gtkedit/editmenu.c:187 gtkedit/editmenu.c:194
msgid "&Replace... F4"
msgstr ""
-#: gtkedit/editmenu.c:198 gtkedit/editmenu.c:220
+#: gtkedit/editmenu.c:199 gtkedit/editmenu.c:221
msgid "&Goto line... M-l"
msgstr ""
-#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:222
+#: gtkedit/editmenu.c:201 gtkedit/editmenu.c:223
msgid "insert &Literal... C-q"
msgstr ""
-#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:224
+#: gtkedit/editmenu.c:203 gtkedit/editmenu.c:225
msgid "&Refresh screen C-l"
msgstr ""
-#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:226
+#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227
msgid "&Start record macro C-r"
msgstr ""
-#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227
+#: gtkedit/editmenu.c:206 gtkedit/editmenu.c:228
msgid "&Finish record macro... C-r"
msgstr ""
-#: gtkedit/editmenu.c:206
+#: gtkedit/editmenu.c:207
msgid "&Execute macro... C-a, KEY"
msgstr ""
-#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229
+#: gtkedit/editmenu.c:208 gtkedit/editmenu.c:230
msgid "delete macr&O... "
msgstr ""
-#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231
+#: gtkedit/editmenu.c:210 gtkedit/editmenu.c:232
msgid "insert &Date/time "
msgstr ""
-#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:233
+#: gtkedit/editmenu.c:212 gtkedit/editmenu.c:234
msgid "format p&Aragraph M-p"
msgstr ""
-#: gtkedit/editmenu.c:212
+#: gtkedit/editmenu.c:213
msgid "'ispell' s&Pell check C-p"
msgstr ""
-#: gtkedit/editmenu.c:213 gtkedit/editmenu.c:235
+#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236
msgid "sor&T... M-t"
msgstr ""
-#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236
+#: gtkedit/editmenu.c:215 gtkedit/editmenu.c:237
msgid "'indent' &C Formatter F19"
msgstr ""
-#: gtkedit/editmenu.c:215
+#: gtkedit/editmenu.c:216
msgid "&Mail... "
msgstr ""
-#: gtkedit/editmenu.c:228
+#: gtkedit/editmenu.c:229
msgid "&Execute macro... C-x e, KEY"
msgstr ""
-#: gtkedit/editmenu.c:234
+#: gtkedit/editmenu.c:235
msgid "'ispell' s&Pell check M-$"
msgstr ""
-#: gtkedit/editmenu.c:243 gtkedit/editmenu.c:252
+#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253
msgid "&General... "
msgstr ""
-#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253
+#: gtkedit/editmenu.c:245 gtkedit/editmenu.c:254
msgid "&Save mode..."
msgstr ""
-#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1322
+#: gtkedit/editmenu.c:247 gtkedit/editmenu.c:256 src/main.c:1325
msgid "&Layout..."
msgstr ""
#. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t'
-#: gtkedit/editmenu.c:265 gtkedit/editmenu.c:274 gtkedit/editmenu.c:391
+#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:392
#: src/chmod.c:164 src/chown.c:130
msgid " File "
msgstr ""
-#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:407
+#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276 gtkedit/editmenu.c:408
msgid " Edit "
msgstr ""
-#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276
+#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277
msgid " Sear/Repl "
msgstr ""
-#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277 gtkedit/editmenu.c:442
+#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278 gtkedit/editmenu.c:448
msgid " Command "
msgstr ""
-#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278
+#: gtkedit/editmenu.c:270 gtkedit/editmenu.c:279
msgid " Options "
msgstr ""
-#: gtkedit/editmenu.c:392
+#: gtkedit/editmenu.c:393
msgid "Open...\tC-o"
msgstr ""
-#: gtkedit/editmenu.c:393
+#: gtkedit/editmenu.c:394
msgid "New\tC-n"
msgstr ""
-#: gtkedit/editmenu.c:395
+#: gtkedit/editmenu.c:396
msgid "Save\tF2"
msgstr ""
-#: gtkedit/editmenu.c:396
+#: gtkedit/editmenu.c:397
msgid "Save as...\tF12"
msgstr ""
-#: gtkedit/editmenu.c:398
+#: gtkedit/editmenu.c:399
msgid "Insert file...\tF15"
msgstr ""
-#: gtkedit/editmenu.c:399
+#: gtkedit/editmenu.c:400
msgid "Copy to file...\tC-f"
msgstr ""
#. Tool hint
-#: gtkedit/editmenu.c:402
+#: gtkedit/editmenu.c:403
msgid "Disk operations"
msgstr ""
-#: gtkedit/editmenu.c:408
+#: gtkedit/editmenu.c:409
msgid "Toggle mark\tF3"
msgstr ""
-#: gtkedit/editmenu.c:409
+#: gtkedit/editmenu.c:410
msgid "Toggle mark columns\tC-b"
msgstr ""
-#: gtkedit/editmenu.c:411
-msgid "Toggle insert/overwrite\tIns"
+#: gtkedit/editmenu.c:412
+msgid "Toggle book mark\tC-M-Ins"
msgstr ""
#: gtkedit/editmenu.c:413
-msgid "Copy block to cursor\tF5"
+msgid "Previous book mark\tC-M-Up"
msgstr ""
#: gtkedit/editmenu.c:414
-msgid "Move block to cursor\tF6"
+msgid "Next book mark\tC-M-Down"
msgstr ""
#: gtkedit/editmenu.c:415
-msgid "Delete block\tF8/C-Del"
+msgid "Flush book marks"
msgstr ""
#: gtkedit/editmenu.c:417
+msgid "Toggle insert/overwrite\tIns"
+msgstr ""
+
+#: gtkedit/editmenu.c:419
+msgid "Copy block to cursor\tF5"
+msgstr ""
+
+#: gtkedit/editmenu.c:420
+msgid "Move block to cursor\tF6"
+msgstr ""
+
+#: gtkedit/editmenu.c:421
+msgid "Delete block\tF8/C-Del"
+msgstr ""
+
+#: gtkedit/editmenu.c:423
msgid "Copy block to clipbrd\tC-Ins"
msgstr ""
-#: gtkedit/editmenu.c:418
+#: gtkedit/editmenu.c:424
msgid "Cut block to clipbrd\tS-Del"
msgstr ""
-#: gtkedit/editmenu.c:419
+#: gtkedit/editmenu.c:425
msgid "Paste block from clipbrd\tS-Ins"
msgstr ""
-#: gtkedit/editmenu.c:420
+#: gtkedit/editmenu.c:426
msgid "Selection history\tM-Ins"
msgstr ""
-#: gtkedit/editmenu.c:422
+#: gtkedit/editmenu.c:428
msgid "Undo\tC-BackSpace"
msgstr ""
#. Tool hint
-#: gtkedit/editmenu.c:425
+#: gtkedit/editmenu.c:431
msgid "Manipulating blocks of text"
msgstr ""
-#: gtkedit/editmenu.c:430
+#: gtkedit/editmenu.c:436
msgid " Srch/Replce "
msgstr ""
-#: gtkedit/editmenu.c:431
+#: gtkedit/editmenu.c:437
msgid "Search...\tF7"
msgstr ""
-#: gtkedit/editmenu.c:432
+#: gtkedit/editmenu.c:438
msgid "Search again\tF17"
msgstr ""
-#: gtkedit/editmenu.c:433
+#: gtkedit/editmenu.c:439
msgid "Replace...\tF4"
msgstr ""
-#: gtkedit/editmenu.c:434
+#: gtkedit/editmenu.c:440
msgid "Replace again\tF14"
msgstr ""
#. Tool hint
-#: gtkedit/editmenu.c:437
+#: gtkedit/editmenu.c:443
msgid "Search for and replace text"
msgstr ""
-#: gtkedit/editmenu.c:443
+#: gtkedit/editmenu.c:449
msgid "Goto line...\tM-l"
msgstr ""
-#: gtkedit/editmenu.c:445
+#: gtkedit/editmenu.c:451
msgid "Start record macro\tC-r"
msgstr ""
-#: gtkedit/editmenu.c:446
+#: gtkedit/editmenu.c:452
msgid "Finish record macro...\tC-r"
msgstr ""
-#: gtkedit/editmenu.c:447
+#: gtkedit/editmenu.c:453
msgid "Execute macro...\tC-a, KEY"
msgstr ""
-#: gtkedit/editmenu.c:448
+#: gtkedit/editmenu.c:454
msgid "Delete macro...\t"
msgstr ""
-#: gtkedit/editmenu.c:450
+#: gtkedit/editmenu.c:456
msgid "Insert date/time\tC-d"
msgstr ""
-#: gtkedit/editmenu.c:451
+#: gtkedit/editmenu.c:457
msgid "Format paragraph\tM-p"
msgstr ""
-#: gtkedit/editmenu.c:453
+#: gtkedit/editmenu.c:459
msgid "Refresh display\tC-l"
msgstr ""
#. Tool hint
-#: gtkedit/editmenu.c:456
+#: gtkedit/editmenu.c:462
msgid "Macros and internal commands"
msgstr ""
@@ -2163,17 +2467,17 @@
msgid "Search/Replace"
msgstr ""
-#: gtkedit/syntax.c:3180 gtkedit/syntax.c:3187
+#: gtkedit/syntax.c:1339 gtkedit/syntax.c:1346
msgid " Load syntax file "
msgstr ""
-#: gtkedit/syntax.c:3180
+#: gtkedit/syntax.c:1339
msgid " File access error "
msgstr ""
-#: gtkedit/syntax.c:3186
+#: gtkedit/syntax.c:1345
#, c-format
-msgid " Syntax error in file %s on line %d "
+msgid " Error in file %s on line %d "
msgstr ""
#: src/achown.c:72 src/chmod.c:115 src/chown.c:80
@@ -2208,10 +2512,6 @@
msgid "Flag"
msgstr ""
-#: src/achown.c:378
-msgid "Mode"
-msgstr ""
-
#: src/achown.c:383
#, c-format
msgid "%6d of %d"
@@ -2254,7 +2554,7 @@
msgid "Background process:"
msgstr ""
-#: src/background.c:287 src/file.c:2171
+#: src/background.c:287 src/file.c:2173
msgid " Background process error "
msgstr ""
@@ -3293,64 +3593,64 @@
msgid " Sorry, I could not put the job in background "
msgstr ""
-#: src/file.c:1996 src/file.c:2080
+#: src/file.c:1997 src/file.c:2081
msgid " Internal failure "
msgstr ""
-#: src/file.c:1996 src/file.c:2080
+#: src/file.c:1997 src/file.c:2081
msgid " Unknown file operation "
msgstr ""
-#: src/file.c:2011
+#: src/file.c:2012
#, c-format
msgid ""
" Destination \"%s\" must be a directory \n"
" %s "
msgstr ""
-#: src/file.c:2172
+#: src/file.c:2174
msgid "&Retry"
msgstr ""
-#: src/file.c:2172 src/file.c:2233 src/filegui.c:263 src/filegui.c:591
+#: src/file.c:2174 src/file.c:2235 src/filegui.c:263 src/filegui.c:591
msgid "&Abort"
msgstr ""
-#: src/file.c:2224
+#: src/file.c:2226
msgid ""
"\n"
" Directory not empty. \n"
" Delete it recursively? "
msgstr ""
-#: src/file.c:2225
+#: src/file.c:2227
msgid ""
"\n"
" Background process: Directory not empty \n"
" Delete it recursively? "
msgstr ""
-#: src/file.c:2232
+#: src/file.c:2234
msgid "a&ll"
msgstr ""
-#: src/file.c:2232 src/filegui.c:594
+#: src/file.c:2234 src/filegui.c:594
msgid "non&E"
msgstr ""
-#: src/file.c:2242
+#: src/file.c:2244
msgid " Type 'yes' if you REALLY want to delete "
msgstr ""
-#: src/file.c:2244
+#: src/file.c:2246
msgid "all the directories "
msgstr ""
-#: src/file.c:2246
+#: src/file.c:2248
msgid " Recursive Delete "
msgstr ""
-#: src/file.c:2247
+#: src/file.c:2249
msgid " Background process: Recursive Delete "
msgstr ""
@@ -3508,7 +3808,7 @@
msgid "Content: "
msgstr ""
-#: src/find.c:171 src/main.c:1219 src/main.c:1240
+#: src/find.c:171 src/main.c:1222 src/main.c:1243
msgid "&Tree"
msgstr ""
@@ -4047,7 +4347,7 @@
msgid "key, or click with the mouse to define it. Move around with Tab."
msgstr ""
-#: src/main.c:692
+#: src/main.c:695
msgid ""
" The Commander can't change to the directory that \n"
" the subshell claims you are in. Perhaps you have \n"
@@ -4055,247 +4355,247 @@
" extra access permissions with the \"su\" command? "
msgstr ""
-#: src/main.c:767
+#: src/main.c:770
msgid "Press any key to continue..."
msgstr ""
-#: src/main.c:817
+#: src/main.c:820
msgid " The shell is already running a command "
msgstr ""
-#: src/main.c:1216 src/main.c:1237
+#: src/main.c:1219 src/main.c:1240
msgid "&Listing mode..."
msgstr ""
-#: src/main.c:1217 src/main.c:1238
+#: src/main.c:1220 src/main.c:1241
msgid "&Quick view C-x q"
msgstr ""
-#: src/main.c:1218 src/main.c:1239
+#: src/main.c:1221 src/main.c:1242
msgid "&Info C-x i"
msgstr ""
-#: src/main.c:1221 src/main.c:1242
+#: src/main.c:1224 src/main.c:1245
msgid "&Sort order..."
msgstr ""
-#: src/main.c:1223 src/main.c:1244
+#: src/main.c:1226 src/main.c:1247
msgid "&Filter..."
msgstr ""
-#: src/main.c:1226 src/main.c:1247
+#: src/main.c:1229 src/main.c:1250
msgid "&Network link..."
msgstr ""
-#: src/main.c:1227 src/main.c:1248
+#: src/main.c:1230 src/main.c:1251
msgid "FT&P link..."
msgstr ""
-#: src/main.c:1231 src/main.c:1252
+#: src/main.c:1234 src/main.c:1255
msgid "&Drive... M-d"
msgstr ""
-#: src/main.c:1233 src/main.c:1254
+#: src/main.c:1236 src/main.c:1257
msgid "&Rescan C-r"
msgstr ""
-#: src/main.c:1258
+#: src/main.c:1261
msgid "&User menu F2"
msgstr ""
-#: src/main.c:1259
+#: src/main.c:1262
msgid "&View F3"
msgstr ""
-#: src/main.c:1260
+#: src/main.c:1263
msgid "Vie&w file... "
msgstr ""
-#: src/main.c:1261
+#: src/main.c:1264
msgid "&Filtered view M-!"
msgstr ""
-#: src/main.c:1262
+#: src/main.c:1265
msgid "&Edit F4"
msgstr ""
-#: src/main.c:1263
+#: src/main.c:1266
msgid "&Copy F5"
msgstr ""
-#: src/main.c:1264
+#: src/main.c:1267
msgid "c&Hmod C-x c"
msgstr ""
-#: src/main.c:1266
+#: src/main.c:1269
msgid "&Link C-x l"
msgstr ""
-#: src/main.c:1267
+#: src/main.c:1270
msgid "&SymLink C-x s"
msgstr ""
-#: src/main.c:1268
+#: src/main.c:1271
msgid "edit s&Ymlink C-x C-s"
msgstr ""
-#: src/main.c:1269
+#: src/main.c:1272
msgid "ch&Own C-x o"
msgstr ""
-#: src/main.c:1270
+#: src/main.c:1273
msgid "&Advanced chown "
msgstr ""
-#: src/main.c:1272
+#: src/main.c:1275
msgid "&Rename/Move F6"
msgstr ""
-#: src/main.c:1273
+#: src/main.c:1276
msgid "&Mkdir F7"
msgstr ""
-#: src/main.c:1274
+#: src/main.c:1277
msgid "&Delete F8"
msgstr ""
-#: src/main.c:1275
+#: src/main.c:1278
msgid "&Quick cd M-c"
msgstr ""
-#: src/main.c:1277
+#: src/main.c:1280
msgid "select &Group M-+"
msgstr ""
-#: src/main.c:1278
+#: src/main.c:1281
msgid "u&Nselect group M-\\"
msgstr ""
-#: src/main.c:1279
+#: src/main.c:1282
msgid "reverse selec&Tion M-*"
msgstr ""
-#: src/main.c:1281
+#: src/main.c:1284
msgid "e&Xit F10"
msgstr ""
-#: src/main.c:1291
+#: src/main.c:1294
msgid "&Directory tree"
msgstr ""
-#: src/main.c:1293
+#: src/main.c:1296
msgid "&Find file M-?"
msgstr ""
-#: src/main.c:1294
+#: src/main.c:1297
msgid "s&Wap panels C-u"
msgstr ""
-#: src/main.c:1295
+#: src/main.c:1298
msgid "switch &Panels on/off C-o"
msgstr ""
-#: src/main.c:1296
+#: src/main.c:1299
msgid "&Compare directories C-x d"
msgstr ""
-#: src/main.c:1297
+#: src/main.c:1300
msgid "e&Xternal panelize C-x !"
msgstr ""
-#: src/main.c:1298
+#: src/main.c:1301
msgid "show directory s&Izes"
msgstr ""
-#: src/main.c:1300
+#: src/main.c:1303
msgid "command &History"
msgstr ""
-#: src/main.c:1301
+#: src/main.c:1304
msgid "di&Rectory hotlist C-\\"
msgstr ""
-#: src/main.c:1303
+#: src/main.c:1306
msgid "&Active VFS list C-x a"
msgstr ""
-#: src/main.c:1306
+#: src/main.c:1309
msgid "&Background jobs C-x j"
msgstr ""
-#: src/main.c:1310
+#: src/main.c:1313
msgid "&Undelete files (ext2fs only)"
msgstr ""
-#: src/main.c:1313
+#: src/main.c:1316
msgid "&Listing format edit"
msgstr ""
-#: src/main.c:1315
+#: src/main.c:1318
msgid "&Extension file edit"
msgstr ""
-#: src/main.c:1316
+#: src/main.c:1319
msgid "&Menu file edit"
msgstr ""
-#: src/main.c:1321
+#: src/main.c:1324
msgid "&Configuration..."
msgstr ""
-#: src/main.c:1323
+#: src/main.c:1326
msgid "c&Onfirmation..."
msgstr ""
-#: src/main.c:1324
+#: src/main.c:1327
msgid "&Display bits..."
msgstr ""
-#: src/main.c:1326
+#: src/main.c:1329
msgid "learn &Keys..."
msgstr ""
-#: src/main.c:1329
+#: src/main.c:1332
msgid "&Virtual FS..."
msgstr ""
-#: src/main.c:1332
+#: src/main.c:1335
msgid "&Save setup"
msgstr ""
-#: src/main.c:1348 src/main.c:1350
+#: src/main.c:1351 src/main.c:1353
msgid " &Left "
msgstr ""
-#: src/main.c:1350
+#: src/main.c:1353
msgid " &Above "
msgstr ""
-#: src/main.c:1353
+#: src/main.c:1356
msgid " &File "
msgstr ""
-#: src/main.c:1354
+#: src/main.c:1357
msgid " &Command "
msgstr ""
-#: src/main.c:1355
+#: src/main.c:1358
msgid " &Options "
msgstr ""
-#: src/main.c:1357 src/main.c:1359
+#: src/main.c:1360 src/main.c:1362
msgid " &Right "
msgstr ""
-#: src/main.c:1359
+#: src/main.c:1362
msgid " &Below "
msgstr ""
-#: src/main.c:1414
+#: src/main.c:1417
msgid " Information "
msgstr ""
-#: src/main.c:1415
+#: src/main.c:1418
msgid ""
" Using the fast reload option may not reflect the exact \n"
" directory contents. In this cases you'll need to do a \n"
@@ -4303,140 +4603,144 @@
" the details. "
msgstr ""
-#: src/main.c:1689 src/screen.c:2305 src/screen.c:2335
+#: src/main.c:1692 src/screen.c:2298 src/screen.c:2328
msgid "Menu"
msgstr ""
-#: src/main.c:1894
+#: src/main.c:1897
msgid "Thank you for using GNU Midnight Commander"
msgstr ""
-#: src/main.c:2253
+#: src/main.c:2256
#, c-format
msgid "with mouse support on xterm%s.\n"
msgstr ""
-#: src/main.c:2254
+#: src/main.c:2257
msgid " and the Linux console"
msgstr ""
-#: src/main.c:2349
+#: src/main.c:2352
msgid "The TERM environment variable is unset!\n"
msgstr ""
-#: src/main.c:2556
+#: src/main.c:2559
#, c-format
msgid "Library directory for the Midnight Commander: %s\n"
msgstr ""
-#: src/main.c:2567
+#: src/main.c:2570
msgid ""
"Option -m is obsolete. Please look at Display Bits... in the Option's menu\n"
msgstr ""
-#: src/main.c:2646
+#: src/main.c:2649
msgid "Use to debug the background code"
msgstr ""
-#: src/main.c:2652
+#: src/main.c:2655
msgid "Request to run in color mode"
msgstr ""
-#: src/main.c:2654
+#: src/main.c:2657
msgid "Specifies a color configuration"
msgstr ""
-#: src/main.c:2659
+#: src/main.c:2662
msgid "Edits one file"
msgstr ""
-#: src/main.c:2663
+#: src/main.c:2666
msgid "Displays this help message"
msgstr ""
-#: src/main.c:2666
+#: src/main.c:2669
msgid "Displays a help screen on how to change the color scheme"
msgstr ""
-#: src/main.c:2669
+#: src/main.c:2672
msgid "Log ftp dialog to specified file"
msgstr ""
-#: src/main.c:2676
+#: src/main.c:2679
msgid "Obsolete"
msgstr ""
-#: src/main.c:2678
+#: src/main.c:2681
msgid "Requests to run in black and white"
msgstr ""
-#: src/main.c:2680
+#: src/main.c:2683
msgid "Disable mouse support in text version"
msgstr ""
-#: src/main.c:2683
+#: src/main.c:2686
msgid "Disables subshell support"
msgstr ""
-#: src/main.c:2687
+#: src/main.c:2690
msgid "Prints working directory at program exit"
msgstr ""
-#: src/main.c:2689
+#: src/main.c:2692
msgid "Resets soft keys on HP terminals"
msgstr ""
-#: src/main.c:2691
+#: src/main.c:2694
msgid "To run on slow terminals"
msgstr ""
-#: src/main.c:2694
+#: src/main.c:2697
msgid "Use stickchars to draw"
msgstr ""
-#: src/main.c:2698
+#: src/main.c:2701
msgid "Enables subshell support (default)"
msgstr ""
-#: src/main.c:2703
+#: src/main.c:2706
msgid "Tries to use termcap instead of terminfo"
msgstr ""
-#: src/main.c:2707
+#: src/main.c:2710
msgid "Displays the current version"
msgstr ""
-#: src/main.c:2709
+#: src/main.c:2712
msgid "Launches the file viewer on a file"
msgstr ""
-#: src/main.c:2711
+#: src/main.c:2714
msgid "Forces xterm features"
msgstr ""
-#: src/main.c:2713
+#: src/main.c:2716
msgid "Geometry for the window"
msgstr ""
-#: src/main.c:2713
+#: src/main.c:2716
msgid "GEOMETRY"
msgstr ""
-#: src/main.c:2714
+#: src/main.c:2717
msgid "No windows opened at startup"
msgstr ""
-#: src/main.c:2715
+#: src/main.c:2718
msgid "Force activation even if a server is already running"
msgstr ""
-#: src/main.c:2987
+#: src/main.c:2720
+msgid "Displays the directory that holds the .links startup files"
+msgstr ""
+
+#: src/main.c:2996
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:3063
+#: src/main.c:3072
msgid ""
"You are running the GNOME Midnight Commander as root. \n"
"\n"
@@ -4444,11 +4748,11 @@
"if you continue."
msgstr ""
-#: src/main.c:3073
+#: src/main.c:3087
msgid " Notice "
msgstr ""
-#: src/main.c:3074
+#: src/main.c:3088
msgid ""
" The Midnight Commander configuration files \n"
" are now stored in the ~/.mc directory, the \n"
@@ -4616,68 +4920,64 @@
msgid "Display brief usage message"
msgstr ""
-#: src/screen.c:429
+#: src/screen.c:399
msgid "MTime"
msgstr ""
-#: src/screen.c:430
+#: src/screen.c:400
msgid "ATime"
msgstr ""
-#: src/screen.c:431
+#: src/screen.c:401
msgid "CTime"
msgstr ""
-#: src/screen.c:432
-msgid "Permission"
-msgstr ""
-
-#: src/screen.c:433
+#: src/screen.c:403
msgid "Perm"
msgstr ""
-#: src/screen.c:434
+#: src/screen.c:404
msgid "Nl"
msgstr ""
-#: src/screen.c:435
+#: src/screen.c:405
msgid "Inode"
msgstr ""
-#: src/screen.c:436
+#: src/screen.c:406
msgid "UID"
msgstr ""
-#: src/screen.c:437
+#: src/screen.c:407
msgid "GID"
msgstr ""
-#: src/screen.c:650
+#: src/screen.c:643
#, c-format
msgid " %s bytes in %d file%s"
msgstr ""
-#: src/screen.c:1306
+#: src/screen.c:1299
msgid "Unknow tag on display format: "
msgstr ""
-#: src/screen.c:2068
+#: src/screen.c:2061
msgid " Do you really want to execute? "
msgstr ""
-#: src/screen.c:2083
+#: src/screen.c:2076
msgid " No action taken "
msgstr ""
-#: src/screen.c:2309 src/screen.c:2339 src/tree.c:1026
+#: src/screen.c:2302 src/screen.c:2332 src/tree.c:1026
msgid "RenMov"
msgstr ""
-#: src/screen.c:2310 src/screen.c:2340 src/tree.c:1030
+#: src/screen.c:2303 src/screen.c:2333 src/tree.c:1030
msgid "Mkdir"
msgstr ""
-#: src/screen.c:2326
+#: src/screen.c:2319
#, c-format
msgid ""
" Can't chdir to %s \n"
@@ -5161,9 +5461,151 @@
msgid "Sorry, we can not do password authenticated connections for now."
msgstr ""
+#: vfs/ftpfs.c:326
+#, c-format
+msgid "ftpfs: Disconnecting from %s"
+msgstr ""
+
+#: vfs/ftpfs.c:377
+msgid " FTP: Password required for "
+msgstr ""
+
+#: vfs/ftpfs.c:409
+msgid " Proxy: Password required for "
+msgstr ""
+
+#: vfs/ftpfs.c:435
+msgid "ftpfs: sending proxy login name"
+msgstr ""
+
+#: vfs/ftpfs.c:439
+msgid "ftpfs: sending proxy user password"
+msgstr ""
+
+#: vfs/ftpfs.c:443
+msgid "ftpfs: proxy authentication succeeded"
+msgstr ""
+
+#: vfs/ftpfs.c:447
+#, c-format
+msgid "ftpfs: connected to %s"
+msgstr ""
+
+#: vfs/ftpfs.c:464
+msgid "ftpfs: sending login name"
+msgstr ""
+
+#: vfs/ftpfs.c:469
+msgid "ftpfs: sending user password"
+msgstr ""
+
+#: vfs/ftpfs.c:474
+msgid "ftpfs: logged in"
+msgstr ""
+
+#: vfs/ftpfs.c:489
+#, c-format
+msgid "ftpfs: Login incorrect for user %s "
+msgstr ""
+
#: vfs/ftpfs.c:521
#, c-format
msgid " Could not set source routing (%s)"
+msgstr ""
+
+#: vfs/ftpfs.c:650
+msgid "ftpfs: Invalid host name."
+msgstr ""
+
+#: vfs/ftpfs.c:670
+msgid "ftpfs: Invalid host address."
+msgstr ""
+
+#: vfs/ftpfs.c:695
+#, c-format
+msgid "ftpfs: making connection to %s"
+msgstr ""
+
+#: vfs/ftpfs.c:705
+msgid "ftpfs: connection interrupted by user"
+msgstr ""
+
+#: vfs/ftpfs.c:707
+#, c-format
+msgid "ftpfs: connection to server failed: %s"
+msgstr ""
+
+#: vfs/ftpfs.c:791
+#, c-format
+msgid "Waiting to retry... %d (Control-C to cancel)"
+msgstr ""
+
+#: vfs/ftpfs.c:985
+msgid "ftpfs: could not setup passive mode for source routing"
+msgstr ""
+
+#: vfs/ftpfs.c:995
+msgid "ftpfs: could not setup passive mode"
+msgstr ""
+
+#: vfs/ftpfs.c:1066
+msgid "ftpfs: aborting transfer."
+msgstr ""
+
+#: vfs/ftpfs.c:1068
+#, c-format
+msgid "ftpfs: abort error: %s"
+msgstr ""
+
+#: vfs/ftpfs.c:1073
+msgid "ftpfs: abort failed"
+msgstr ""
+
+#: vfs/ftpfs.c:1159 vfs/ftpfs.c:1333
+msgid "ftpfs: CWD failed."
+msgstr ""
+
+#: vfs/ftpfs.c:1169 vfs/ftpfs.c:1176
+msgid "ftpfs: couldn't resolve symlink"
+msgstr ""
+
+#: vfs/ftpfs.c:1221
+msgid "Resolving symlink..."
+msgstr ""
+
+#: vfs/ftpfs.c:1324
+#, c-format
+msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)"
+msgstr ""
+
+#: vfs/ftpfs.c:1326
+#, c-format
+msgid "ftpfs: Reading FTP directory %s..."
+msgstr ""
+
+#: vfs/ftpfs.c:1345
+msgid "ftpfs: FAIL"
+msgstr ""
+
+#: vfs/ftpfs.c:1436
+msgid "ftpfs: reading FTP directory interrupt by user"
+msgstr ""
+
+#: vfs/ftpfs.c:1465
+msgid "ftpfs: got listing"
+msgstr ""
+
+#: vfs/ftpfs.c:1478
+msgid "ftpfs: failed"
+msgstr ""
+
+#: vfs/ftpfs.c:1495
+msgid "ftpfs: failed; nowhere to fallback to"
+msgstr ""
+
+#: vfs/ftpfs.c:1559
+#, c-format
+msgid "ftpfs: storing file %d (%d)"
msgstr ""
#: vfs/ftpfs.c:1995 vfs/ftpfs.c:2010
Binary files old/mc-4.5.27/po/no.gmo and new/mc-4.5.28/po/no.gmo differ
diff -ruN old/mc-4.5.27/po/no.po new/mc-4.5.28/po/no.po
--- old/mc-4.5.27/po/no.po Thu Mar 18 20:42:36 1999
+++ new/mc-4.5.28/po/no.po Fri Mar 26 15:30:48 1999
@@ -4,9 +4,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: mc 4.5.24\n"
-"POT-Creation-Date: 1999-03-12 03:11+0100\n"
-"PO-Revision-Date: 1999-03-10 01:52+0100\n"
+"Project-Id-Version: mc 4.5.27\n"
+"POT-Creation-Date: 1999-03-19 10:22+0100\n"
+"PO-Revision-Date: 1999-03-19 10:30+0100\n"
"Last-Translator: Kjartan Maraas <kmaraas@fib.hl.no>\n"
"Language-Team: Norwegian <no@li.org>\n"
"MIME-Version: 1.0\n"
@@ -17,12 +17,13 @@
msgid " Emacs key: "
msgstr " Emacs-tast: "
-#: edit/edit_key_translator.c:133
+#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148
msgid " Execute Macro "
msgstr " Kj�r makro "
#. Input line for a single key press follows the ':'
-#: edit/edit_key_translator.c:133 gtkedit/editcmd.c:707 gtkedit/editcmd.c:716
+#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148
+#: gtkedit/editcmd.c:707 gtkedit/editcmd.c:716
msgid " Press macro hotkey: "
msgstr " Trykk hurtigtast for makro: "
@@ -46,7 +47,7 @@
msgid "The GNOME edition of the Midnight Commander file manager."
msgstr "GNOME utgaven av Midnight Commander filbehandleren."
-#: gnome/gcmd.c:127 src/main.c:844 src/screen.c:2050
+#: gnome/gcmd.c:127 src/main.c:844 src/screen.c:2067
msgid " The Midnight Commander "
msgstr " Midnight Commander "
@@ -54,16 +55,16 @@
msgid " Do you really want to quit the Midnight Commander? "
msgstr " Vil du virkelig avslutte Midnight Commander? "
-#: gnome/gcmd.c:129 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1860
-#: src/file.c:2232 src/filegui.c:602 src/hotlist.c:1035 src/main.c:846
-#: src/screen.c:2052 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
+#: gnome/gcmd.c:129 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1859
+#: src/file.c:2231 src/filegui.c:602 src/hotlist.c:1035 src/main.c:846
+#: src/screen.c:2069 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
#: src/view.c:404
msgid "&Yes"
msgstr "&Ja"
-#: gnome/gcmd.c:129 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1860
-#: src/file.c:2232 src/filegui.c:601 src/hotlist.c:1035 src/main.c:846
-#: src/screen.c:2052 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
+#: gnome/gcmd.c:129 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1859
+#: src/file.c:2231 src/filegui.c:601 src/hotlist.c:1035 src/main.c:846
+#: src/screen.c:2069 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
#: src/view.c:404
msgid "&No"
msgstr "&Nei"
@@ -77,7 +78,7 @@
msgid "Ignore case sensitivity."
msgstr "Ikke skill mellom s&tore/sm� tegn"
-#: gnome/gcmd.c:281 src/chmod.c:150 src/screen.c:425
+#: gnome/gcmd.c:281 gnome/gcustom-layout.c:42 src/chmod.c:150 src/screen.c:425
msgid "Name"
msgstr "Navn"
@@ -85,7 +86,8 @@
msgid "File Type"
msgstr "Filtype"
-#: gnome/gcmd.c:294 src/screen.c:426 src/screen.c:427
+#: gnome/gcmd.c:294 gnome/gcustom-layout.c:46 src/screen.c:426
+#: src/screen.c:427
msgid "Size"
msgstr "St�rrelse"
@@ -130,11 +132,12 @@
msgid "Preset Commands"
msgstr "Forh�ndsinnstilte kommandoer"
-#: gnome/gcmd.c:563
+#. add add/remove buttons in center
+#: gnome/gcmd.c:563 gnome/gcustom-layout.c:181
msgid "Add"
msgstr "Legg til"
-#: gnome/gcmd.c:567
+#: gnome/gcmd.c:567 gnome/gcustom-layout.c:182
msgid "Remove"
msgstr "Fjern"
@@ -152,7 +155,7 @@
msgstr "Sett filter"
#: gnome/gcmd.c:650 gnome/gcmd.c:691 gnome/gcmd.c:696 gnome/gcmd.c:700
-#: gnome/gscreen.c:2517
+#: gnome/gscreen.c:2516
msgid "Show all files"
msgstr "Vis alle filer"
@@ -176,15 +179,84 @@
msgid "Enter a Regular Expression to filter files in the panel view."
msgstr "Skriv inn et regul�rt uttrykk for bruk som filter i panelvisningen."
-#: gnome/gcmd.c:732 gnome/gpopup.c:53
+#: gnome/gcmd.c:732
msgid " Open with..."
msgstr " �pne med..."
-#: gnome/gcmd.c:733 gnome/gpopup.c:54
+#: gnome/gcmd.c:733
msgid "Enter extra arguments:"
msgstr "Skriv inn ekstra argumenter:"
-#: gnome/gdesktop.c:420 gnome/gdesktop.c:2071
+#: gnome/gcustom-layout.c:35
+msgid "Access Time"
+msgstr "Aksesstid"
+
+#: gnome/gcustom-layout.c:36
+msgid "Creation Time"
+msgstr "Opprettelsestid"
+
+#. Group
+#: gnome/gcustom-layout.c:37 gnome/gnome-file-property-dialog.c:776
+#: gnome/gnome-file-property-dialog.c:940 gnome/gprop.c:280 gnome/gprop.c:405
+#: src/screen.c:439
+msgid "Group"
+msgstr "Gruppe"
+
+#: gnome/gcustom-layout.c:38
+msgid "Group ID"
+msgstr "Gruppe-ID"
+
+#: gnome/gcustom-layout.c:39
+msgid "Inode Number"
+msgstr "Inode nummer"
+
+#: gnome/gcustom-layout.c:40 src/achown.c:378
+msgid "Mode"
+msgstr "Modus"
+
+#: gnome/gcustom-layout.c:41
+msgid "Modification Time"
+msgstr "Modifikasjonstid"
+
+#: gnome/gcustom-layout.c:43
+msgid "Number of Hard Links"
+msgstr "Antall harde lenker"
+
+#. Owner
+#: gnome/gcustom-layout.c:44 gnome/gnome-file-property-dialog.c:925
+#: gnome/gprop.c:390 src/screen.c:438
+msgid "Owner"
+msgstr "Eier"
+
+#: gnome/gcustom-layout.c:45 src/screen.c:432
+msgid "Permission"
+msgstr "Rettighet"
+
+#: gnome/gcustom-layout.c:47
+msgid "Size (short)"
+msgstr "St�rrelse (kort)"
+
+#: gnome/gcustom-layout.c:48
+msgid "Type"
+msgstr "Type"
+
+#: gnome/gcustom-layout.c:49
+msgid "User ID"
+msgstr "Bruker-ID"
+
+#: gnome/gcustom-layout.c:140
+msgid "Possible Columns"
+msgstr "Mulige kolonner"
+
+#: gnome/gcustom-layout.c:160
+msgid "Displayed Columns"
+msgstr "Synlige kolonner"
+
+#: gnome/gcustom-layout.c:299
+msgid "Custom View"
+msgstr "Egendefinert visning"
+
+#: gnome/gdesktop.c:420 gnome/gdesktop.c:2070
msgid "Warning"
msgstr "Advarsel"
@@ -193,157 +265,157 @@
msgid "Could not open %s; will not have desktop icons"
msgstr "Kunne ikke �pne %s; vil ikke ha skrivebordsikoner"
-#: gnome/gdesktop.c:1013
+#: gnome/gdesktop.c:1014
msgid "While running the mount/umount command"
msgstr "Under kj�ring av mount/umount kommandoen"
-#: gnome/gdesktop.c:1082
+#: gnome/gdesktop.c:1083
msgid "While running the eject command"
msgstr "Under kj�ring av eject kommandoen"
-#: gnome/gdesktop.c:1135 gnome/gicon.c:154 gnome/gtools.c:52
+#: gnome/gdesktop.c:1136 gnome/gicon.c:154 gnome/gtools.c:52
msgid "Error"
msgstr "Feil"
#. Create the link to the user's home directory so that he will have an icon
-#: gnome/gdesktop.c:2067
+#: gnome/gdesktop.c:2066
msgid "Home directory"
msgstr "Hjemmekatalog"
-#: gnome/gdesktop.c:2072
+#: gnome/gdesktop.c:2071
#, c-format
msgid "Could not symlink %s to %s; will not have initial desktop icons."
msgstr ""
"Kunne ikke lage symbolsk lenke fra %s til %s; f�r ikke skrivebordsikoner."
-#: gnome/gdesktop.c:2401 gnome/glayout.c:355
+#: gnome/gdesktop.c:2400 gnome/glayout.c:355
msgid "_Terminal"
msgstr "_Terminal"
-#: gnome/gdesktop.c:2401 gnome/glayout.c:355
+#: gnome/gdesktop.c:2400 gnome/glayout.c:355
msgid "Launch a new terminal in the current directory"
msgstr "Starter en ny terminal i aktiv katalog"
#. If this ever changes, make sure you update create_new_menu accordingly.
-#: gnome/gdesktop.c:2403 gnome/glayout.c:357
+#: gnome/gdesktop.c:2402 gnome/glayout.c:357
msgid "_Directory..."
msgstr "Katalog..."
-#: gnome/gdesktop.c:2403 gnome/glayout.c:357
+#: gnome/gdesktop.c:2402 gnome/glayout.c:357
msgid "Creates a new directory"
msgstr "Oppretter en ny katalog"
-#: gnome/gdesktop.c:2411 gnome/glayout.c:440
+#: gnome/gdesktop.c:2410 gnome/glayout.c:440
msgid "Arrange Icons"
msgstr "Plasser ikonene"
-#: gnome/gdesktop.c:2412
+#: gnome/gdesktop.c:2411
msgid "Create New Window"
msgstr "Opprett nytt vindu"
-#: gnome/gdesktop.c:2414
+#: gnome/gdesktop.c:2413
msgid "Rescan Mountable Devices"
msgstr "Oppdater moterbare enheter"
-#: gnome/gdesktop.c:2415 gnome/glayout.c:443
+#: gnome/gdesktop.c:2414 gnome/glayout.c:443
msgid "Rescan Desktop"
msgstr "Oppdater skrivebordet"
-#: gnome/gdialogs.c:58
+#: gnome/gdialogs.c:59
msgid "To: "
msgstr "Til: "
-#: gnome/gdialogs.c:59
+#: gnome/gdialogs.c:60
msgid "Copying from: "
msgstr "Kopierer fra: "
-#: gnome/gdialogs.c:60
+#: gnome/gdialogs.c:61
msgid "Deleting file: "
msgstr "Sletter fil: "
-#: gnome/gdialogs.c:361
+#: gnome/gdialogs.c:368
msgid "Files Exist"
msgstr "Filene eksisterer"
-#: gnome/gdialogs.c:376
+#: gnome/gdialogs.c:383
msgid ""
"Some of the files you are trying to copy already exist in the destination "
"folder. Please select the action to be performed."
msgstr ""
-"Noen av filene du fors�ker � kopiere eksisterer allerede i m�lkatalogen."
-"V�r snill og velg handling som skal utf�res."
+"Noen av filene du fors�ker � kopiere eksisterer allerede i m�lkatalogen.V�r "
+"snill og velg handling som skal utf�res."
-#: gnome/gdialogs.c:389
+#: gnome/gdialogs.c:396
msgid "Prompt me before overwriting any file."
msgstr "Sp�r meg f�r filer overskrives."
-#: gnome/gdialogs.c:396
+#: gnome/gdialogs.c:403
msgid "Don't overwrite any files."
msgstr "Ikke overskriv filer."
-#: gnome/gdialogs.c:412
+#: gnome/gdialogs.c:419
msgid "Overwrite:"
msgstr "Overskriv:"
-#: gnome/gdialogs.c:419
+#: gnome/gdialogs.c:426
msgid "Older files."
msgstr "Eldre filer."
-#: gnome/gdialogs.c:425
+#: gnome/gdialogs.c:432
msgid "Files only if size differs."
msgstr "Filer bare hvis st�rrelsen er forskjellig."
-#: gnome/gdialogs.c:431
+#: gnome/gdialogs.c:438
msgid "All files."
msgstr "Alle filer."
-#: gnome/gdialogs.c:471
+#: gnome/gdialogs.c:478
msgid "File Exists"
msgstr "Filen eksisterer"
-#: gnome/gdialogs.c:477
+#: gnome/gdialogs.c:484
#, c-format
msgid "The target file already exists: %s"
msgstr "M�lfilen eksisterer allerede: %s"
-#: gnome/gdialogs.c:484
+#: gnome/gdialogs.c:491
msgid "Replace it?"
msgstr "Erstatt den?"
-#: gnome/gdialogs.c:558 gtkedit/editwidget.c:1067 src/file.c:803
-#: src/screen.c:2291 src/screen.c:2321 src/tree.c:1024
+#: gnome/gdialogs.c:565 gtkedit/editwidget.c:1067 src/file.c:802
+#: src/screen.c:2308 src/screen.c:2338 src/tree.c:1024
msgid "Copy"
msgstr "Kopier"
-#: gnome/gdialogs.c:561 gtkedit/editwidget.c:1068
+#: gnome/gdialogs.c:568 gtkedit/editwidget.c:1068
msgid "Move"
msgstr "Flytt"
-#: gnome/gdialogs.c:578
+#: gnome/gdialogs.c:585
msgid "Destination"
msgstr "M�l"
-#: gnome/gdialogs.c:582
+#: gnome/gdialogs.c:589
msgid "Find Destination Folder"
msgstr "Finn m�lkatalog"
-#: gnome/gdialogs.c:587
+#: gnome/gdialogs.c:594
msgid "Copy as a background process"
msgstr "Kopier i bakgrunnen"
-#: gnome/gdialogs.c:607
+#: gnome/gdialogs.c:614
msgid "Advanced Options"
msgstr "Avanserte alternativer"
-#: gnome/gdialogs.c:611
+#: gnome/gdialogs.c:618
msgid "Preserve symlinks"
msgstr "Behold symbolske lenker"
-#: gnome/gdialogs.c:621
+#: gnome/gdialogs.c:628
msgid "Follow links."
msgstr "F�lg lenker"
-#: gnome/gdialogs.c:627
+#: gnome/gdialogs.c:634
msgid ""
"Selecting this will copy the files that symlinks point to instead of just "
"copying the link."
@@ -351,23 +423,23 @@
"Dette valget vil kopiere filene som symlenken peker til i stedet for bare � "
"kopiere lenken."
-#: gnome/gdialogs.c:632
+#: gnome/gdialogs.c:639
msgid "Preserve file attributes."
msgstr "Behold filattributter."
-#: gnome/gdialogs.c:637
+#: gnome/gdialogs.c:644
msgid "Preserves the permissions and the UID/GID if possible"
msgstr "Tar vare p� rettighetene og UID/GID hvis mulig"
-#: gnome/gdialogs.c:643
+#: gnome/gdialogs.c:650
msgid "Recursively copy subdirectories."
msgstr "Kopier kataloger rekursivt."
-#: gnome/gdialogs.c:648
+#: gnome/gdialogs.c:655
msgid "If set, this will copy the directories recursively"
msgstr "Hvis satt, vil dette kopiere katalogen rekursivt"
-#: gnome/gdialogs.c:752
+#: gnome/gdialogs.c:759
#, c-format
msgid ""
"%s\n"
@@ -378,38 +450,59 @@
"\n"
"Katalogen er ikke tom. Slett den rekursivt?"
-#: gnome/gdialogs.c:761 src/file.c:2227
+#: gnome/gdialogs.c:768 src/file.c:2226
msgid " Delete: "
msgstr " Slett: "
-#: gnome/gdialogs.c:765
+#: gnome/gdialogs.c:772
msgid "Do the same for the rest"
msgstr "Gj�r det samme for resten"
-#: gnome/gdialogs.c:834
+#: gnome/gdialogs.c:841
msgid "Move Progress"
msgstr "Fremgang for flytting"
-#: gnome/gdialogs.c:837
+#: gnome/gdialogs.c:844
msgid "Copy Progress"
msgstr "Fremgang for kopiering"
-#: gnome/gdialogs.c:840
+#: gnome/gdialogs.c:847
msgid "Delete Progress"
msgstr "Fremgang for sletting"
-#: gnome/gdialogs.c:885
+#: gnome/gdialogs.c:892
msgid "File "
msgstr "Fil "
-#: gnome/gdialogs.c:889
+#: gnome/gdialogs.c:896
msgid " is "
msgstr " er "
-#: gnome/gdialogs.c:892
+#: gnome/gdialogs.c:899
msgid " Done."
msgstr " Ferdig."
+#: gnome/gdialogs.c:959 src/wtools.c:585 vfs/vfs.c:1762
+msgid "Password:"
+msgstr "Passord:"
+
+#: gnome/gdialogs.c:959 src/wtools.c:585
+msgid "Password"
+msgstr "Passord"
+
+#. Create the dialog
+#: gnome/gdialogs.c:991
+msgid "Symbolic Link"
+msgstr "Symbolsk lenke"
+
+#: gnome/gdialogs.c:1007 src/boxes.c:803
+msgid "Existing filename (filename symlink will point to):"
+msgstr "Eksisterende filnavn (filnavnet symlinken skal peke til):"
+
+#: gnome/gdialogs.c:1021 src/boxes.c:801
+msgid "Symbolic link filename:"
+msgstr "Filnavn for symbolsk lenke:"
+
#: gnome/gdnd.c:51
msgid "_Move here"
msgstr "Flytt hit"
@@ -497,7 +590,7 @@
"Notice that if you choose to terminate the file manager, you will\n"
"also terminate the GNOME desktop handler.\n"
"\n"
-"Are you sure you want to quit?"
+"Are you sure you want to exit?"
msgstr ""
"V�r oppmerksom p� at hvis du velger � terminere filbehandleren, s�\n"
"vil dette ogs� terminere GNOME's skrivebordsh�ndtering.\n"
@@ -648,85 +741,315 @@
#: gnome/glayout.c:450 gnome/glayout.c:460
msgid "_Layout"
-msgstr "Utseende"
+msgstr "_Utseende"
#: gnome/glayout.c:451 gnome/glayout.c:461
msgid "_Commands"
-msgstr "Kommandoer"
+msgstr "_Kommandoer"
#: gnome/glayout.c:452
msgid "_Desktop"
-msgstr "Skrivebord"
+msgstr "S_krivebord"
#: gnome/glayout.c:453 gnome/glayout.c:462
msgid "_Help"
-msgstr "Hjelp"
+msgstr "_Hjelp"
#: gnome/glayout.c:600
msgid "File/New/Directory..."
msgstr "Fil/Ny/Katalog..."
-#: gnome/gpopup.c:252 gnome/gpopup.c:255
-msgid "Properties"
-msgstr "Egenskaper"
-
-#: gnome/gpopup.c:253 gnome/gpopup.c:254 gtkedit/editwidget.c:1070
-#: src/screen.c:2294 src/screen.c:2324
-msgid "Delete"
-msgstr "Slett"
-
-#: gnome/gpopup.c:256
-msgid "Mount device"
-msgstr "Monter enhet"
+#. we set the file part
+#: gnome/gnome-file-property-dialog.c:170
+msgid "Full Name: "
+msgstr "Fullt navn: "
-#: gnome/gpopup.c:257
-msgid "Unmount device"
-msgstr "Avmonter enhet"
+#: gnome/gnome-file-property-dialog.c:178
+msgid "File Name"
+msgstr "Filnavn"
-#: gnome/gpopup.c:258
-msgid "Eject device"
-msgstr "Utl�s enhet"
+#: gnome/gnome-file-property-dialog.c:201
+msgid "File Type: "
+msgstr "Filtype: "
+
+#: gnome/gnome-file-property-dialog.c:207
+msgid "File Type: Symbolic Link"
+msgstr "Filtype: Symbolsk lenke"
+
+#: gnome/gnome-file-property-dialog.c:212
+msgid "Target Name: INVALID LINK"
+msgstr "M�lnavn: UGYLDIG LENKE"
+
+#: gnome/gnome-file-property-dialog.c:215
+msgid "Target Name: "
+msgstr "M�lnavn: "
+
+#: gnome/gnome-file-property-dialog.c:220
+msgid "File Type: Directory"
+msgstr "Filtype: Katalog"
+
+#: gnome/gnome-file-property-dialog.c:222
+msgid "File Type: Character Device"
+msgstr "Filtype: Tegnenhet"
+
+#: gnome/gnome-file-property-dialog.c:224
+msgid "File Type: Block Device"
+msgstr "Filtype: Blokkenhet"
+
+#: gnome/gnome-file-property-dialog.c:226
+msgid "File Type: Socket"
+msgstr "Filtype: Socket"
+
+#: gnome/gnome-file-property-dialog.c:228
+msgid "File Type: FIFO"
+msgstr "Filtype: FIFO"
+
+#: gnome/gnome-file-property-dialog.c:238
+#: gnome/gnome-file-property-dialog.c:242
+#: gnome/gnome-file-property-dialog.c:248
+msgid "File Size: "
+msgstr "Filst�rrelse: "
+
+#: gnome/gnome-file-property-dialog.c:238
+msgid " bytes"
+msgstr " bytes"
+
+#: gnome/gnome-file-property-dialog.c:242
+msgid " KBytes ("
+msgstr " KBytes ("
+
+#: gnome/gnome-file-property-dialog.c:243
+#: gnome/gnome-file-property-dialog.c:249
+msgid " bytes)"
+msgstr " bytes)"
+
+#: gnome/gnome-file-property-dialog.c:248
+msgid " MBytes ("
+msgstr " MBytes ("
+
+#: gnome/gnome-file-property-dialog.c:256
+msgid "File Size: N/A"
+msgstr "Filst�rrelse: I/T"
+
+#: gnome/gnome-file-property-dialog.c:267
+msgid "File Created on: "
+msgstr "Fil opprettet: "
+
+#: gnome/gnome-file-property-dialog.c:276
+msgid "Last Modified on: "
+msgstr "Sist modifisert: "
+
+#: gnome/gnome-file-property-dialog.c:285
+msgid "Last Accessed on: "
+msgstr "Sist aksessert: "
+
+#: gnome/gnome-file-property-dialog.c:303
+msgid "URL:"
+msgstr "URL:"
+
+#: gnome/gnome-file-property-dialog.c:310
+#, fuzzy
+msgid "Caption:"
+msgstr "Sted:"
-#: gnome/gpopup.c:260 gnome/gpopup.c:261
+#. we do open first
+#: gnome/gnome-file-property-dialog.c:469 gnome/gpopup2.c:187
msgid "Open"
msgstr "�pne"
-#: gnome/gpopup.c:262
-msgid "Open with"
-msgstr "�pne med"
+#: gnome/gnome-file-property-dialog.c:479
+msgid "Use default Open action"
+msgstr "Bruk standard handling for �pning"
+
+#: gnome/gnome-file-property-dialog.c:489
+msgid "Drop Action"
+msgstr "Handlig ved slipp"
-#: gnome/gpopup.c:263 src/screen.c:2289 src/screen.c:2319
+#: gnome/gnome-file-property-dialog.c:491 gnome/gpopup2.c:194
+#: src/screen.c:2306 src/screen.c:2336
msgid "View"
msgstr "Se p�"
-#: gnome/gpopup.c:264
-msgid "View unfiltered"
-msgstr "Se p� ufiltrert"
+#: gnome/gnome-file-property-dialog.c:502
+msgid "Use default Drop action"
+msgstr "Bruk standard handling for slipp"
+
+#: gnome/gnome-file-property-dialog.c:504
+msgid "Use default View action"
+msgstr "Bruk standard handling for visning"
-#: gnome/gpopup.c:265 src/screen.c:2290 src/screen.c:2320 src/view.c:1991
+#: gnome/gnome-file-property-dialog.c:513 gnome/gpopup2.c:196
+#: src/screen.c:2307 src/screen.c:2337 src/view.c:1991
msgid "Edit"
msgstr "Rediger"
-#: gnome/gpopup.c:267
-msgid "Move/rename..."
-msgstr "Flytt/gi nytt navn..."
+#: gnome/gnome-file-property-dialog.c:523
+msgid "Use default Edit action"
+msgstr "Bruk standard handling for redigering"
+
+#: gnome/gnome-file-property-dialog.c:577 gnome/gprop.c:521
+msgid "Icon"
+msgstr "Ikon"
+
+#. We must be a file or a link to a file.
+#: gnome/gnome-file-property-dialog.c:611
+msgid "File Actions"
+msgstr "Fil-handlinger"
+
+#: gnome/gnome-file-property-dialog.c:616
+msgid "Open action"
+msgstr "Handling for �pning"
+
+#: gnome/gnome-file-property-dialog.c:617
+msgid "Needs terminal to run"
+msgstr "Trenger terminal for � kj�re"
+
+#: gnome/gnome-file-property-dialog.c:742
+msgid "File Permissions"
+msgstr "Filrettigheter"
+
+#: gnome/gnome-file-property-dialog.c:753 gnome/gprop.c:259
+msgid "Current mode: "
+msgstr "N�v�rende modus: "
+
+#. Headings
+#: gnome/gnome-file-property-dialog.c:768 gnome/gprop.c:272
+msgid "Read"
+msgstr "Lese"
+
+#: gnome/gnome-file-property-dialog.c:769 gnome/gprop.c:273
+msgid "Write"
+msgstr "Skrive"
+
+#: gnome/gnome-file-property-dialog.c:770 gnome/gprop.c:274
+msgid "Exec"
+msgstr "Kj�re"
+
+#: gnome/gnome-file-property-dialog.c:771 gnome/gprop.c:275
+msgid "Special"
+msgstr "Spesielle"
+
+#. Permissions
+#: gnome/gnome-file-property-dialog.c:775 gnome/gprop.c:279
+msgid "User"
+msgstr "Bruker"
+
+#: gnome/gnome-file-property-dialog.c:777 gnome/gprop.c:281
+msgid "Other"
+msgstr "Andre"
+
+#. Special
+#: gnome/gnome-file-property-dialog.c:781 gnome/gprop.c:285
+msgid "Set UID"
+msgstr "Sett UID"
+
+#: gnome/gnome-file-property-dialog.c:782 gnome/gprop.c:286
+msgid "Set GID"
+msgstr "Sett GID"
+
+#: gnome/gnome-file-property-dialog.c:783 gnome/gprop.c:287
+msgid "Sticky"
+msgstr "Sticky"
+
+#: gnome/gnome-file-property-dialog.c:1074
+msgid "URL"
+msgstr "URL"
+
+#: gnome/gnome-file-property-dialog.c:1077
+msgid "Statistics"
+msgstr "Statistikk"
+
+#: gnome/gnome-file-property-dialog.c:1083
+msgid "Options"
+msgstr "Alternativer"
+
+#: gnome/gnome-file-property-dialog.c:1086
+msgid "Permissions"
+msgstr "Rettigheter"
+
+#: gnome/gnome-file-property-dialog.c:1089
+msgid " Properties"
+msgstr " Egenskaper"
+
+#: gnome/gnome-file-property-dialog.c:1140
+msgid "You entered an invalid username"
+msgstr "Du skrev inn et ugyldig brukernavn"
+
+#: gnome/gnome-file-property-dialog.c:1185
+msgid "You must rename your file to something"
+msgstr "Du m� gi filen din et nytt navn"
+
+#: gnome/gnome-file-property-dialog.c:1191
+msgid "You cannot rename a file to something containing a '/' character"
+msgstr "Du kan ikke gi nytt navn til noe som inneholde tegnet '/'"
+
+#. the first label
+#: gnome/gnome-open-dialog.c:379
+msgid "Select an application to open \""
+msgstr "Velg en applikasjon som skal �pnes \""
+
+#: gnome/gnome-open-dialog.c:390
+msgid "Select a file to run with"
+msgstr "Velg en fil � starte med"
+
+#. the file tree
+#: gnome/gnome-open-dialog.c:401
+msgid "Applications"
+msgstr "Applikasjoner"
+
+#: gnome/gnome-open-dialog.c:417
+msgid "Program to run"
+msgstr "Program som skal kj�res"
+
+#: gnome/gpopup2.c:188
+msgid "Mount device"
+msgstr "Monter enhet"
+
+#: gnome/gpopup2.c:189
+msgid "Unmount device"
+msgstr "Avmonter enhet"
+
+#: gnome/gpopup2.c:190
+msgid "Eject device"
+msgstr "Utl�s enhet"
-#: gnome/gpopup.c:268
+#: gnome/gpopup2.c:193
+msgid "Open with..."
+msgstr "�pne med..."
+
+#: gnome/gpopup2.c:195
+msgid "View Unfiltered"
+msgstr "Se p� ufiltrert"
+
+#: gnome/gpopup2.c:198
msgid "Copy..."
msgstr "Kopier..."
-#: gnome/gpopup.c:270
-msgid "Link..."
-msgstr "Finn..."
+#: gnome/gpopup2.c:199 gtkedit/editwidget.c:1070 src/screen.c:2311
+#: src/screen.c:2341
+msgid "Delete"
+msgstr "Slett"
+
+#: gnome/gpopup2.c:200
+msgid "Move..."
+msgstr "Flytt..."
+
+#: gnome/gpopup2.c:201
+msgid "Hard Link..."
+msgstr "Hard lenke..."
-#: gnome/gpopup.c:271
+#: gnome/gpopup2.c:202
msgid "Symlink..."
msgstr "Symlenken..."
-#: gnome/gpopup.c:272
-msgid "Edit symlink..."
+#: gnome/gpopup2.c:203
+msgid "Edit Symlink..."
msgstr "Rediger symlenke..."
+#: gnome/gpopup2.c:205
+msgid "Properties..."
+msgstr "Egenskaper..."
+
#: gnome/gprefs.c:81
msgid "Show backup files"
msgstr "Vis sikkerhetskopier"
@@ -835,63 +1158,10 @@
msgid "File mode (permissions)"
msgstr "Filmodus (rettigheter)"
-#: gnome/gprop.c:259
-msgid "Current mode: "
-msgstr "N�v�rende modus: "
-
-#. Headings
-#: gnome/gprop.c:272
-msgid "Read"
-msgstr "Lese"
-
-#: gnome/gprop.c:273
-msgid "Write"
-msgstr "Skrive"
-
-#: gnome/gprop.c:274
-msgid "Exec"
-msgstr "Kj�re"
-
-#: gnome/gprop.c:275
-msgid "Special"
-msgstr "Spesielle"
-
-#. Permissions
-#: gnome/gprop.c:279
-msgid "User"
-msgstr "Bruker"
-
-#. Group
-#: gnome/gprop.c:280 gnome/gprop.c:405 src/screen.c:439
-msgid "Group"
-msgstr "Gruppe"
-
-#: gnome/gprop.c:281
-msgid "Other"
-msgstr "Andre"
-
-#. Special
-#: gnome/gprop.c:285
-msgid "Set UID"
-msgstr "Sett UID"
-
-#: gnome/gprop.c:286
-msgid "Set GID"
-msgstr "Sett GID"
-
-#: gnome/gprop.c:287
-msgid "Sticky"
-msgstr "Sticky"
-
#: gnome/gprop.c:321 gnome/gprop.c:347
msgid "<Unknown>"
msgstr "<Ukjent>"
-#. Owner
-#: gnome/gprop.c:390 src/screen.c:438
-msgid "Owner"
-msgstr "Eier"
-
#: gnome/gprop.c:494
msgid "General"
msgstr "Generell"
@@ -900,162 +1170,158 @@
msgid "Title"
msgstr "Tittel"
-#: gnome/gprop.c:521
-msgid "Icon"
-msgstr "Ikon"
-
#: gnome/gprop.c:535
msgid "Select icon"
msgstr "Velg ikon"
-#: gnome/gscreen.c:1469
+#: gnome/gscreen.c:1468
msgid "Rescan Directory"
msgstr "Oppdater kataloginnholdet"
-#: gnome/gscreen.c:1469
+#: gnome/gscreen.c:1468
msgid "Reloads the current directory"
msgstr "Leser aktiv katalog p� nytt"
-#: gnome/gscreen.c:1471
+#: gnome/gscreen.c:1470
msgid "New folder"
msgstr "Ny katalog"
-#: gnome/gscreen.c:1471
+#: gnome/gscreen.c:1470
msgid "Creates a new folder here"
msgstr "Oppretter en ny katalog her"
-#: gnome/gscreen.c:1649
+#: gnome/gscreen.c:1648
msgid "All files"
msgstr "Alle filer"
-#: gnome/gscreen.c:1651
+#: gnome/gscreen.c:1650
msgid "Archives and compressed files"
msgstr "Arkiver og komprimerte filer"
-#: gnome/gscreen.c:1653
+#: gnome/gscreen.c:1652
msgid "RPM/DEB files"
msgstr "RPM/DEB filer"
-#: gnome/gscreen.c:1655
+#: gnome/gscreen.c:1654
msgid "Text/Document files"
msgstr "Tekst-/dokumentfiler"
-#: gnome/gscreen.c:1657
+#: gnome/gscreen.c:1656
msgid "HTML and SGML files"
msgstr "HTML- og SGML-filer"
-#: gnome/gscreen.c:1659
+#: gnome/gscreen.c:1658
msgid "Postscript and PDF files"
msgstr "Postscript- of PDF-filer"
-#: gnome/gscreen.c:1661
+#: gnome/gscreen.c:1660
msgid "Spreadsheet files"
msgstr "Regnearkfiler"
-#: gnome/gscreen.c:1663
+#: gnome/gscreen.c:1662
msgid "Image files"
msgstr "Bildefiler"
-#: gnome/gscreen.c:1666
+#: gnome/gscreen.c:1665
msgid "Video/animation files"
msgstr "Video-/animasjonsfiler"
-#: gnome/gscreen.c:1668
+#: gnome/gscreen.c:1667
msgid "Audio files"
msgstr "Lydfiler"
-#: gnome/gscreen.c:1670
+#: gnome/gscreen.c:1669
msgid "C program files"
msgstr "C programfiler"
-#: gnome/gscreen.c:1672
+#: gnome/gscreen.c:1671
msgid "C++ program files"
msgstr "C++ programfiler"
-#: gnome/gscreen.c:1674
+#: gnome/gscreen.c:1673
msgid "Objective-C program files"
msgstr "Objektiv-C programfiler"
-#: gnome/gscreen.c:1676
+#: gnome/gscreen.c:1675
msgid "Scheme program files"
msgstr "Scheme programfiler"
-#: gnome/gscreen.c:1678
+#: gnome/gscreen.c:1677
msgid "Assembler program files"
msgstr "Assembler programfiler"
-#: gnome/gscreen.c:1680
+#: gnome/gscreen.c:1679
msgid "Misc. program files"
msgstr "Forskj. programfiler"
-#: gnome/gscreen.c:1682
+#: gnome/gscreen.c:1681
msgid "Font files"
msgstr "Skrifttypefiler"
-#: gnome/gscreen.c:1809
+#: gnome/gscreen.c:1808
#, c-format
msgid "Search: %s"
msgstr "S�k: %s"
-#: gnome/gscreen.c:1819
+#: gnome/gscreen.c:1818
#, c-format
msgid "%s bytes in %d file"
msgstr "%s bytes i %d fil"
-#: gnome/gscreen.c:1819
+#: gnome/gscreen.c:1818
#, c-format
msgid "%s bytes in %d files"
msgstr "%s bytes i %d filer"
-#: gnome/gscreen.c:1845 src/screen.c:677
+#: gnome/gscreen.c:1844 src/screen.c:677
msgid "<readlink failed>"
msgstr "<readlink feilet>"
-#: gnome/gscreen.c:1899
+#: gnome/gscreen.c:1898
msgid "Filter"
msgstr "Filter"
-#: gnome/gscreen.c:2339
+#: gnome/gscreen.c:2338
msgid "Back"
msgstr "Tilbake"
-#: gnome/gscreen.c:2339
+#: gnome/gscreen.c:2338
msgid "Go to the previously visited directory"
msgstr "G� til tidligere vist katalog"
-#: gnome/gscreen.c:2341
+#: gnome/gscreen.c:2340
msgid "Up"
msgstr "Opp"
-#: gnome/gscreen.c:2341
+#: gnome/gscreen.c:2340
msgid "Go up a level in the directory heirarchy"
msgstr "G� opp ett niv� i kataloghierarkiet"
-#: gnome/gscreen.c:2343
+#: gnome/gscreen.c:2342
msgid "Forward"
msgstr "Fremover"
-#: gnome/gscreen.c:2343
+#: gnome/gscreen.c:2342
msgid "Go to the next directory"
msgstr "G� til neste katalog"
-#: gnome/gscreen.c:2346 src/tree.c:1020
+#: gnome/gscreen.c:2345 src/tree.c:1020
msgid "Rescan"
msgstr "Oppdater"
-#: gnome/gscreen.c:2346
+#: gnome/gscreen.c:2345
msgid "Rescan the current directory"
msgstr "Oppdater aktiv katalog"
-#: gnome/gscreen.c:2349
+#: gnome/gscreen.c:2348
msgid "Home"
msgstr "Hjemme"
-#: gnome/gscreen.c:2349
+#: gnome/gscreen.c:2348
msgid "Go to your home directory"
msgstr "G� til din hjemmekatalog"
-#: gnome/gscreen.c:2495
+#: gnome/gscreen.c:2494
msgid "Location:"
msgstr "Sted:"
@@ -1063,73 +1329,73 @@
#: gnome/gtools.c:110 gtkedit/editcmd.c:342 gtkedit/editcmd.c:1185
#: gtkedit/editcmd.c:1270 gtkedit/editcmd.c:2847 gtkedit/editoptions.c:69
#: src/boxes.c:138 src/boxes.c:278 src/boxes.c:378 src/boxes.c:466
-#: src/boxes.c:646 src/boxes.c:728 src/boxes.c:783 src/boxes.c:897
+#: src/boxes.c:646 src/boxes.c:728 src/boxes.c:783 src/boxes.c:898
#: src/filegui.c:838 src/find.c:171 src/layout.c:369 src/option.c:144
-#: src/wtools.c:289 src/wtools.c:561
+#: src/wtools.c:289 src/wtools.c:563
msgid "&Ok"
msgstr "&Ok"
-#: gnome/gview.c:122 src/view.c:683
+#: gnome/gview.c:135 src/view.c:683
#, c-format
msgid "Offset 0x%08x"
msgstr "Offset 0x%08x"
-#: gnome/gview.c:124 src/view.c:685
+#: gnome/gview.c:137 src/view.c:685
#, c-format
msgid "Col %d"
msgstr "Kol %d"
-#: gnome/gview.c:128 src/view.c:689
+#: gnome/gview.c:141 src/view.c:689
#, c-format
msgid "%s bytes"
msgstr "%s bytes"
-#: gnome/gview.c:292
+#: gnome/gview.c:305
msgid "_Goto line"
msgstr "G� til linje"
-#: gnome/gview.c:293
+#: gnome/gview.c:306
msgid "Jump to a specified line number"
msgstr "Hopp til et spesifisert linjenummer"
-#: gnome/gview.c:295
+#: gnome/gview.c:308
msgid "_Monitor file"
msgstr "Hold �ye med fil"
-#: gnome/gview.c:295
+#: gnome/gview.c:308
msgid "Monitor file growing"
msgstr "Hold �ye med filvekst"
-#: gnome/gview.c:302
+#: gnome/gview.c:315
msgid "Regexp search"
msgstr "Regexp-s�k"
-#: gnome/gview.c:303
+#: gnome/gview.c:316
msgid "Regular expression search"
msgstr "S�k etter vanlig uttrykk"
-#: gnome/gview.c:312
+#: gnome/gview.c:325
msgid "_Wrap"
msgstr "Bryt"
-#: gnome/gview.c:313
+#: gnome/gview.c:326
msgid "Wrap the text"
msgstr "Bryt teksten"
#. Can not use this one yet, as it destroys the viewer, need to fix that
-#: gnome/gview.c:316
+#: gnome/gview.c:329
msgid "_Parsed view"
msgstr "Fortolket visning"
-#: gnome/gview.c:319
+#: gnome/gview.c:332
msgid "_Formatted"
msgstr "Formatert"
-#: gnome/gview.c:321
+#: gnome/gview.c:334
msgid "_Hex"
msgstr "Hex"
-#: gnome/gview.c:327
+#: gnome/gview.c:340
msgid "_Search"
msgstr "S�k"
@@ -1145,11 +1411,11 @@
msgid "help"
msgstr "hjelp"
-#: gnome/gwidget.c:96 src/file.c:2251
+#: gnome/gwidget.c:96 src/file.c:2250
msgid "yes"
msgstr "ja"
-#: gnome/gwidget.c:98 src/file.c:2249
+#: gnome/gwidget.c:98 src/file.c:2248
msgid "no"
msgstr "nei"
@@ -1165,7 +1431,7 @@
#: gtkedit/edit.c:129 gtkedit/edit.c:224 gtkedit/edit.c:231 gtkedit/edit.c:238
#: gtkedit/edit.c:245 gtkedit/edit.c:251 gtkedit/edit.c:308 gtkedit/edit.c:344
#: gtkedit/editcmd.c:1945 gtkedit/editwidget.c:950 src/dir.c:386
-#: src/screen.c:2309 src/tree.c:692 src/tree.c:698 src/wtools.c:222
+#: src/screen.c:2326 src/tree.c:692 src/tree.c:698 src/wtools.c:222
#: vfs/fish.c:224
msgid " Error "
msgstr " Feil "
@@ -1218,8 +1484,7 @@
#: src/chmod.c:114 src/chown.c:79 src/cmd.c:856 src/filegui.c:821
#: src/find.c:171 src/hotlist.c:138 src/hotlist.c:814 src/hotlist.c:911
#: src/layout.c:370 src/learn.c:59 src/option.c:145 src/panelize.c:86
-#: src/view.c:404 src/wtools.c:111 src/wtools.c:386 src/wtools.c:559
-#: src/wtools.c:640
+#: src/view.c:404 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561
msgid "&Cancel"
msgstr "&Avbryt"
@@ -1238,9 +1503,9 @@
#. Warning message with a query to continue or cancel the operation
#: gtkedit/editcmd.c:491 gtkedit/editcmd.c:810 gtkedit/editcmd.c:840
-#: gtkedit/editcmd.c:987 gtkedit/editcmd.c:1084 src/ext.c:301 src/file.c:620
-#: src/help.c:318 src/main.c:691 src/screen.c:2066 src/subshell.c:705
-#: src/subshell.c:731 src/utilunix.c:388 src/utilunix.c:392 src/utilunix.c:458
+#: gtkedit/editcmd.c:987 gtkedit/editcmd.c:1084 src/ext.c:301 src/file.c:619
+#: src/help.c:318 src/main.c:691 src/screen.c:2083 src/subshell.c:705
+#: src/subshell.c:731 src/utilunix.c:388 src/utilunix.c:392 src/utilunix.c:463
#: vfs/mcfs.c:170
msgid " Warning "
msgstr " Advarsel "
@@ -1339,6 +1604,7 @@
" Fortsett forkaster disse endringene. "
#: gtkedit/editcmd.c:810 gtkedit/editcmd.c:840 gtkedit/editcmd.c:987
+#: src/main.c:3067
msgid "Continue"
msgstr "Fortsett"
@@ -1367,7 +1633,7 @@
msgid "al&L"
msgstr "alle"
-#: gtkedit/editcmd.c:1141 src/file.c:2173 src/filegui.c:266
+#: gtkedit/editcmd.c:1141 src/file.c:2172 src/filegui.c:266
msgid "&Skip"
msgstr "&Hopp over"
@@ -1689,7 +1955,7 @@
#: gtkedit/editoptions.c:34
msgid "Emacs"
-msgstr ""
+msgstr "Emacs"
#: gtkedit/editoptions.c:37
msgid "None"
@@ -1735,12 +2001,12 @@
#. 10
#: gtkedit/editoptions.c:101
msgid "&Backspace through tabs"
-msgstr ""
+msgstr "&Tilbake gjennom tabulatorer"
#. 11
#: gtkedit/editoptions.c:104
msgid "&Fake half tabs"
-msgstr ""
+msgstr "&Falske halvtabulatorer"
#. 13
#: gtkedit/editoptions.c:110
@@ -1761,8 +2027,8 @@
msgid "Error initialising editor.\n"
msgstr "Feil under initialisering av editor.\n"
-#: gtkedit/editwidget.c:1063 src/help.c:806 src/main.c:1688 src/screen.c:2287
-#: src/screen.c:2317 src/tree.c:1018 src/view.c:1982
+#: gtkedit/editwidget.c:1063 src/help.c:806 src/main.c:1688 src/screen.c:2304
+#: src/screen.c:2334 src/tree.c:1018 src/view.c:1982
msgid "Help"
msgstr "Hjelp"
@@ -2228,10 +2494,6 @@
msgid "Flag"
msgstr "Flagg"
-#: src/achown.c:378
-msgid "Mode"
-msgstr "Modus"
-
#: src/achown.c:383
#, c-format
msgid "%6d of %d"
@@ -2278,7 +2540,7 @@
msgid "Background process:"
msgstr "Bakgrunnsprosess:"
-#: src/background.c:287 src/file.c:2172
+#: src/background.c:287 src/file.c:2171
msgid " Background process error "
msgstr " Feil i bakgrunnsprosess "
@@ -2423,35 +2685,27 @@
msgid "Symbolic link"
msgstr "Symbolsk lenke"
-#: src/boxes.c:801
-msgid "Symbolic link filename:"
-msgstr "Filnavn for symbolsk lenke:"
-
-#: src/boxes.c:803
-msgid "Existing filename (filename symlink will point to):"
-msgstr "Eksisterende filnavn (filnavnet symlinken skal peke til):"
-
-#: src/boxes.c:832
+#: src/boxes.c:833
msgid "Running "
msgstr "Kj�rer"
-#: src/boxes.c:833 src/find.c:716 src/find.c:957
+#: src/boxes.c:834 src/find.c:716 src/find.c:957
msgid "Stopped"
msgstr "Stoppet"
-#: src/boxes.c:894
+#: src/boxes.c:895
msgid "&Stop"
msgstr "&Stopp"
-#: src/boxes.c:895
+#: src/boxes.c:896
msgid "&Resume"
msgstr "&Gjenoppta"
-#: src/boxes.c:896
+#: src/boxes.c:897
msgid "&Kill"
msgstr "&Drep"
-#: src/boxes.c:935
+#: src/boxes.c:936
msgid "Background Jobs"
msgstr "Bakgrunnsjobber"
@@ -2760,7 +3014,7 @@
msgid " Link "
msgstr " Lenke "
-#: src/cmd.c:1032 src/cmd.c:1168 src/file.c:1686
+#: src/cmd.c:1032 src/cmd.c:1171 src/file.c:1685
msgid " to:"
msgstr " til:"
@@ -2774,79 +3028,76 @@
msgid " symlink: %s "
msgstr " symlink: %s "
-#: src/cmd.c:1117
-msgid " Symlink "
-msgstr " Symlinken "
-
-#: src/cmd.c:1117
-msgid " points to:"
-msgstr " peker til:"
+#: src/cmd.c:1130
+#, c-format
+msgid " Symlink `%s' points to: "
+msgstr " Lenken `%s' peker til: "
-#: src/cmd.c:1132
+#: src/cmd.c:1135
msgid " Edit symlink "
msgstr " Rediger symlink "
-#: src/cmd.c:1137
+#: src/cmd.c:1140
#, c-format
msgid " edit symlink, unable to remove %s: %s "
msgstr " rediger symlink, kan ikke fjerne %s: %s "
-#: src/cmd.c:1141
+#: src/cmd.c:1144
#, c-format
msgid " edit symlink: %s "
msgstr " rediger symlink: %s "
-#: src/cmd.c:1168
+#: src/cmd.c:1171
msgid " Link symbolically "
msgstr " Lag symbolsk lenke "
-#: src/cmd.c:1169
+#: src/cmd.c:1172
msgid " Relative symlink "
msgstr " Relativ symlink "
-#: src/cmd.c:1180
+#: src/cmd.c:1183
#, c-format
msgid " relative symlink: %s "
msgstr " relativ symlink: %s "
-#: src/cmd.c:1283
+#: src/cmd.c:1286
msgid " Enter machine name (F1 for details): "
msgstr " Skriv inn maskinnavn (F1 for detaljer): "
-#: src/cmd.c:1307
+#: src/cmd.c:1310
#, c-format
msgid " Could not chdir to %s "
msgstr " Kunne ikke skifte katalog til %s "
-#: src/cmd.c:1314
+#: src/cmd.c:1317
msgid " Link to a remote machine "
msgstr " Lenke til en fjern maskin "
-#: src/cmd.c:1320
+#: src/cmd.c:1323
msgid " FTP to machine "
msgstr " FTP til maskin "
-#: src/cmd.c:1330
+#: src/cmd.c:1333
msgid " Socket source routing setup "
msgstr " Oppsett av kontaktens kilderuting"
-#: src/cmd.c:1331
+#: src/cmd.c:1334
msgid " Enter host name to use as a source routing hop: "
msgstr " Skriv inn vertsnavnet som skal brukes som kilderutingshop: "
-#: src/cmd.c:1338
+#: src/cmd.c:1341
msgid " Host name "
msgstr " Vertsnavn "
-#: src/cmd.c:1338
+#: src/cmd.c:1341
msgid " Error while looking up IP address "
msgstr " Feil under oppslag av IP-adresse "
-#: src/cmd.c:1349
+#: src/cmd.c:1352
msgid " Undelete files on an ext2 file system "
msgstr " Gjenopprett filer p� et ext2 filsystem "
-#: src/cmd.c:1350
+#: src/cmd.c:1353
msgid ""
" Enter device (without /dev/) to undelete\n"
" files on: (F1 for details)"
@@ -2854,11 +3105,11 @@
" Skriv inn enhet (uten /dev/) som det skal gjenopprettes\n"
" filer p�: (F1 for detaljer)"
-#: src/cmd.c:1400
+#: src/cmd.c:1403
msgid " Setup saved to ~/"
msgstr " Oppsett lagret til ~/"
-#: src/cmd.c:1405
+#: src/cmd.c:1408
msgid " Setup "
msgstr " Oppsett "
@@ -3049,7 +3300,7 @@
msgstr ""
" Kan ikke lage stabile symlinker over ikke-lokale filsystemer: \n"
"\n"
-" Alternativet stabile symlinker vil bli sl�tt av "
+" Alternativet stabile symbolske lenker vil bli sl�tt av "
#: src/file.c:442
#, c-format
@@ -3057,10 +3308,10 @@
" Cannot create target symlink \"%s\" \n"
" %s "
msgstr ""
-" Kan ikke lage m�lsymlinken \"%s\" \n"
+" Kan ikke lage m�llenken \"%s\" \n"
" %s "
-#: src/file.c:510
+#: src/file.c:509
#, c-format
msgid ""
" Cannot overwrite directory \"%s\" \n"
@@ -3069,7 +3320,7 @@
" Kan ikke overskrive katalogen \"%s\" \n"
" %s "
-#: src/file.c:519
+#: src/file.c:518
#, c-format
msgid ""
" Cannot stat source file \"%s\" \n"
@@ -3078,12 +3329,12 @@
" Kan ikke kj�re stat p� kildefilen \"%s\" \n"
" %s "
-#: src/file.c:532
+#: src/file.c:531
#, c-format
msgid " `%s' and `%s' are the same file. "
msgstr " `%s' og `%s' er samme fil. "
-#: src/file.c:575
+#: src/file.c:574
#, c-format
msgid ""
" Cannot create special file \"%s\" \n"
@@ -3092,7 +3343,7 @@
" Kan ikke opprette den spesielle filen \"%s\" \n"
" %s "
-#: src/file.c:584 src/file.c:813
+#: src/file.c:583 src/file.c:812
#, c-format
msgid ""
" Cannot chown target file \"%s\" \n"
@@ -3101,7 +3352,7 @@
" Kan ikke kj�re chown p� m�lfilen \"%s\" \n"
" %s "
-#: src/file.c:593 src/file.c:832
+#: src/file.c:592 src/file.c:831
#, c-format
msgid ""
" Cannot chmod target file \"%s\" \n"
@@ -3110,7 +3361,7 @@
" Kan ikke kj�re chmod p� m�lfilen \"%s\" \n"
" %s "
-#: src/file.c:610
+#: src/file.c:609
#, c-format
msgid ""
" Cannot open source file \"%s\" \n"
@@ -3119,11 +3370,11 @@
" Kan ikke �pne kildefilen \"%s\" \n"
" %s "
-#: src/file.c:620
+#: src/file.c:619
msgid " Reget failed, about to overwrite file "
msgstr " Gjenhenting feilet, kommer til � overskrive filen "
-#: src/file.c:626
+#: src/file.c:625
#, c-format
msgid ""
" Cannot fstat source file \"%s\" \n"
@@ -3132,7 +3383,7 @@
" Kan ikke kj�re fstat p� kildefilen \"%s\" \n"
" %s "
-#: src/file.c:652
+#: src/file.c:651
#, c-format
msgid ""
" Cannot create target file \"%s\" \n"
@@ -3141,7 +3392,7 @@
" Kan ikke opprette m�lfilen \"%s\" \n"
" %s "
-#: src/file.c:666
+#: src/file.c:665
#, c-format
msgid ""
" Cannot fstat target file \"%s\" \n"
@@ -3150,7 +3401,7 @@
" Kan ikke kj�re fstat p� m�lfilen \"%s\" \n"
" %s "
-#: src/file.c:697
+#: src/file.c:696
#, c-format
msgid ""
" Cannot read source file \"%s\" \n"
@@ -3159,7 +3410,7 @@
" Kan ikke lese kildefilen \"%s\" \n"
" %s "
-#: src/file.c:727
+#: src/file.c:726
#, c-format
msgid ""
" Cannot write target file \"%s\" \n"
@@ -3168,11 +3419,11 @@
" Kan ikke skrive til m�lfilen \"%s\" \n"
" %s "
-#: src/file.c:746
+#: src/file.c:745
msgid "(stalled)"
msgstr "(venter)"
-#: src/file.c:784
+#: src/file.c:783
#, c-format
msgid ""
" Cannot close source file \"%s\" \n"
@@ -3181,7 +3432,7 @@
" Kan ikke lukke kildefilen \"%s\" \n"
" %s "
-#: src/file.c:793
+#: src/file.c:792
#, c-format
msgid ""
" Cannot close target file \"%s\" \n"
@@ -3190,19 +3441,19 @@
" Kan ikke lukke m�lfilen \"%s\" \n"
" %s "
-#: src/file.c:803
+#: src/file.c:802
msgid "Incomplete file was retrieved. Keep it?"
msgstr "Ikke komplett fil ble hentet. Beholde den?"
-#: src/file.c:804
+#: src/file.c:803
msgid "&Delete"
msgstr "&Slett"
-#: src/file.c:804 src/hotlist.c:1443
+#: src/file.c:803 src/hotlist.c:1443
msgid "&Keep"
msgstr "&Behold"
-#: src/file.c:877
+#: src/file.c:876
#, c-format
msgid ""
" Cannot stat source directory \"%s\" \n"
@@ -3211,7 +3462,7 @@
" Kan ikke kj�re stat p� kildekatalogen \"%s\" \n"
" %s "
-#: src/file.c:900
+#: src/file.c:899
#, c-format
msgid ""
" Source directory \"%s\" is not a directory \n"
@@ -3221,7 +3472,7 @@
" %s "
#. we found a cyclic symbolic link
-#: src/file.c:908
+#: src/file.c:907
#, c-format
msgid ""
" Cannot copy cyclic symbolic link \n"
@@ -3230,7 +3481,7 @@
" Kan ikke kopiere en sirkul�r symbolsk lenke \n"
" `%s' "
-#: src/file.c:965
+#: src/file.c:964
#, c-format
msgid ""
" Cannot create target directory \"%s\" \n"
@@ -3239,7 +3490,7 @@
" Kan ikke opprette m�lkatalogen \"%s\" \n"
" %s "
-#: src/file.c:988
+#: src/file.c:987
#, c-format
msgid ""
" Cannot chown target directory \"%s\" \n"
@@ -3249,7 +3500,7 @@
" %s "
#. Source doesn't exist
-#: src/file.c:1101
+#: src/file.c:1100
#, c-format
msgid ""
" Cannot stat file \"%s\" \n"
@@ -3258,17 +3509,17 @@
" Kan ikke kj�re stat p� filen \"%s\" \n"
" %s "
-#: src/file.c:1123
+#: src/file.c:1122
#, c-format
msgid " `%s' and `%s' are the same file "
msgstr " `%s' og `%s' er samme fil "
-#: src/file.c:1130
+#: src/file.c:1129
#, c-format
msgid " Cannot overwrite directory `%s' "
msgstr " Kan ikke overskrive katalogen `%s' "
-#: src/file.c:1173
+#: src/file.c:1172
#, c-format
msgid ""
" Cannot move file \"%s\" to \"%s\" \n"
@@ -3277,7 +3528,7 @@
" Kan ikke flytte filen \"%s\" til \"%s\" \n"
" %s "
-#: src/file.c:1193
+#: src/file.c:1192
#, c-format
msgid ""
" Cannot remove file \"%s\" \n"
@@ -3286,17 +3537,17 @@
" Kan ikke fjerne filen \"%s\" \n"
" %s "
-#: src/file.c:1247
+#: src/file.c:1246
#, c-format
msgid " Cannot overwrite directory \"%s\" %s "
msgstr " Kan ikke overskrive katalogen \"%s\" %s "
-#: src/file.c:1249
+#: src/file.c:1248
#, c-format
msgid " Cannot overwrite file \"%s\" %s "
msgstr " Kan ikke overskrive filen \"%s\" %s "
-#: src/file.c:1276
+#: src/file.c:1275
#, c-format
msgid ""
" Cannot move directory \"%s\" to \"%s\" \n"
@@ -3305,7 +3556,7 @@
" Kan ikke flytte katalogen \"%s\" til \"%s\" \n"
" %s "
-#: src/file.c:1339
+#: src/file.c:1338
#, c-format
msgid ""
" Cannot delete file \"%s\" \n"
@@ -3314,7 +3565,7 @@
" Kan ikke slette filen \"%s\" \n"
" %s "
-#: src/file.c:1400 src/file.c:1470 src/file.c:1502
+#: src/file.c:1399 src/file.c:1469 src/file.c:1501
#, c-format
msgid ""
" Cannot remove directory \"%s\" \n"
@@ -3323,7 +3574,7 @@
" Kan ikke fjerne katalogen \"%s\" \n"
" %s "
-#: src/file.c:1541
+#: src/file.c:1540
msgid " Internal error: get_file \n"
msgstr " Intern feil: get_file \n"
@@ -3336,87 +3587,87 @@
#. * (I don't use spaces around the words, because someday they could be
#. * dropped, when widgets get smarter)
#.
-#: src/file.c:1662
+#: src/file.c:1661
msgid "1Copy"
msgstr "1Kopier"
-#: src/file.c:1662
+#: src/file.c:1661
msgid "1Move"
msgstr "1Flytt"
-#: src/file.c:1662
+#: src/file.c:1661
msgid "1Delete"
msgstr "1Slett"
-#: src/file.c:1677
+#: src/file.c:1676
#, c-format
msgid "%o %f \"%s\"%m"
msgstr "%o %f \"%s\"%m"
-#: src/file.c:1678
+#: src/file.c:1677
#, c-format
msgid "%o %d %f%m"
msgstr "%o %d %f%m"
-#: src/file.c:1680
+#: src/file.c:1679
#, c-format
msgid "%o %f \"%s\"%e"
msgstr "%o %f \"%s\"%e"
-#: src/file.c:1681
+#: src/file.c:1680
#, c-format
msgid "%o %d %f%e"
msgstr "%o %d %f%e"
-#: src/file.c:1685
+#: src/file.c:1684
msgid "file"
msgstr "fil"
-#: src/file.c:1685
+#: src/file.c:1684
msgid "files"
msgstr "filer"
-#: src/file.c:1685
+#: src/file.c:1684
msgid "directory"
msgstr "katalog"
-#: src/file.c:1685
+#: src/file.c:1684
msgid "directories"
msgstr "kataloger"
-#: src/file.c:1686
+#: src/file.c:1685
msgid "files/directories"
msgstr "filer/kataloger"
-#: src/file.c:1686
+#: src/file.c:1685
msgid " with source mask:"
msgstr " med kildemaske:"
-#: src/file.c:1838
+#: src/file.c:1837
msgid " Can't operate on \"..\"! "
msgstr " Kan ikke arbeide p� \"..\"! "
-#: src/file.c:1857
+#: src/file.c:1856
msgid "Yes"
msgstr "Ja"
-#: src/file.c:1857
+#: src/file.c:1856
msgid "No"
msgstr "Nei"
-#: src/file.c:1910
+#: src/file.c:1909
msgid " Sorry, I could not put the job in background "
msgstr " Beklager, Jeg kunne ikke plassere jobben i bakgrunnen "
-#: src/file.c:1997 src/file.c:2081
+#: src/file.c:1996 src/file.c:2080
msgid " Internal failure "
msgstr " Intern feil "
-#: src/file.c:1997 src/file.c:2081
+#: src/file.c:1996 src/file.c:2080
msgid " Unknown file operation "
msgstr " Ukjent filoperasjon "
-#: src/file.c:2012
+#: src/file.c:2011
#, c-format
msgid ""
" Destination \"%s\" must be a directory \n"
@@ -3425,15 +3676,15 @@
" M�let \"%s\" m� v�re en katalog \n"
" %s "
-#: src/file.c:2173
+#: src/file.c:2172
msgid "&Retry"
msgstr "&Pr�v igjen"
-#: src/file.c:2173 src/file.c:2234 src/filegui.c:263 src/filegui.c:591
+#: src/file.c:2172 src/file.c:2233 src/filegui.c:263 src/filegui.c:591
msgid "&Abort"
msgstr "&Avbryt"
-#: src/file.c:2225
+#: src/file.c:2224
msgid ""
"\n"
" Directory not empty. \n"
@@ -3443,7 +3694,7 @@
" Katalogen er ikke tom. \n"
" Slett den rekursivt? "
-#: src/file.c:2226
+#: src/file.c:2225
msgid ""
"\n"
" Background process: Directory not empty \n"
@@ -3453,27 +3704,27 @@
" Bakgrunnsprosess: Katalogen er ikke tom. \n"
" Slett den rekursivt? "
-#: src/file.c:2233
+#: src/file.c:2232
msgid "a&ll"
msgstr "a&lle"
-#: src/file.c:2233 src/filegui.c:594
+#: src/file.c:2232 src/filegui.c:594
msgid "non&E"
msgstr "ing&En"
-#: src/file.c:2243
+#: src/file.c:2242
msgid " Type 'yes' if you REALLY want to delete "
msgstr " Skriv 'ja' hvis du VIRKELIG vil slette "
-#: src/file.c:2245
+#: src/file.c:2244
msgid "all the directories "
msgstr "alle katalogene "
-#: src/file.c:2247
+#: src/file.c:2246
msgid " Recursive Delete "
msgstr " Rekursiv sletting "
-#: src/file.c:2248
+#: src/file.c:2247
msgid " Background process: Recursive Delete "
msgstr " Bakgrunnsprosess: Rekursiv sletting "
@@ -4468,7 +4719,7 @@
" du utf�re en manuell gjenlesing av katalogen. Se manualsiden for \n"
" detaljene."
-#: src/main.c:1689 src/screen.c:2288 src/screen.c:2318
+#: src/main.c:1689 src/screen.c:2305 src/screen.c:2335
msgid "Menu"
msgstr "Meny"
@@ -4563,11 +4814,11 @@
#: src/main.c:2698
msgid "Enables subshell support (default)"
-msgstr ""
+msgstr "Sl�r p� st�tte for underskall (standard)"
#: src/main.c:2703
msgid "Tries to use termcap instead of terminfo"
-msgstr ""
+msgstr "Pr�ver � bruke termcap i stedet for terminfo"
#: src/main.c:2707
msgid "Displays the current version"
@@ -4575,11 +4826,11 @@
#: src/main.c:2709
msgid "Launches the file viewer on a file"
-msgstr ""
+msgstr "Starter filvisning for en fil"
#: src/main.c:2711
msgid "Forces xterm features"
-msgstr ""
+msgstr "Tvungen bruk av xterm funksjoner"
#: src/main.c:2713
msgid "Geometry for the window"
@@ -4605,11 +4856,23 @@
"Kunne ikke �pne tty linjen. Du m� kj�re mc uten -P flagget.\n"
"P� noen systemer vil du kanskje bruke # `which mc`\n"
-#: src/main.c:3061
+#: src/main.c:3063
+msgid ""
+"You are running the GNOME Midnight Commander as root. \n"
+"\n"
+"You will not be protected from severly damaging your system\n"
+"if you continue."
+msgstr ""
+"Du kj�rer GNOME Midnight Commander som root. \n"
+"\n"
+"Du vil ikke v�re beskyttet fra � gj�re betydelig skade mot\n"
+"systemet ditt hvis du fortsetter."
+
+#: src/main.c:3073
msgid " Notice "
msgstr " Notis "
-#: src/main.c:3062
+#: src/main.c:3074
msgid ""
" The Midnight Commander configuration files \n"
" are now stored in the ~/.mc directory, the \n"
@@ -4792,10 +5055,6 @@
msgid "CTime"
msgstr "CTime"
-#: src/screen.c:432
-msgid "Permission"
-msgstr "Rettighet"
-
#: src/screen.c:433
msgid "Perm"
msgstr "Rett"
@@ -4821,27 +5080,27 @@
msgid " %s bytes in %d file%s"
msgstr " %s bytes i %d file%s"
-#: src/screen.c:1292
+#: src/screen.c:1306
msgid "Unknow tag on display format: "
msgstr "Ukjent merke p� skjermformatet: "
-#: src/screen.c:2051
+#: src/screen.c:2068
msgid " Do you really want to execute? "
msgstr " Vil du virkelig kj�re? "
-#: src/screen.c:2066
+#: src/screen.c:2083
msgid " No action taken "
msgstr " Ingen handling utf�rt "
-#: src/screen.c:2292 src/screen.c:2322 src/tree.c:1026
+#: src/screen.c:2309 src/screen.c:2339 src/tree.c:1026
msgid "RenMov"
msgstr "RenMov"
-#: src/screen.c:2293 src/screen.c:2323 src/tree.c:1030
+#: src/screen.c:2310 src/screen.c:2340 src/tree.c:1030
msgid "Mkdir"
msgstr "Mkdir"
-#: src/screen.c:2309
+#: src/screen.c:2326
#, c-format
msgid ""
" Can't chdir to %s \n"
@@ -4987,7 +5246,7 @@
msgid " User menu "
msgstr " Brukermeny "
-#: src/util.c:222
+#: src/util.c:228
msgid "name_trunc: too big"
msgstr "name_trunc: for stor"
@@ -5332,18 +5591,6 @@
#: src/win.c:272
msgid "NumLock on keypad"
msgstr "NumLock p� numerisk tastatur"
-
-#: src/wtools.c:587 vfs/vfs.c:1762
-msgid "Password:"
-msgstr "Passord:"
-
-#: src/wtools.c:587
-msgid "Password"
-msgstr "Passord"
-
-#: src/wtools.c:642
-msgid "Ok"
-msgstr "Ok"
#: vfs/extfs.c:266
#, c-format
Binary files old/mc-4.5.27/po/pl.gmo and new/mc-4.5.28/po/pl.gmo differ
diff -ruN old/mc-4.5.27/po/pl.po new/mc-4.5.28/po/pl.po
--- old/mc-4.5.27/po/pl.po Thu Mar 18 20:42:36 1999
+++ new/mc-4.5.28/po/pl.po Fri Mar 26 15:30:48 1999
@@ -99,15 +99,15 @@
#: gnome/gcmd.c:238
msgid "Time Last Accessed"
-msgstr ""
+msgstr "Czas ostatniego dost�pu"
#: gnome/gcmd.c:244
msgid "Time Last Modified"
-msgstr ""
+msgstr "czas ostatniej modyfikacji"
#: gnome/gcmd.c:250
msgid "Time Last Changed"
-msgstr ""
+msgstr "czas ostatniej zmiany"
#: gnome/gcmd.c:264
msgid "Reverse the order."
@@ -145,7 +145,7 @@
#: gnome/gcmd.c:494
msgid "Add"
-msgstr ""
+msgstr "Dodaj"
#: gnome/gcmd.c:498
#, fuzzy
@@ -210,7 +210,7 @@
#: gnome/gdesktop.c:1519
msgid "Trashcan"
-msgstr ""
+msgstr "�mietnik"
#. Create the link to the user's home directory so that he will have an icon
#: gnome/gdesktop.c:1549
@@ -225,11 +225,11 @@
#: gnome/gdialogs.c:58
msgid "To: "
-msgstr ""
+msgstr "Do: "
#: gnome/gdialogs.c:59
msgid "Copying from: "
-msgstr ""
+msgstr "Kopiuje z: "
#: gnome/gdialogs.c:60
#, fuzzy
@@ -259,7 +259,7 @@
#: gnome/gdialogs.c:380
#, fuzzy
msgid "Overwrite:"
-msgstr "Nadpisz"
+msgstr "Nadpisz:"
#: gnome/gdialogs.c:387
#, fuzzy
@@ -279,7 +279,7 @@
#: gnome/gdialogs.c:448
#, fuzzy
msgid "File Exists"
-msgstr " Plik istnieje "
+msgstr "Plik istnieje"
#: gnome/gdialogs.c:454
#, fuzzy, c-format
@@ -289,7 +289,7 @@
#: gnome/gdialogs.c:461
#, fuzzy
msgid "Replace it?"
-msgstr " Zast�p "
+msgstr "Zast�pi� ?"
#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 src/file.c:784
#: src/screen.c:2288 src/screen.c:2318 src/tree.c:1024
@@ -307,7 +307,7 @@
#: gnome/gdialogs.c:556
msgid "Find Destination Folder"
-msgstr ""
+msgstr "Znajd� folder docelowy"
#: gnome/gdialogs.c:561
#, fuzzy
@@ -342,7 +342,7 @@
#: gnome/gdialogs.c:608
msgid "Preserves the permissions and the UID/GID if possible"
-msgstr ""
+msgstr "Zachowaj atrybuty i UID/GID jezeli jest to mo�liwe"
#: gnome/gdialogs.c:613
#, fuzzy
@@ -3944,7 +3944,7 @@
#: src/main.c:1334
msgid " &Command "
-msgstr ""
+msgstr " &Komendy "
#: src/main.c:1335
msgid " &Options "
@@ -4096,7 +4096,7 @@
#: src/option.c:90
msgid "Compute &Totals"
-msgstr ""
+msgstr "&Podlicz wszystko"
#: src/option.c:91
msgid "&Verbose operation"
@@ -4181,8 +4181,7 @@
#: src/panelize.c:301
msgid " I can't run external panelize while logged on a non local directory "
-msgstr ""
-" Nie mog� uruchamia� zewn�trznego panelowania na nie lokalnym katalogu "
+msgstr " Nie mog� uruchamia� zewn�trznego panelowania na nie lokalnym katalogu "
#: src/panelize.c:351
msgid "Find *.orig after patching"
diff -ruN old/mc-4.5.27/src/ChangeLog new/mc-4.5.28/src/ChangeLog
--- old/mc-4.5.27/src/ChangeLog Thu Mar 18 20:42:30 1999
+++ new/mc-4.5.28/src/ChangeLog Fri Mar 26 15:30:42 1999
@@ -1,3 +1,40 @@
+1999-03-26 Federico Mena Quintero <federico@nuclecu.unam.mx>
+
+ Patch courtesy of John Bley (jbb6@acpub.duke.edu):
+
+ * background.c (do_background): Use pid_t instead of int.
+
+ * subshell.c (sigchld_handler): Likewise.
+
+1999-03-24 Federico Mena Quintero <federico@nuclecu.unam.mx>
+
+ * Makefile.in: Use mcsrclibdir where appropriate.
+
+1999-03-22 Miguel de Icaza <miguel@nuclecu.unam.mx>
+
+ * treestore.c (process_special_dirs): Free memory here.
+
+ Fix test: Skip only "." and "..", before it could skip "?.".
+
+1999-03-22 David Martin <dmartina@mailexcite.com>
+
+ * wtools.c (real_input_dialog_help): Do a strncmp with the lenght
+ of th same translated "Password:" string.
+
+Mon Mar 22 02:05:28 1999 Timur Bakeyev <mc@bat.ru>
+
+ * screen.c (file_entry_color): Dropped. Code went to file_compute_color.
+
+ * screen (format_file): Add check, that avoids reported error, when
+ long file list -> quick view -> brief file list gives core dump.
+
+1999-03-19 Jonathan Blandford <jrb@redhat.com>
+
+ * main.c (main): We don't want to restart if we hit cancel.
+
+ * file.c (panel_operate): Ugly hack for GNOME. We only treat the
+ copy as if it were many files, and skip the only_one branch.
+
1999-03-18 Miguel de Icaza <miguel@nuclecu.unam.mx>
* utilunix.c (close_error_pipe): Inform parent of the return value
@@ -6,8 +43,8 @@
Thu Mar 18 16:09:09 1999 Timur Bakeyev <mc@bat.ru>
- * panel.h, screen.c: Add an ability to center justify fields in
- panel, in addition to left and right justificatin. Just for fun.
+ * panel.h, screen.c: Add an ability to center justify fields in the
+ panel, in addition to left and right justification. Just for fun.
Try =name in user format.
* util.c (name_quote): Quote "~@^|;:". Hope, that's all :)
diff -ruN old/mc-4.5.27/src/Makefile.in new/mc-4.5.28/src/Makefile.in
--- old/mc-4.5.27/src/Makefile.in Thu Mar 18 20:42:30 1999
+++ new/mc-4.5.28/src/Makefile.in Fri Mar 26 15:30:42 1999
@@ -98,9 +98,9 @@
@PCENTRULE@ -$(RMF) libedit.a
@PCENTRULE@ $(LN_S) ../edit/libedit.a .
-$(srcdir)/mc.hlp: $(docdir)/mc.1.in $(mclibdir)/xnc.hlp $(srcdir)/gindex.pl
+$(srcdir)/mc.hlp: $(docdir)/mc.1.in $(mcsrclibdir)/xnc.hlp $(srcdir)/gindex.pl
$(MAKE) man2hlp
- ./man2hlp 58 $(docdir)/mc.1.in | cat - $(mclibdir)/xnc.hlp | \
+ ./man2hlp 58 $(docdir)/mc.1.in | cat - $(mcsrclibdir)/xnc.hlp | \
perl $(srcdir)/gindex.pl > $(srcdir)/mc.hlp
mc.html: $(docdir)/mc.1.in man2hlp
@@ -132,7 +132,7 @@
install: mc mcmfmt @saver@
$(INSTALL_PROGRAM) mc $(DESTDIR)$(bindir)/$(binprefix)mc
$(INSTALL_PROGRAM) mcmfmt $(DESTDIR)$(bindir)/$(binprefix)mcmfmt
- $(SEDCMD2) < $(srcdir)/mc.hlp > $(DESTDIR)$(libdir)/$(libprefix)mc.hlp
+ $(SEDCMD2) < $(srcdir)/mc.hlp > $(DESTDIR)$(mclibdir)/$(libprefix)mc.hlp
install.saver: cons.saver
$(INSTALL_PROGRAM) -m 4755 cons.saver $(DESTDIR)$(suppbindir)/cons.saver
@@ -141,7 +141,7 @@
$(RMF) $(bindir)/$(binprefix)mc
$(RMF) $(bindir)/$(binprefix)mcmfmt
$(RMF) $(bindir)/$(binprefix)cons.saver
- $(RMF) $(libdir)/$(libprefix)mc.hlp
+ $(RMF) $(mclibdir)/$(libprefix)mc.hlp
distcopy: $(srcdir)/mc.hlp
$(CP) $(DISTFILES) ../../mc-$(VERSION)/src
diff -ruN old/mc-4.5.27/src/background.c new/mc-4.5.28/src/background.c
--- old/mc-4.5.27/src/background.c Thu Mar 18 20:42:30 1999
+++ new/mc-4.5.28/src/background.c Fri Mar 26 15:30:42 1999
@@ -127,7 +127,7 @@
do_background (FileOpContext *ctx, char *info)
{
int comm [2]; /* control connection stream */
- int pid;
+ pid_t pid;
if (socketpair (AF_UNIX, SOCK_STREAM, 0, comm) == -1)
return -1;
diff -ruN old/mc-4.5.27/src/file.c new/mc-4.5.28/src/file.c
--- old/mc-4.5.27/src/file.c Thu Mar 18 20:42:29 1999
+++ new/mc-4.5.28/src/file.c Fri Mar 26 15:30:42 1999
@@ -107,7 +107,7 @@
/* }}} */
-/* rcsid [] = "$Id: file.c,v 1.56 1999/03/16 00:11:41 unammx Exp $" */
+/* rcsid [] = "$Id: file.c,v 1.57 1999/03/19 17:13:47 jrb Exp $" */
int verbose = 1;
@@ -765,7 +765,7 @@
}
file_progress_set_stalled_label (ctx, stalled_msg);
-
+ file_progress_show_bytes (ctx, *progress_bytes + n_read_total, ctx->progress_bytes);
return_status = file_progress_show (ctx, n_read_total, file_size);
mc_refresh ();
if (return_status != FILE_CONT)
@@ -1942,6 +1942,7 @@
file_op_context_create_ui (ctx, operation, 1);
/* This code is only called by the tree and panel code */
+#ifndef HAVE_GNOME
if (only_one){
/* We now have ETA in all cases */
@@ -2002,7 +2003,7 @@
unmark_files (panel);
} else {
/* Many files */
-
+#endif
/* Check destination for copy or move operation */
if (operation != OP_DELETE){
retry_many_dst_stat:
@@ -2107,8 +2108,9 @@
mc_refresh ();
} /* Loop for every file */
+#ifndef HAVE_GNOME
} /* Many files */
-
+#endif
clean_up:
/* Clean up */
diff -ruN old/mc-4.5.27/src/main.c new/mc-4.5.28/src/main.c
--- old/mc-4.5.27/src/main.c Thu Mar 18 20:42:29 1999
+++ new/mc-4.5.28/src/main.c Fri Mar 26 15:30:41 1999
@@ -139,7 +139,7 @@
#include "popt.h"
-/* "$Id: main.c,v 1.86 1999/03/18 18:44:02 unammx Exp $" */
+/* "$Id: main.c,v 1.88 1999/03/20 18:09:11 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 */
@@ -358,6 +358,9 @@
/* If set, then no windows are displayed in the GNOME edition */
int nowindows = 0;
+/* If set it displays the directory that holds the gnome .links files */
+int display_linksdir = 0;
+
/* Forward declarations */
char *get_mc_lib_dir ();
int panel_event (Gpm_Event *event, WPanel *panel);
@@ -2544,7 +2547,7 @@
version (1);
finish_program = 1;
break;
-
+
case 'c':
disable_colors = 0;
#ifdef HAVE_SLANG
@@ -2713,6 +2716,8 @@
{ "geometry", '\0', POPT_ARG_STRING, &cmdline_geometry, 0, N_("Geometry for the window"), N_("GEOMETRY")},
{"nowindows", '\0', POPT_ARG_NONE, &nowindows, 0, N_("No windows opened at startup"), NULL},
{"force-activation",0,POPT_ARG_NONE, &force_activation, 0, N_("Force activation even if a server is already running"), NULL},
+ {"desktop-linksdir", '\0', POPT_ARG_NONE, &display_linksdir, 0,
+ N_("Displays the directory that holds the .links startup files")},
#endif
{ NULL, 0, 0, NULL, 0 }
@@ -2741,6 +2746,11 @@
orb = gnome_CORBA_init_with_popt_table (
"gmc", VERSION, &argc, argv, argument_table, 0, &ctx, GNORBA_INIT_SERVER_FUNC, &ev);
+ if (display_linksdir){
+ puts (DESKTOP_INIT_DIR);
+ exit (1);
+ }
+
corba_init ();
if (!force_activation)
if (try_to_activate_running_copy ())
@@ -2748,6 +2758,10 @@
#else
gnome_init_with_popt_table ("gmc", VERSION, argc, argv, argument_table, 0, &ctx);
#endif
+ if (display_linksdir){
+ puts (DESKTOP_INIT_DIR);
+ exit (1);
+ }
gtk_widget_push_visual (gdk_imlib_get_visual ());
gtk_widget_push_colormap (gdk_imlib_get_colormap ());
@@ -2888,7 +2902,6 @@
{
char *tree_file;
- printf ("Saving tree!\n");
tree_file = concat_dir_and_file (home_dir, MC_TREE);
tree_store_save (tree_file);
g_free (tree_file);
@@ -2896,10 +2909,6 @@
int main (int argc, char *argv [])
{
-#ifdef HAVE_GNOME
- /* Just to time things */
- printf ("GNU Midnight Commander " VERSION "\n");
-#endif
/* We had LC_CTYPE before, LC_ALL includs LC_TYPE as well */
setlocale (LC_ALL, "");
bindtextdomain ("mc", LOCALEDIR);
@@ -3065,8 +3074,13 @@
"if you continue."),
GNOME_MESSAGE_BOX_WARNING,
_("Continue"), GNOME_STOCK_BUTTON_CANCEL, NULL);
- if (gnome_dialog_run (GNOME_DIALOG (warning_dlg)) != 0)
+ if (gnome_dialog_run (GNOME_DIALOG (warning_dlg)) != 0) {
+ GnomeClient *client = NULL;
+
+ client = gnome_master_client ();
+ gnome_client_set_restart_style (client, GNOME_RESTART_NEVER);
exit (0);
+ }
}
#endif
if (show_change_notice){
diff -ruN old/mc-4.5.27/src/screen.c new/mc-4.5.28/src/screen.c
--- old/mc-4.5.27/src/screen.c Thu Mar 18 20:42:29 1999
+++ new/mc-4.5.28/src/screen.c Fri Mar 26 15:30:41 1999
@@ -12,7 +12,7 @@
GNU General Public License for more details.
Written by: 1995 Miguel de Icaza
- 1997 Timur Bakeyev
+ 1997, 1999 Timur Bakeyev
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
@@ -73,7 +73,6 @@
/* If 1 - then add per file type hilighting */
int filetype_mode = 1;
-
/* This gives abilitiy to determine colored user priveleges */
extern user_in_groups *current_user_gid;
extern uid_t current_user_uid;
@@ -181,35 +180,6 @@
}
#endif /* HAVE_X */
-int
-file_entry_color (file_entry *fe)
-{
- if (filetype_mode){
- if (S_ISDIR (fe->buf.st_mode))
- return (DIRECTORY_COLOR);
- else if (S_ISLNK (fe->buf.st_mode)) {
- if (fe->f.link_to_dir)
- return (DIRECTORY_COLOR);
- else if (fe->f.stalled_link)
- return (STALLED_LINK_COLOR);
- else
- return (LINK_COLOR);
- } else if (S_ISSOCK (fe->buf.st_mode))
- return (SPECIAL_COLOR);
- else if (S_ISCHR (fe->buf.st_mode))
- return (DEVICE_COLOR);
- else if (S_ISBLK (fe->buf.st_mode))
- return (DEVICE_COLOR);
- else if (S_ISFIFO (fe->buf.st_mode))
- return (SPECIAL_COLOR);
- else if (is_exe (fe->buf.st_mode))
- return (EXECUTABLE_COLOR);
- else if (fe->fname && (!strcmp (fe->fname, "core") || !strcmp (extension(fe->fname), "core")))
- return (CORE_COLOR);
- }
- return (NORMAL_COLOR);
-}
-
/* String representations of various file attributes */
/* name */
char *
@@ -289,7 +259,7 @@
buffer [0] = '*';
else
buffer [0] = ' ';
- buffer [1] = 0;
+ buffer [1] = '\0';
return buffer;
}
@@ -448,9 +418,10 @@
{
int txtlen = strlen (txt);
int still, over;
-
- memset (dest, ' ', len);
+ /* Fill buffer with spaces */
+ memset (dest, ' ', len);
+
still = (over=(txtlen > len)) ? (txtlen - len) : (len - txtlen);
switch (HIDE_FIT(just_mode)){
@@ -481,26 +452,45 @@
int
file_compute_color (int attr, file_entry *fe)
{
- int color;
-
switch (attr){
case SELECTED:
- color = SELECTED_COLOR;
- break;
+ return (SELECTED_COLOR);
case MARKED:
- color = MARKED_COLOR;
- break;
+ return (MARKED_COLOR);
case MARKED_SELECTED:
- color = MARKED_SELECTED_COLOR;
- break;
+ return (MARKED_SELECTED_COLOR);
case STATUS:
- color = NORMAL_COLOR;
- break;
+ return (NORMAL_COLOR);
case NORMAL:
default:
- color = file_entry_color(fe);
+ if (!filetype_mode)
+ return (NORMAL_COLOR);
}
- return color;
+
+ /* if filetype_mode == true */
+ if (S_ISDIR (fe->buf.st_mode))
+ return (DIRECTORY_COLOR);
+ else if (S_ISLNK (fe->buf.st_mode)){
+ if (fe->f.link_to_dir)
+ return (DIRECTORY_COLOR);
+ else if (fe->f.stalled_link)
+ return (STALLED_LINK_COLOR);
+ else
+ return (LINK_COLOR);
+ } else if (S_ISSOCK (fe->buf.st_mode))
+ return (SPECIAL_COLOR);
+ else if (S_ISCHR (fe->buf.st_mode))
+ return (DEVICE_COLOR);
+ else if (S_ISBLK (fe->buf.st_mode))
+ return (DEVICE_COLOR);
+ else if (S_ISFIFO (fe->buf.st_mode))
+ return (SPECIAL_COLOR);
+ else if (is_exe (fe->buf.st_mode))
+ return (EXECUTABLE_COLOR);
+ else if (fe->fname && (!strcmp (fe->fname, "core") || !strcmp (extension(fe->fname), "core")))
+ return (CORE_COLOR);
+
+ return (NORMAL_COLOR); /* just for safeness */
}
/* Formats the file number file_index of panel in the buffer dest */
@@ -523,7 +513,12 @@
color = file_compute_color (attr, fe);
else
color = NORMAL_COLOR;
+
for (format = home; format; format = format->next){
+
+ if (length == width)
+ break;
+
if (format->string_fn){
int len;
@@ -540,10 +535,7 @@
cdest = to_buffer (cdest, format->just_mode, len, txt);
length += len;
-#ifdef HAVE_X
- if (length == width)
- break;
-#else
+#ifndef HAVE_X
attrset (color);
if (permission_mode && !strcmp(format->id, "perm"))
@@ -552,6 +544,7 @@
add_permission_string (old_pos, format->field_len, fe, attr, color, 1);
else
addstr (old_pos);
+
#endif
} else {
#ifndef HAVE_X
@@ -572,7 +565,7 @@
while (still--)
#ifdef HAVE_X
*cdest++ = ' ';
- *cdest = 0;
+ *cdest = '\0';
#else
addch (' ');
#endif
@@ -899,7 +892,7 @@
/* If the program is shuting down */
if ((midnight_shutdown && auto_save_setup) || saving_setup)
- return g_strconcat (panel->panel_name, NULL);
+ return g_strdup (panel->panel_name);
else
return g_strconcat ("Temporal:", panel->panel_name, NULL);
}
@@ -1181,7 +1174,7 @@
| format , one_format_e
one_format_e := just format.id [opt_size]
- just := [<|>]
+ just := [<=>]
opt_size := : size [opt_expand]
size := [0-9]+
opt_expand := +
diff -ruN old/mc-4.5.27/src/subshell.c new/mc-4.5.28/src/subshell.c
--- old/mc-4.5.27/src/subshell.c Thu Mar 18 20:42:30 1999
+++ new/mc-4.5.28/src/subshell.c Fri Mar 26 15:30:42 1999
@@ -816,7 +816,8 @@
void sigchld_handler (int sig)
{
- int pid, status;
+ int status;
+ pid_t pid;
pid = waitpid (subshell_pid, &status, WUNTRACED | WNOHANG);
diff -ruN old/mc-4.5.27/src/treestore.c new/mc-4.5.28/src/treestore.c
--- old/mc-4.5.27/src/treestore.c Thu Mar 18 20:42:30 1999
+++ new/mc-4.5.28/src/treestore.c Fri Mar 26 15:30:42 1999
@@ -703,6 +703,7 @@
*special_dirs = g_list_prepend (*special_dirs, g_strdup (token));
s = NULL;
}
+ g_free (buffer);
}
gboolean
@@ -751,9 +752,11 @@
for (dp = mc_readdir (dirp); dp; dp = mc_readdir (dirp)){
char *full_name;
- if ((dp->d_name [0] == '.' && dp->d_name [1] == 0)
- || (dp->d_name [1] == '.' && dp->d_name [2] == 0))
- continue;
+ if (dp->d_name [0] == '.'){
+ if (dp->d_name [1] == 0
+ || (dp->d_name [1] == '.' && dp->d_name [2] == 0))
+ continue;
+ }
full_name = concat_dir_and_file (dir, dp->d_name);
if (mc_lstat (full_name, &buf) != -1){
diff -ruN old/mc-4.5.27/src/wtools.c new/mc-4.5.28/src/wtools.c
--- old/mc-4.5.27/src/wtools.c Thu Mar 18 20:42:30 1999
+++ new/mc-4.5.28/src/wtools.c Fri Mar 26 15:30:42 1999
@@ -28,7 +28,7 @@
/* }}} */
-/* [] = "$Id: wtools.c,v 1.16 1999/03/16 20:46:57 unammx Exp $" */
+/* [] = "$Id: wtools.c,v 1.17 1999/03/24 12:17:08 unammx Exp $" */
#include <config.h>
#include <string.h>
@@ -581,8 +581,10 @@
len = max (strlen (header), msglen (text, &lines)) + 4;
len = max (len, 64);
-
- if (strncmp (text, _("Password:"), strlen (_("Password"))) == 0){
+
+ /* Translators should take care as "Password" or its translations
+ are used to identify password boxes and hide characters with "*" */
+ if (strncmp (text, _("Password:"), strlen (_("Password:"))-1) == 0){
quick_widgets [INPUT_INDEX].value = 1;
tk_name[3]=0;
} else {
diff -ruN old/mc-4.5.27/syntax/Makefile.in new/mc-4.5.28/syntax/Makefile.in
--- old/mc-4.5.27/syntax/Makefile.in Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/syntax/Makefile.in Fri Mar 26 15:30:45 1999
@@ -0,0 +1,68 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+rootdir = $(srcdir)/..
+@MCFG@@MCF@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+
+#
+# Distribution variables
+#
+
+DISTSYNTAX = Makefile.in $(ALLSYNTAX)
+ALLSYNTAX = \
+ c.syntax \
+ changelog.syntax \
+ diff.syntax \
+ diffc.syntax \
+ html.syntax \
+ java.syntax \
+ latex.syntax \
+ lsm.syntax \
+ makefile.syntax \
+ ml.syntax \
+ nroff.syntax \
+ pascal.syntax \
+ perl.syntax \
+ python.syntax \
+ sh.syntax \
+ smalltalk.syntax
+
+all:
+
+Makefile: Makefile.in ../config.status
+ (cd ..; CONFIG_FILES=syntax/Makefile CONFIG_HEADERS= ./config.status)
+
+
+install: Makefile
+ for I in $(ALLSYNTAX); \
+ do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(syntaxdir)/$$I; done
+
+uninstall:
+ for I in $(ALLSYNTAX); \
+ do $(RMF) $(DESTDIR)$(syntaxdir)/$$I; done
+ -rmdir $(DESTDIR)$(syntaxdir)
+
+check:
+ @echo no tests are supplied.
+
+TAGS:
+
+cross:
+
+clean:
+
+realclean:
+
+distclean:
+ -$(RMF) $(srcdir)/*~ $(srcdir)/Makefile
+
+distcopy:
+ $(CP) $(DISTSYNTAX) ../../mc-$(VERSION)/syntax
+
+depend dep:
+
+
diff -ruN old/mc-4.5.27/syntax/c.syntax new/mc-4.5.28/syntax/c.syntax
--- old/mc-4.5.27/syntax/c.syntax Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/syntax/c.syntax Fri Mar 26 15:30:45 1999
@@ -0,0 +1,128 @@
+context default
+ keyword whole auto yellow/24
+ keyword whole break yellow/24
+ keyword whole case yellow/24
+ keyword whole char yellow/24
+ keyword whole const yellow/24
+ keyword whole continue yellow/24
+ keyword whole default yellow/24
+ keyword whole do yellow/24
+ keyword whole double yellow/24
+ keyword whole else yellow/24
+ keyword whole enum yellow/24
+ keyword whole extern yellow/24
+ keyword whole float yellow/24
+ keyword whole for yellow/24
+ keyword whole goto yellow/24
+ keyword whole if yellow/24
+ keyword whole int yellow/24
+ keyword whole long yellow/24
+ keyword whole register yellow/24
+ keyword whole return yellow/24
+ keyword whole short yellow/24
+ keyword whole signed yellow/24
+ keyword whole sizeof yellow/24
+ keyword whole static yellow/24
+ keyword whole struct yellow/24
+ keyword whole switch yellow/24
+ keyword whole typedef yellow/24
+ keyword whole union yellow/24
+ keyword whole unsigned yellow/24
+ keyword whole void yellow/24
+ keyword whole volatile yellow/24
+ keyword whole while yellow/24
+ keyword whole asm yellow/24
+ keyword whole catch yellow/24
+ keyword whole class yellow/24
+ keyword whole friend yellow/24
+ keyword whole delete yellow/24
+ keyword whole inline yellow/24
+ keyword whole new yellow/24
+ keyword whole operator yellow/24
+ keyword whole private yellow/24
+ keyword whole protected yellow/24
+ keyword whole public yellow/24
+ keyword whole this yellow/24
+ keyword whole throw yellow/24
+ keyword whole template yellow/24
+ keyword whole try yellow/24
+ keyword whole virtual yellow/24
+ keyword whole bool yellow/24
+ keyword whole const_cast yellow/24
+ keyword whole dynamic_cast yellow/24
+ keyword whole explicit yellow/24
+ keyword whole false yellow/24
+ keyword whole mutable yellow/24
+ keyword whole namespace yellow/24
+ keyword whole reinterpret_cast yellow/24
+ keyword whole static_cast yellow/24
+ keyword whole true yellow/24
+ keyword whole typeid yellow/24
+ keyword whole typename yellow/24
+ keyword whole using yellow/24
+ keyword whole wchar_t yellow/24
+ keyword whole ... yellow/24
+
+ keyword /\* brown/22
+ keyword \*/ brown/22
+
+ keyword '\s' brightgreen/16
+ keyword '+' brightgreen/16
+ keyword > yellow/24
+ keyword < yellow/24
+ keyword \+ yellow/24
+ keyword - yellow/24
+ keyword \* yellow/24
+# keyword / yellow/24
+ keyword % yellow/24
+ keyword = yellow/24
+ keyword != yellow/24
+ keyword == yellow/24
+ keyword { brightcyan/14
+ keyword } brightcyan/14
+ keyword ( brightcyan/15
+ keyword ) brightcyan/15
+ keyword [ brightcyan/14
+ keyword ] brightcyan/14
+ keyword , brightcyan/14
+ keyword : brightcyan/14
+ keyword ; brightmagenta/19
+context exclusive /\* \*/ brown/22
+context // \n brown/22
+context linestart # \n brightred/18
+ keyword \\\n yellow/24
+ keyword /\**\*/ brown/22
+ keyword "+" red/19
+ keyword <+> red/19
+context " " green/6
+ keyword \\" brightgreen/16
+ keyword %% brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]e brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]E brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]f brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]g brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]G brightgreen/16
+ keyword %\[0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]d brightgreen/16
+ keyword %\[0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]i brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]o brightgreen/16
+ keyword %\[0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]u brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]x brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]X brightgreen/16
+ keyword %\[hl\]n brightgreen/16
+ keyword %\[.\]\[0123456789\]s brightgreen/16
+ keyword %[*] brightgreen/16
+ keyword %c brightgreen/16
+ keyword \\\\ brightgreen/16
+ keyword \\' brightgreen/16
+ keyword \\a brightgreen/16
+ keyword \\b brightgreen/16
+ keyword \\t brightgreen/16
+ keyword \\n brightgreen/16
+ keyword \\v brightgreen/16
+ keyword \\f brightgreen/16
+ keyword \\r brightgreen/16
+ keyword \\0 brightgreen/16
+
+###############################################################################
+
+
diff -ruN old/mc-4.5.27/syntax/changelog.syntax new/mc-4.5.28/syntax/changelog.syntax
--- old/mc-4.5.27/syntax/changelog.syntax Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/syntax/changelog.syntax Fri Mar 26 15:30:45 1999
@@ -0,0 +1,30 @@
+
+context default
+ keyword \s+() brightmagenta/23
+ keyword \t+() brightmagenta/23
+
+context linestart \t\* : brightcyan/17
+context linestart \s\s\s\s\s\s\s\s\* : brightcyan/17
+
+context linestart 19+-+\s \n yellow/24
+ keyword <+@+> brightred/19
+context linestart 20+-+\s \n yellow/24
+ keyword <+@+> brightred/19
+context linestart Mon\s+\s+\s+\s \n yellow/24
+ keyword <+@+> brightred/19
+context linestart Tue\s+\s+\s+\s \n yellow/24
+ keyword <+@+> brightred/19
+context linestart Wed\s+\s+\s+\s \n yellow/24
+ keyword <+@+> brightred/19
+context linestart Thu\s+\s+\s+\s \n yellow/24
+ keyword <+@+> brightred/19
+context linestart Fri\s+\s+\s+\s \n yellow/24
+ keyword <+@+> brightred/19
+context linestart Sat\s+\s+\s+\s \n yellow/24
+ keyword <+@+> brightred/19
+context linestart Sun\s+\s+\s+\s \n yellow/24
+ keyword <+@+> brightred/19
+
+
+###############################################################################
+
diff -ruN old/mc-4.5.27/syntax/diff.syntax new/mc-4.5.28/syntax/diff.syntax
--- old/mc-4.5.27/syntax/diff.syntax Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/syntax/diff.syntax Fri Mar 26 15:30:45 1999
@@ -0,0 +1,38 @@
+# yawn
+context default
+ keyword linestart @@*@@ green/16
+ keyword linestart \s black/0 white/26
+context linestart diff \n white/26 red/9
+context linestart --- \n brightmagenta/20
+context linestart +++ \n brightmagenta/20
+context linestart + \n brightgreen/6
+context linestart - \n brightred/18
+context linestart A \n white/26 black/0
+context linestart B \n white/26 black/0
+context linestart C \n white/26 black/0
+context linestart D \n white/26 black/0
+context linestart E \n white/26 black/0
+context linestart F \n white/26 black/0
+context linestart G \n white/26 black/0
+context linestart H \n white/26 black/0
+context linestart I \n white/26 black/0
+context linestart J \n white/26 black/0
+context linestart K \n white/26 black/0
+context linestart L \n white/26 black/0
+context linestart M \n white/26 black/0
+context linestart N \n white/26 black/0
+context linestart O \n white/26 black/0
+context linestart P \n white/26 black/0
+context linestart Q \n white/26 black/0
+context linestart R \n white/26 black/0
+context linestart S \n white/26 black/0
+context linestart T \n white/26 black/0
+context linestart U \n white/26 black/0
+context linestart V \n white/26 black/0
+context linestart W \n white/26 black/0
+context linestart X \n white/26 black/0
+context linestart Y \n white/26 black/0
+context linestart Z \n white/26 black/0
+
+###############################################################################
+
diff -ruN old/mc-4.5.27/syntax/diffc.syntax new/mc-4.5.28/syntax/diffc.syntax
--- old/mc-4.5.27/syntax/diffc.syntax Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/syntax/diffc.syntax Fri Mar 26 15:30:45 1999
@@ -0,0 +1,14 @@
+# Jeroen Ruigrok van der Werven <asmodai@wxs.nl>
+# did thusly spake:
+
+context default
+ keyword linestart \s black/0 white/26
+ keyword linestart \*\*\*\*\*\*\*\*\*\*\*\*\*\*\* white/26 brightred/18
+ keyword linestart \*\*\**\*\*\*\* white/26 brightcyan/14
+context linestart diff \n white/26 red/9
+context linestart --- \n brightmagenta/20
+context linestart \*\*\* \n brightmagenta/20
+context linestart + \n green/6
+context linestart ! \n yellow/24
+
+
diff -ruN old/mc-4.5.27/syntax/html.syntax new/mc-4.5.28/syntax/html.syntax
--- old/mc-4.5.27/syntax/html.syntax Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/syntax/html.syntax Fri Mar 26 15:30:45 1999
@@ -0,0 +1,19 @@
+
+context default white/25
+ keyword whole &*; brightgreen/16
+context <!-- --> white/26
+context < > brightcyan/17
+ keyword "http:*" magenta/22
+ keyword "ftp:*" magenta/22
+ keyword "mailto:*" magenta/22
+ keyword "gopher:*" magenta/22
+ keyword "telnet:*" magenta/22
+ keyword "file:*" magenta/22
+ keyword "*.gif" brightred/19
+ keyword "*.jpg" brightred/19
+ keyword "*.png" brightred/19
+ keyword "*" cyan/5
+
+###############################################################################
+# Pascal (BP7 IDE alike)
+
diff -ruN old/mc-4.5.27/syntax/java.syntax new/mc-4.5.28/syntax/java.syntax
--- old/mc-4.5.27/syntax/java.syntax Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/syntax/java.syntax Fri Mar 26 15:30:45 1999
@@ -0,0 +1,168 @@
+#From lol_zimmerli%headbanger.ch@mail.headbanger.ch Tue Feb 9 15:26:11 1999
+#
+#Hi again,
+#
+#>Cooledit checks the extension and the first line of a file.
+#>You can add in .java to the .c .cpp and so on, in your ~/.cedit/syntax
+#>file.
+#
+#Very simple, in fact. Bravo!
+#
+#I've edited it and added a 'Java Program' item. It's a quick edit, so it
+#may contain typos and/or error. Maybe I also have forgot some words...
+#
+#The java item is a copy of the c/c++ with stuff added (The first lines
+#until the comment).
+#and stuff deleted (some c/c++ specific words).
+#
+#I'm not sure how I named it (file ..\*\\.(java|JAVA|Java|jav)$
+#Java\sProgram)...
+#
+#Feel free to do whatever you want with it, including distribute it in any
+#ways, delete it, re-edit it... Just, if you re-edit it, please mail me it
+#back.
+#
+#
+#>Thanks for the feedback
+#
+#Thank you for cooledit :)
+#
+#
+#/* Lol Zimmerli */
+## Encoder
+#// www.headbanger.ch
+#<!-- www.couleur3.ch www.ebel.ch www.refresh.ch -->
+#
+#
+
+context default
+ keyword whole abstract yellow/24
+ keyword whole boolean yellow/24
+ keyword whole byte yellow/24
+ keyword whole byvalue yellow/24
+ keyword whole cast yellow/24
+ keyword whole extends yellow/24
+ keyword whole final yellow/24
+ keyword whole implements yellow/24
+ keyword whole import yellow/24
+ keyword whole inner yellow/24
+ keyword whole instanceof yellow/24
+ keyword whole outer yellow/24
+ keyword whole package yellow/24
+ keyword whole rest yellow/24
+ keyword whole synchronized yellow/24
+ keyword whole throws yellow/24
+ keyword whole transient yellow/24
+ keyword whole finally yellow/24
+ keyword whole future yellow/24
+ keyword whole generic yellow/24
+ keyword whole interface yellow/24
+ keyword whole native yellow/24
+ keyword whole null yellow/24
+ keyword whole super yellow/24
+ keyword whole var yellow/24
+ keyword whole clone brightred/18
+ keyword whole equals brightred/18
+ keyword whole finalize brightred/18
+ keyword whole getClass brightred/18
+ keyword whole hashCode brightred/18
+ keyword whole notify brightred/18
+ keyword whole notifyAll brightred/18
+ keyword whole toString brightred/18
+ keyword whole wait brightred/18
+ #end Lol's adds
+ keyword whole break yellow/24
+ keyword whole case yellow/24
+ keyword whole char yellow/24
+ keyword whole const yellow/24
+ keyword whole continue yellow/24
+ keyword whole default yellow/24
+ keyword whole do yellow/24
+ keyword whole double yellow/24
+ keyword whole else yellow/24
+ keyword whole float yellow/24
+ keyword whole for yellow/24
+ keyword whole goto yellow/24
+ keyword whole if yellow/24
+ keyword whole int yellow/24
+ keyword whole long yellow/24
+ keyword whole return yellow/24
+ keyword whole short yellow/24
+ keyword whole static yellow/24
+ keyword whole switch yellow/24
+ keyword whole void yellow/24
+ keyword whole volatile yellow/24
+ keyword whole while yellow/24
+ keyword whole catch yellow/24
+ keyword whole class yellow/24
+ keyword whole new yellow/24
+ keyword whole private yellow/24
+ keyword whole protected yellow/24
+ keyword whole public yellow/24
+ keyword whole this yellow/24
+ keyword whole throw yellow/24
+ keyword whole try yellow/24
+ keyword whole false yellow/24
+ keyword whole true yellow/24
+
+ keyword /\* brown/22
+ keyword \*/ brown/22
+
+ keyword '\s' brightgreen/16
+ keyword '+' brightgreen/16
+ keyword > yellow/24
+ keyword < yellow/24
+ keyword \+ yellow/24
+ keyword - yellow/24
+ keyword \* yellow/24
+# keyword / yellow/24
+ keyword % yellow/24
+ keyword = yellow/24
+ keyword != yellow/24
+ keyword == yellow/24
+ keyword { brightcyan/14
+ keyword } brightcyan/14
+ keyword ( brightcyan/15
+ keyword ) brightcyan/15
+ keyword [ brightcyan/14
+ keyword ] brightcyan/14
+ keyword , brightcyan/14
+ keyword : brightcyan/14
+ keyword ; brightmagenta/19
+context exclusive /\* \*/ brown/22
+context // \n brown/22
+context linestart # \n brightred/18
+ keyword \\\n yellow/24
+ keyword /\**\*/ brown/22
+ keyword "+" red/19
+ keyword <+> red/19
+context " " green/6
+ keyword \\" brightgreen/16
+ keyword %% brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]e brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]E brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]f brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]g brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]G brightgreen/16
+ keyword %\[0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]d brightgreen/16
+ keyword %\[0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]i brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]o brightgreen/16
+ keyword %\[0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]u brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]x brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]X brightgreen/16
+ keyword %\[hl\]n brightgreen/16
+ keyword %\[.\]\[0123456789\]s brightgreen/16
+ keyword %[*] brightgreen/16
+ keyword %c brightgreen/16
+ keyword \\\\ brightgreen/16
+ keyword \\' brightgreen/16
+ keyword \\a brightgreen/16
+ keyword \\b brightgreen/16
+ keyword \\t brightgreen/16
+ keyword \\n brightgreen/16
+ keyword \\v brightgreen/16
+ keyword \\f brightgreen/16
+ keyword \\r brightgreen/16
+ keyword \\0 brightgreen/16
+
+
diff -ruN old/mc-4.5.27/syntax/latex.syntax new/mc-4.5.28/syntax/latex.syntax
--- old/mc-4.5.27/syntax/latex.syntax Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/syntax/latex.syntax Fri Mar 26 15:30:45 1999
@@ -0,0 +1,187 @@
+context default
+wholechars left \\
+wholechars right abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
+
+# type style
+ keyword whole \\tiny yellow/24
+ keyword whole \\scriptsize yellow/24
+ keyword whole \\footnotesize yellow/24
+ keyword whole \\small yellow/24
+ keyword whole \\normalsize yellow/24
+ keyword whole \\large yellow/24
+ keyword whole \\Large yellow/24
+ keyword whole \\LARGE yellow/24
+ keyword whole \\huge yellow/24
+ keyword whole \\Huge yellow/24
+
+# accents and symbols
+ keyword whole \\`{\[aeiouAEIOU\]} yellow/24
+ keyword whole \\'{\[aeiouAEIOU\]} yellow/24
+ keyword whole \\^{\[aeiouAEIOU\]} yellow/24
+ keyword whole \\"{\[aeiouAEIOU\]} yellow/24
+ keyword whole \\~{\[aeiouAEIOU\]} yellow/24
+ keyword whole \\={\[aeiouAEIOU\]} yellow/24
+ keyword whole \\.{\[aeiouAEIOU\]} yellow/24
+ keyword whole \\u{\[aeiouAEIOU\]} yellow/24
+ keyword whole \\v{\[aeiouAEIOU\]} yellow/24
+ keyword whole \\H{\[aeiouAEIOU\]} yellow/24
+ keyword whole \\t{\[aeiouAEIOU\]} yellow/24
+ keyword whole \\c{\[aeiouAEIOU\]} yellow/24
+ keyword whole \\d{\[aeiouAEIOU\]} yellow/24
+ keyword whole \\b{\[aeiouAEIOU\]} yellow/24
+
+ keyword whole \\dag yellow/24
+ keyword whole \\ddag yellow/24
+ keyword whole \\S yellow/24
+ keyword whole \\P yellow/24
+ keyword whole \\copyright yellow/24
+ keyword whole \\pounds yellow/24
+
+# sectioning and table of contents
+ keyword whole \\part[*]{*} brightred/19
+ keyword whole \\part{*} brightred/19
+ keyword whole \\part\*{*} brightred/19
+ keyword whole \\chapter[*]{*} brightred/19
+ keyword whole \\chapter{*} brightred/19
+ keyword whole \\chapter\*{*} brightred/19
+ keyword whole \\section[*]{*} brightred/19
+ keyword whole \\section{*} brightred/19
+ keyword whole \\section\*{*} brightred/19
+ keyword whole \\subsection[*]{*} brightred/19
+ keyword whole \\subsection{*} brightred/19
+ keyword whole \\subsection\*{*} brightred/19
+ keyword whole \\subsubsection[*]{*} brightred/19
+ keyword whole \\subsubsection{*} brightred/19
+ keyword whole \\subsubsection\*{*} brightred/19
+ keyword whole \\paragraph[*]{*} brightred/19
+ keyword whole \\paragraph{*} brightred/19
+ keyword whole \\paragraph\*{*} brightred/19
+ keyword whole \\subparagraph[*]{*} brightred/19
+ keyword whole \\subparagraph{*} brightred/19
+ keyword whole \\subparagraph\*{*} brightred/19
+
+ keyword whole \\appendix brightred/19
+ keyword whole \\tableofcontents brightred/19
+
+# misc
+ keyword whole \\item[*] yellow/24
+ keyword whole \\item yellow/24
+ keyword whole \\\\ yellow/24
+ keyword \\\s yellow/24 black/0
+ keyword %% yellow/24
+
+# docuement and page styles
+ keyword whole \\documentstyle[*]{*} yellow/20
+ keyword whole \\documentstyle{*} yellow/20
+ keyword whole \\pagestyle{*} yellow/20
+
+# cross references
+ keyword whole \\label{*} yellow/24
+ keyword whole \\ref{*} yellow/24
+
+# bibliography and citations
+ keyword whole \\bibliography{*} yellow/24
+ keyword whole \\bibitem[*]{*} yellow/24
+ keyword whole \\bibitem{*} yellow/24
+ keyword whole \\cite[*]{*} yellow/24
+ keyword whole \\cite{*} yellow/24
+
+# splitting the input
+ keyword whole \\input{*} yellow/20
+ keyword whole \\include{*} yellow/20
+ keyword whole \\includeonly{*} yellow/20
+
+# line breaking
+ keyword whole \\linebreak[\[01234\]] yellow/24
+ keyword whole \\nolinebreak[\[01234\]] yellow/24
+ keyword whole \\linebreak yellow/24
+ keyword whole \\nolinebreak yellow/24
+ keyword whole \\[+] yellow/24
+ keyword whole \\- yellow/24
+ keyword whole \\sloppy yellow/24
+
+# page breaking
+ keyword whole \\pagebreak[\[01234\]] yellow/24
+ keyword whole \\nopagebreak[\[01234\]] yellow/24
+ keyword whole \\pagebreak yellow/24
+ keyword whole \\nopagebreak yellow/24
+ keyword whole \\samepage yellow/24
+ keyword whole \\newpage yellow/24
+ keyword whole \\clearpage yellow/24
+
+# defintiions
+ keyword \\newcommand{*}[*] cyan/5
+ keyword \\newcommand{*} cyan/5
+ keyword \\newenvironment{*}[*]{*} cyan/5
+ keyword \\newenvironment{*}{*} cyan/5
+
+# boxes
+
+# begins and ends
+ keyword \\begin{document} brightred/14
+ keyword \\begin{equation} brightred/14
+ keyword \\begin{eqnarray} brightred/14
+ keyword \\begin{quote} brightred/14
+ keyword \\begin{quotation} brightred/14
+ keyword \\begin{center} brightred/14
+ keyword \\begin{verse} brightred/14
+ keyword \\begin{verbatim} brightred/14
+ keyword \\begin{itemize} brightred/14
+ keyword \\begin{enumerate} brightred/14
+ keyword \\begin{description} brightred/14
+ keyword \\begin{list} brightred/14
+ keyword \\begin{array} brightred/14
+ keyword \\begin{tabular} brightred/14
+ keyword \\begin{thebibliography}{*} brightred/14
+ keyword \\begin{sloppypar} brightred/14
+
+ keyword \\end{document} brightred/14
+ keyword \\end{equation} brightred/14
+ keyword \\end{eqnarray} brightred/14
+ keyword \\end{quote} brightred/14
+ keyword \\end{quotation} brightred/14
+ keyword \\end{center} brightred/14
+ keyword \\end{verse} brightred/14
+ keyword \\end{verbatim} brightred/14
+ keyword \\end{itemize} brightred/14
+ keyword \\end{enumerate} brightred/14
+ keyword \\end{description} brightred/14
+ keyword \\end{list} brightred/14
+ keyword \\end{array} brightred/14
+ keyword \\end{tabular} brightred/14
+ keyword \\end{thebibliography}{*} brightred/14
+ keyword \\end{sloppypar} brightred/14
+
+ keyword \\begin{*} brightcyan/16
+ keyword \\end{*} brightcyan/16
+
+ keyword \\theorem{*}{*} yellow/24
+
+# if all else fails
+ keyword whole \\+[*]{*}{*}{*} brightcyan/17
+ keyword whole \\+[*]{*}{*} brightcyan/17
+ keyword whole \\+{*}{*}{*}{*} brightcyan/17
+ keyword whole \\+{*}{*}{*} brightcyan/17
+ keyword whole \\+{*}{*} brightcyan/17
+ keyword whole \\+{*} brightcyan/17
+ keyword \\\[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\]\n brightcyan/17
+ keyword \\\[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\]\s brightcyan/17
+ keyword \\\[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\]\t brightcyan/17
+
+context \\pagenumbering{ } yellow/20
+ keyword arabic brightcyan/17
+ keyword roman brightcyan/17
+ keyword alph brightcyan/17
+ keyword Roman brightcyan/17
+ keyword Alph brightcyan/17
+
+context % \n brown/22
+
+# mathematical formulas
+context $ $ brightgreen/6
+context exclusive \\begin{equation} \\end{equation} brightgreen/6
+context exclusive \\begin{eqnarray} \\end{eqnarray} brightgreen/6
+
+
+###############################################################################
+
diff -ruN old/mc-4.5.27/syntax/lsm.syntax new/mc-4.5.28/syntax/lsm.syntax
--- old/mc-4.5.27/syntax/lsm.syntax Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/syntax/lsm.syntax Fri Mar 26 15:30:45 1999
@@ -0,0 +1,32 @@
+
+context default
+ keyword linestart Begin3 brightmagenta/20
+ keyword linestart Title:\s\s\s\s\s\s\s\s\s\s red/9 yellow/24
+ keyword linestart Version:\s\s\s\s\s\s\s\s red/9 yellow/24
+ keyword linestart Entered-date:\s\s\s red/9 yellow/24
+ keyword linestart Description:\s\s\s\s red/9 yellow/24
+ keyword linestart Keywords:\s\s\s\s\s\s\s red/9 yellow/24
+ keyword linestart Alternate-site:\s red/9 yellow/24
+ keyword linestart Primary-site:\s\s\s red/9 yellow/24
+ keyword linestart Original-site:\s\s red/9 yellow/24
+ keyword linestart Platforms:\s\s\s\s\s\s red/9 yellow/24
+ keyword linestart Copying-policy:\s red/9 yellow/24
+ keyword linestart End brightmagenta/20
+
+ keyword linestart \t\t white/26 yellow/24
+ keyword linestart \s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s white/26 yellow/24
+ keyword whole GPL green/6
+ keyword whole BSD green/6
+ keyword whole Shareware green/6
+ keyword whole sunsite.unc.edu green/6
+ keyword wholeright \s*.tar.gz green/6
+ keyword wholeright \s*.lsm green/6
+
+context linestart Author:\s\s\s\s\s\s\s\s\s \n brightred/19
+ keyword whole \s*@*\s(*) cyan/16
+
+context linestart Maintained-by:\s\s \n brightred/19
+ keyword whole \s*@*\s(*) cyan/16
+
+###############################################################################
+
diff -ruN old/mc-4.5.27/syntax/makefile.syntax new/mc-4.5.28/syntax/makefile.syntax
--- old/mc-4.5.27/syntax/makefile.syntax Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/syntax/makefile.syntax Fri Mar 26 15:30:45 1999
@@ -0,0 +1,43 @@
+
+context default
+ keyword $(*) yellow/24
+ keyword ${*} brightgreen/16
+ keyword whole linestart include magenta
+ keyword whole linestart ifdef magenta
+ keyword whole linestart endif magenta
+ keyword whole linestart ifeq magenta
+ keyword whole linestart ifneq magenta
+ keyword whole linestart else magenta
+ keyword linestart \t lightgray/13 red
+ keyword whole .PHONY white/25
+ keyword whole .NOEXPORT white/25
+ keyword = white/25
+ keyword : yellow/24
+ keyword \\\n yellow/24
+# this handles strange cases like @something@@somethingelse@ properly
+ keyword whole @+@ brightmagenta/23 black/0
+ keyword @+@ brightmagenta/23 black/0
+
+context linestart # \n brown/22
+ keyword whole @+@ brightmagenta/23 black/0
+ keyword @+@ brightmagenta/23 black/0
+
+context exclusive = \n brightcyan/17
+ keyword \\\n yellow/24
+ keyword $(*) yellow/24
+ keyword ${*} brightgreen/16
+ keyword linestart \t lightgray/13 red
+ keyword whole @+@ brightmagenta/23 black/0
+ keyword @+@ brightmagenta/23 black/0
+
+context exclusive linestart \t \n
+ keyword \\\n yellow/24
+ keyword $(*) yellow/24
+ keyword ${*} brightgreen/16
+ keyword linestart \t lightgray/13 red
+ keyword whole @+@ brightmagenta/23 black/0
+ keyword @+@ brightmagenta/23 black/0
+
+###############################################################################
+
+
diff -ruN old/mc-4.5.27/syntax/ml.syntax new/mc-4.5.28/syntax/ml.syntax
--- old/mc-4.5.27/syntax/ml.syntax Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/syntax/ml.syntax Fri Mar 26 15:30:45 1999
@@ -0,0 +1,275 @@
+##################################################################################
+# ML (CamlLight) syntax hilighting by Carlos Rodrigues <a9566@lei.di.fct.unl.pt> #
+##################################################################################
+
+context default
+ keyword whole and yellow/24
+ keyword whole as yellow/24
+ keyword whole begin yellow/24
+ keyword whole do ywllow/24
+ keyword whole done yellow/24
+ keyword whole downto yellow/24
+ keyword whole else yellow/24
+ keyword whole end yellow/24
+ keyword whole exception yellow/24
+ keyword whole for yellow/24
+ keyword whole fun yellow/24
+ keyword whole function yellow/24
+ keyword whole if yellow/24
+ keyword whole in yellow/24
+ keyword whole let yellow/24
+ keyword whole match yellow/24
+ keyword whole mutable yellow/24
+ keyword whole not yellow/24
+ keyword whole of yellow/24
+ keyword whole or yellow/24
+ keyword whole prefix yellow/24
+ keyword whole rec yellow/24
+ keyword whole then yellow/24
+ keyword whole to yellow/24
+ keyword whole try yellow/24
+ keyword whole type yellow/24
+ keyword whole value yellow/24
+ keyword whole where yellow/24
+ keyword whole while yellow/24
+ keyword whole mod yellow/24
+ keyword whole with yellow/24
+ keyword whole true yellow/24
+ keyword whole false yellow/24
+
+ keyword (\* brown/22
+ keyword \*) brown/22
+
+ keyword `\s` brightcyan/8
+ keyword `+` brightcyan/8
+ keyword > cyan/16
+ keyword <> cyan/16
+ keyword < cyan/16
+ keyword . cyan/16
+ keyword -> brightgreen/6
+ keyword <- cyan/16
+ keyword \+ cyan/16
+ keyword - cyan/16
+ keyword \* cyan/16
+ keyword / cyan/16
+ keyword % cyan/16
+ keyword = cyan/16
+ keyword | cyan/16
+ keyword # cyan/16
+ keyword @ cyan/16
+ keyword ^ cyan/16
+ keyword { cyan/16
+ keyword } cyan/16
+ keyword ( cyan/16
+ keyword ) cyan/16
+ keyword [ cyan/16
+ keyword ] cyan/16
+ keyword , cyan/16
+ keyword : cyan/16
+ keyword & cyan/16
+
+ keyword wholeright ;; brightred/18
+ keyword wholeright ; brightred/18
+
+ keyword ; cyan/16
+
+context exclusive (\* \*) brown/22
+
+ keyword \\\n yellow/24
+ keyword "+" brown/22
+ keyword <+> brown/22
+
+context " " brightcyan/8
+
+ keyword \\" brightmagenta/23
+ keyword %% brightmagenta/23
+
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]e brightmagenta/23
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]E brightmagenta/23
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]f brightmagenta/23
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]g brightmagenta/23
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]G brightmagenta/23
+ keyword %\[0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]d brightmagenta/23
+ keyword %\[0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]i brightmagenta/23
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]o brightmagenta/23
+ keyword %\[0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]u brightmagenta/23
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]x brightmagenta/23
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]X brightmagenta/23
+ keyword %\[hl\]n brightmagenta/23
+ keyword %\[.\]\[0123456789\]s brightmagenta/23
+ keyword %[*] brightmagenta/23
+ keyword %c brightmagenta/23
+ keyword \\\\ brightmagenta/23
+ keyword \\' brightmagenta/23
+ keyword \\a brightmagenta/23
+ keyword \\b brightmagenta/23
+ keyword \\t brightmagenta/23
+ keyword \\n brightmagenta/23
+ keyword \\v brightmagenta/23
+ keyword \\f brightmagenta/23
+ keyword \\r brightmagenta/23
+ keyword \\0 brightmagenta/23
+
+
+###################################################################################
+# (GNU) SmallTalk syntax hilighting by Carlos Rodrigues <a9566@lei.di.fct.unl.pt> #
+###################################################################################
+
+file ..\*\\.(st)$ SmallTalk\sProgram
+
+# I guess this is not very syntax strict, but it makes the code
+# a lot more readable.
+
+context default
+ keyword whole methodsFor yellow/24
+ keyword whole subclass yellow/24
+ keyword whole class yellow/24
+ keyword whole nil yellow/24
+ keyword whole self yellow/24
+ keyword whole instanceVariableNames yellow/24
+ keyword whole classVariableNames yellow/24
+ keyword whole poolDictionaries yellow/24
+ keyword whole category yellow/24
+ keyword whole super yellow/24
+ keyword whole category yellow/24
+ keyword whole variableSubclass yellow/24
+ keyword whole variableByteSubclass yellow/24
+ keyword whole variableWordSubclass yellow/24
+ keyword whole superclass yellow/24
+
+ keyword whole not brightmagenta/23
+ keyword whole comment brightmagenta/23
+ keyword whole error brightmagenta/23
+ keyword whole at brightmagenta/23
+ keyword whole put brightmagenta/23
+ keyword whole add brightmagenta/23
+ keyword whole remove brightmagenta/23
+ keyword whole new brightmagenta/23
+ keyword whole ifTrue brightmagenta/23
+ keyword whole ifFalse brightmagenta/23
+ keyword whole whileTrue brightmagenta/23
+ keyword whole whileFalse brightmagenta/23
+ keyword whole ifAbsent brightmagenta/23
+ keyword whole init brightmagenta/23
+ keyword whole do brightmagenta/23
+ keyword whole from brightmagenta/23
+ keyword whole with brightmagenta/23
+ keyword whole do brightmagenta/23
+ keyword whole true brightmagenta/23
+ keyword whole false brightmagenta/23
+ keyword whole or brightmagenta/23
+ keyword whole and brightmagenta/23
+ keyword whole to brightmagenta/23
+ keyword whole by brightmagenta/23
+
+ keyword whole Smalltalk brightgreen/6
+ keyword whole Object brightgreen/6
+ keyword whole Autoload brightgreen/6
+ keyword whole Behavior brightgreen/6
+ keyword whole ClassDescription brightgreen/6
+ keyword whole Class brightgreen/6
+ keyword whole MetaClass brightgreen/6
+ keyword whole BlockContext brightgreen/6
+ keyword whole Boolean brightgreen/6
+ keyword whole False brightgreen/6
+ keyword whole True brightgreen/6
+ keyword whole CFunctionDescriptor brightgreen/6
+ keyword whole CObject brightgreen/6
+ keyword whole Collection brightgreen/6
+ keyword whole Bag brightgreen/6
+ keyword whole MappedCollection brightgreen/6
+ keyword whole SequenceableCollection brightgreen/6
+ keyword whole ArrayedCollection brightgreen/6
+ keyword whole Array brightgreen/6
+ keyword whole ByteArray brightgreen/6
+ keyword whole CompiledCollection brightgreen/6
+ keyword whole String brightgreen/6
+ keyword whole Symbol brightgreen/6
+ keyword whole Interval brightgreen/6
+ keyword whole LinkedList brightgreen/6
+ keyword whole Semaphore brightgreen/6
+ keyword whole OrderedCollection brightgreen/6
+ keyword whole SortedCollection brightgreen/6
+ keyword whole Set brightgreen/6
+ keyword whole Dictionary brightgreen/6
+ keyword whole IdentityDictionary brightgreen/6
+ keyword whole SystemDictionary brightgreen/6
+ keyword whole Delay brightgreen/6
+ keyword whole FileSegment brightgreen/6
+ keyword whole Link brightgreen/6
+ keyword whole Process brightgreen/6
+ keyword whole SymLink brightgreen/6
+ keyword whole Magnitude brightgreen/6
+ keyword whole Character brightgreen/6
+ keyword whole Date brightgreen/6
+ keyword whole LookupKey brightgreen/6
+ keyword whole Association brightgreen/6
+ keyword whole Number brightgreen/6
+ keyword whole Float brightgreen/6
+ keyword whole Integer brightgreen/6
+ keyword whole Time brightgreen/6
+ keyword whole Memory brightgreen/6
+ keyword whole ByteMemory brightgreen/6
+ keyword whole WordMemory brightgreen/6
+ keyword whole Message brightgreen/6
+ keyword whole MethodContext brightgreen/6
+ keyword whole MethodInfo brightgreen/6
+ keyword whole ProcessorScheduler brightgreen/6
+ keyword whole SharedQueue brightgreen/6
+ keyword whole Stream brightgreen/6
+ keyword whole PositionableStream brightgreen/6
+ keyword whole ReadStream brightgreen/6
+ keyword whole WriteStream brightgreen/6
+ keyword whole ReadWriteStream brightgreen/6
+ keyword whole FileStream brightgreen/6
+ keyword whole Random brightgreen/6
+ keyword whole TokenStream brightgreen/6
+ keyword whole UndefinedObject brightgreen/6
+
+ keyword wholeright !! brightred/18
+ keyword wholeright ! brightred/18
+ keyword wholeleft ! brightred/18
+ keyword wholeright . brightred/18
+
+ keyword > cyan/16
+ keyword <> cyan/16
+ keyword < cyan/16
+ keyword \+ cyan/16
+ keyword - cyan/16
+ keyword \* cyan/16
+ keyword / cyan/16
+ keyword % cyan/16
+ keyword = cyan/16
+ keyword | cyan/16
+ keyword # cyan/16
+ keyword @ cyan/16
+ keyword ^ cyan/16
+ keyword { cyan/16
+ keyword } cyan/16
+ keyword ( cyan/16
+ keyword ) cyan/16
+ keyword [ cyan/16
+ keyword ] cyan/16
+ keyword , cyan/16
+ keyword : cyan/16
+ keyword & cyan/16
+ keyword $ cyan/16
+ keyword . cyan/16
+ keyword ! cyan/16
+ keyword ; cyan/16
+ keyword _ cyan/16
+ keyword ~ cyan/16
+ keyword ? cyan/16
+
+context $ ; cyan/16
+
+context " " brown/22
+
+context ' ' brightcyan/8
+
+ keyword \\\n brightmagenta/23
+ keyword \\" brightmagenta/23
+ keyword \\\\ brightmagenta/23
+ keyword \\' brightmagenta/23
+
+
diff -ruN old/mc-4.5.27/syntax/nroff.syntax new/mc-4.5.28/syntax/nroff.syntax
--- old/mc-4.5.27/syntax/nroff.syntax Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/syntax/nroff.syntax Fri Mar 26 15:30:45 1999
@@ -0,0 +1,215 @@
+
+context default
+ keyword \\fP brightgreen/6
+ keyword \\fR brightgreen/6
+ keyword \\fB brightgreen/6
+ keyword \\fI brightgreen/6
+ keyword linestart .AS cyan/5
+ keyword linestart .Ar cyan/5
+ keyword linestart .At cyan/5
+ keyword linestart .BE cyan/5
+ keyword linestart .BH cyan/5
+ keyword linestart .BI cyan/5
+ keyword linestart .BR cyan/5
+ keyword linestart .BS cyan/5
+ keyword linestart .Bd cyan/5
+ keyword linestart .Bk cyan/5
+ keyword linestart .Bl cyan/5
+ keyword linestart .Bu cyan/5
+ keyword linestart .Bx cyan/5
+ keyword linestart .CE cyan/5
+ keyword linestart .CM cyan/5
+ keyword linestart .CS cyan/5
+ keyword linestart .CT cyan/5
+ keyword linestart .CW cyan/5
+ keyword linestart .Cm cyan/5
+ keyword linestart .Co cyan/5
+ keyword linestart .DA cyan/5
+ keyword linestart .DE cyan/5
+ keyword linestart .DS cyan/5
+ keyword linestart .DT cyan/5
+ keyword linestart .Dd cyan/5
+ keyword linestart .De cyan/5
+ keyword linestart .Dl cyan/5
+ keyword linestart .Dq cyan/5
+ keyword linestart .Ds cyan/5
+ keyword linestart .Dt cyan/5
+ keyword linestart .Dv cyan/5
+ keyword linestart .EE cyan/5
+ keyword linestart .EN cyan/5
+ keyword linestart .EQ cyan/5
+ keyword linestart .EX cyan/5
+ keyword linestart .Ed cyan/5
+ keyword linestart .Ee cyan/5
+ keyword linestart .Ek cyan/5
+ keyword linestart .El cyan/5
+ keyword linestart .Em cyan/5
+ keyword linestart .En cyan/5
+ keyword linestart .Ev cyan/5
+ keyword linestart .Ex cyan/5
+ keyword linestart .FI cyan/5
+ keyword linestart .FL cyan/5
+ keyword linestart .FN cyan/5
+ keyword linestart .FT cyan/5
+ keyword linestart .Fi cyan/5
+ keyword linestart .Fl cyan/5
+ keyword linestart .Fn cyan/5
+ keyword linestart .HP cyan/5
+ keyword linestart .HS cyan/5
+ keyword linestart .Hh cyan/5
+ keyword linestart .Hi cyan/5
+ keyword linestart .IB cyan/5
+ keyword linestart .IP cyan/5
+ keyword linestart .IR cyan/5
+ keyword linestart .IX cyan/5
+ keyword linestart .Ic cyan/5
+ keyword linestart .Id cyan/5
+ keyword linestart .Ip cyan/5
+ keyword linestart .It cyan/5
+ keyword linestart .LI cyan/5
+ keyword linestart .LO cyan/5
+ keyword linestart .LP cyan/5
+ keyword linestart .LR cyan/5
+ keyword linestart .Li cyan/5
+ keyword linestart .MF cyan/5
+ keyword linestart .ML cyan/5
+ keyword linestart .MU cyan/5
+ keyword linestart .MV cyan/5
+ keyword linestart .NF cyan/5
+ keyword linestart .Nd cyan/5
+ keyword linestart .Nm cyan/5
+ keyword linestart .No cyan/5
+ keyword linestart .OP cyan/5
+ keyword linestart .Oc cyan/5
+ keyword linestart .Oo cyan/5
+ keyword linestart .Op cyan/5
+ keyword linestart .Os cyan/5
+ keyword linestart .PD cyan/5
+ keyword linestart .PN cyan/5
+ keyword linestart .PP cyan/5
+ keyword linestart .PU cyan/5
+ keyword linestart .Pa cyan/5
+ keyword linestart .Pf cyan/5
+ keyword linestart .Pp cyan/5
+ keyword linestart .Pq cyan/5
+ keyword linestart .Pr cyan/5
+ keyword linestart .Ps cyan/5
+ keyword linestart .Ql cyan/5
+ keyword linestart .RB cyan/5
+ keyword linestart .RE cyan/5
+ keyword linestart .RI cyan/5
+ keyword linestart .RS cyan/5
+ keyword linestart .RT cyan/5
+ keyword linestart .Re cyan/5
+ keyword linestart .Rs cyan/5
+ keyword linestart .SB cyan/5
+ keyword linestart .SH cyan/5
+ keyword linestart .SM cyan/5
+ keyword linestart .SP cyan/5
+ keyword linestart .SS cyan/5
+ keyword linestart .Sa cyan/5
+ keyword linestart .Sh cyan/5
+ keyword linestart .Sm cyan/5
+ keyword linestart .Sp cyan/5
+ keyword linestart .Sq cyan/5
+ keyword linestart .Ss cyan/5
+ keyword linestart .St cyan/5
+ keyword linestart .Sx cyan/5
+ keyword linestart .Sy cyan/5
+ keyword linestart .TE cyan/5
+ keyword linestart .TH cyan/5
+ keyword linestart .TP cyan/5
+ keyword linestart .TQ cyan/5
+ keyword linestart .TS cyan/5
+ keyword linestart .Tn cyan/5
+ keyword linestart .Tp cyan/5
+ keyword linestart .UC cyan/5
+ keyword linestart .Uh cyan/5
+ keyword linestart .Ux cyan/5
+ keyword linestart .VE cyan/5
+ keyword linestart .VS cyan/5
+ keyword linestart .Va cyan/5
+ keyword linestart .Vb cyan/5
+ keyword linestart .Ve cyan/5
+ keyword linestart .Xc cyan/5
+ keyword linestart .Xe cyan/5
+ keyword linestart .Xr cyan/5
+ keyword linestart .YN cyan/5
+ keyword linestart .ad cyan/5
+ keyword linestart .am cyan/5
+ keyword linestart .bd cyan/5
+ keyword linestart .bp cyan/5
+ keyword linestart .br cyan/5
+ keyword linestart .ce cyan/5
+ keyword linestart .cs cyan/5
+ keyword linestart .de cyan/5
+ keyword linestart .ds cyan/5
+ keyword linestart .ec cyan/5
+ keyword linestart .eh cyan/5
+ keyword linestart .el cyan/5
+ keyword linestart .eo cyan/5
+ keyword linestart .ev cyan/5
+ keyword linestart .fc cyan/5
+ keyword linestart .fi cyan/5
+ keyword linestart .ft cyan/5
+ keyword linestart .hy cyan/5
+ keyword linestart .iX cyan/5
+ keyword linestart .ie cyan/5
+ keyword linestart .if cyan/5
+ keyword linestart .ig cyan/5
+ keyword linestart .in cyan/5
+ keyword linestart .ll cyan/5
+ keyword linestart .lp cyan/5
+ keyword linestart .ls cyan/5
+ keyword linestart .mk cyan/5
+ keyword linestart .na cyan/5
+ keyword linestart .ne cyan/5
+ keyword linestart .nf cyan/5
+ keyword linestart .nh cyan/5
+ keyword linestart .nr cyan/5
+ keyword linestart .ns cyan/5
+ keyword linestart .oh cyan/5
+ keyword linestart .ps cyan/5
+ keyword linestart .re cyan/5
+ keyword linestart .rm cyan/5
+ keyword linestart .rn cyan/5
+ keyword linestart .rr cyan/5
+ keyword linestart .so cyan/5
+ keyword linestart .sp cyan/5
+ keyword linestart .ss cyan/5
+ keyword linestart .ta cyan/5
+ keyword linestart .ti cyan/5
+ keyword linestart .tm cyan/5
+ keyword linestart .tr cyan/5
+ keyword linestart .ul cyan/5
+ keyword linestart .vs cyan/5
+ keyword linestart .zZ cyan/5
+ keyword linestart .B cyan/5
+ keyword linestart .F cyan/5
+ keyword linestart .I cyan/5
+ keyword linestart .R cyan/5
+ keyword linestart .P cyan/5
+ keyword linestart .L cyan/5
+ keyword linestart .V cyan/5
+ keyword linestart .F cyan/5
+ keyword linestart .T cyan/5
+ keyword linestart .X cyan/5
+ keyword linestart .Y cyan/5
+ keyword linestart .b cyan/5
+ keyword linestart .l cyan/5
+ keyword linestart .i cyan/5
+
+context exclusive linestart .SH \n brightred/18
+context exclusive linestart .TH \n brightred/18
+context exclusive linestart .B \n magenta/23
+context exclusive linestart .I \n yellow/24
+context exclusive linestart .nf linestart .fi green/15
+
+# font changes should end in a \fP
+context exclusive \\fB \\fP magenta/23
+context exclusive \\fI \\fP yellow/24
+context linestart .\\" \n brown/22
+
+###############################################################################
+# Assumes you've set a dark background, e.g. navy blue.
+
diff -ruN old/mc-4.5.27/syntax/pascal.syntax new/mc-4.5.28/syntax/pascal.syntax
--- old/mc-4.5.27/syntax/pascal.syntax Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/syntax/pascal.syntax Fri Mar 26 15:30:45 1999
@@ -0,0 +1,112 @@
+context default yellow/24
+ keyword whole absolute white/25
+ keyword whole and white/25
+ keyword whole array white/25
+ keyword whole as white/25
+ keyword whole asm white/25
+ keyword whole assembler white/25
+ keyword whole begin white/25
+ keyword whole break white/25
+ keyword whole case white/25
+ keyword whole class white/25
+ keyword whole const white/25
+ keyword whole continue white/25
+ keyword whole constructor white/25
+ keyword whole destructor white/25
+ keyword whole dispose white/25
+ keyword whole div white/25
+ keyword whole do white/25
+ keyword whole downto white/25
+ keyword whole else white/25
+ keyword whole end white/25
+ keyword whole except white/25
+ keyword whole exit white/25
+ keyword whole export white/25
+ keyword whole exports white/25
+ keyword whole external white/25
+ keyword whole fail white/25
+ keyword whole far white/25
+ keyword whole false white/25
+ keyword whole file white/25
+ keyword whole finally white/25
+ keyword whole for white/25
+ keyword whole forward white/25
+ keyword whole function white/25
+ keyword whole goto white/25
+ keyword whole if white/25
+ keyword whole implementation white/25
+ keyword whole in white/25
+ keyword whole inherited white/25
+ keyword whole initialization white/25
+ keyword whole inline white/25
+ keyword whole interface white/25
+ keyword whole interrupt white/25
+ keyword whole is white/25
+ keyword whole label white/25
+ keyword whole library white/25
+ keyword whole mod white/25
+ keyword whole near white/25
+ keyword whole new white/25
+ keyword whole nil white/25
+ keyword whole not white/25
+ keyword whole object white/25
+ keyword whole of white/25
+ keyword whole on white/25
+ keyword whole operator white/25
+ keyword whole or white/25
+ keyword whole otherwise white/25
+ keyword whole packed white/25
+ keyword whole procedure white/25
+ keyword whole program white/25
+ keyword whole property white/25
+ keyword whole raise white/25
+ keyword whole record white/25
+ keyword whole repeat white/25
+ keyword whole self white/25
+ keyword whole set white/25
+ keyword whole shl white/25
+ keyword whole shr white/25
+ keyword whole string white/25
+ keyword whole then white/25
+ keyword whole to white/25
+ keyword whole true white/25
+ keyword whole try white/25
+ keyword whole type white/25
+ keyword whole unit white/25
+ keyword whole until white/25
+ keyword whole uses white/25
+ keyword whole var white/25
+ keyword whole virtual white/25
+ keyword whole while white/25
+ keyword whole with white/25
+ keyword whole xor white/25
+ keyword whole .. white/25
+
+ keyword > cyan/5
+ keyword < cyan/5
+ keyword \+ cyan/5
+ keyword - cyan/5
+ keyword / cyan/5
+ keyword % cyan/5
+ keyword = cyan/5
+ keyword [ cyan/5
+ keyword ] cyan/5
+ keyword ( cyan/5
+ keyword ) cyan/5
+ keyword , cyan/5
+ keyword . cyan/5
+ keyword : cyan/5
+ keyword ; cyan/5
+ keyword {$*} brightred/19
+
+context ' ' brightcyan/22
+context // \n brown/22
+context (\* \*) brown/22
+# context {$ } brightred/19
+# keyword \[ABCDEFGHIJKLMNOPQRSTUVWXYZ\]\[-\+\] brightgreen/16
+# keyword $* brightgreen/16
+context { } lightgray/22
+
+
+###############################################################################
+
diff -ruN old/mc-4.5.27/syntax/perl.syntax new/mc-4.5.28/syntax/perl.syntax
--- old/mc-4.5.27/syntax/perl.syntax Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/syntax/perl.syntax Fri Mar 26 15:30:45 1999
@@ -0,0 +1,367 @@
+context default
+ keyword whole linestart #!\[\s\]/\[abcdefghijklmnopqrstuvwxyz\]/\[abcdefghijklmnopqrstuvwxyz\]/\[abcdefghijklmnopqrstuvwxyz\]/\[abcdefghijklmnopqrstuvwxyz\]/bin/perl brightcyan/17 black/0
+ keyword whole linestart #!\[\s\]/\[abcdefghijklmnopqrstuvwxyz\]/\[abcdefghijklmnopqrstuvwxyz\]/\[abcdefghijklmnopqrstuvwxyz\]/bin/perl brightcyan/17 black/0
+ keyword whole linestart #!\[\s\]/\[abcdefghijklmnopqrstuvwxyz\]/\[abcdefghijklmnopqrstuvwxyz\]/bin/perl brightcyan/17 black/0
+ keyword whole linestart #!\[\s\]/\[abcdefghijklmnopqrstuvwxyz\]/bin/perl brightcyan/17 black/0
+ keyword whole linestart #!\[\s\]/bin/perl brightcyan/17 black/0
+
+ keyword $_ red/orange
+ keyword $. red/orange
+ keyword $/ red/orange
+ keyword $, red/orange
+ keyword $" red/orange
+ keyword $\\ red/orange
+ keyword $# red/orange
+ keyword $\* red/orange
+ keyword $? red/orange
+ keyword $] red/orange
+ keyword $[ red/orange
+ keyword $; red/orange
+ keyword $! red/orange
+ keyword $@ red/orange
+ keyword $: red/orange
+ keyword $0 red/orange
+ keyword $$ red/orange
+ keyword $< red/orange
+ keyword $> red/orange
+ keyword $( red/orange
+ keyword $) red/orange
+
+ keyword $% red/orange
+ keyword $= red/orange
+ keyword $- red/orange
+ keyword $~ red/orange
+ keyword $| red/orange
+ keyword $& red/orange
+ keyword $` red/orange
+ keyword $' red/orange
+ keyword $+ red/orange
+ keyword $11 red/orange
+ keyword $12 red/orange
+ keyword $13 red/orange
+ keyword $14 red/orange
+ keyword $15 red/orange
+ keyword $16 red/orange
+ keyword $17 red/orange
+ keyword $18 red/orange
+ keyword $19 red/orange
+ keyword $20 red/orange
+ keyword $10 red/orange
+ keyword $1 red/orange
+ keyword $2 red/orange
+ keyword $3 red/orange
+ keyword $4 red/orange
+ keyword $5 red/orange
+ keyword $6 red/orange
+ keyword $7 red/orange
+ keyword $8 red/orange
+ keyword $9 red/orange
+ keyword $0 red/orange
+
+ keyword $^A red/orange
+ keyword $^D red/orange
+ keyword $^E red/orange
+ keyword $^I red/orange
+ keyword $^L red/orange
+ keyword $^P red/orange
+ keyword $^T red/orange
+ keyword $^W red/orange
+ keyword $^X red/orange
+ keyword $^A red/orange
+
+ keyword @EXPORT red/orange
+ keyword @EXPORT_OK red/orange
+ keyword @INC red/orange
+ keyword @ISA red/orange
+ keyword @_ red/orange
+ keyword @ENV red/orange
+ keyword @OVERLOAD red/orange
+ keyword @SIG red/orange
+
+ keyword $ brightgreen/15
+ keyword & brightmagenta/19
+ keyword % brightcyan/17
+ keyword @ white/21
+ keyword \\" brightred/18
+ keyword \\' brightred/18
+
+ keyword <+> brightred/18
+ keyword -> yellow/24
+ keyword => yellow/24
+ keyword > yellow/24
+ keyword < yellow/24
+ keyword \+ yellow/24
+ keyword - yellow/24
+ keyword \* yellow/24
+ keyword / yellow/24
+ keyword % yellow/24
+ keyword = yellow/24
+ keyword != yellow/24
+ keyword == yellow/24
+ keyword whole ge yellow/24
+ keyword whole le yellow/24
+ keyword whole gt yellow/24
+ keyword whole lt yellow/24
+ keyword whole eq yellow/24
+ keyword whole ne yellow/24
+ keyword whole cmp yellow/24
+ keyword ~ yellow/24
+ keyword { brightcyan/14
+ keyword } brightcyan/14
+ keyword ( brightcyan/15
+ keyword ) brightcyan/15
+ keyword [ brightcyan/14
+ keyword ] brightcyan/14
+ keyword , brightcyan/14
+ keyword .. brightcyan/14
+ keyword : brightcyan/14
+ keyword ; brightmagenta/19
+
+ keyword whole sub yellow/24
+ keyword whole STDIN brightred/18
+ keyword whole STDOUT brightred/18
+ keyword whole STDERR brightred/18
+ keyword whole STDARGV brightred/18
+ keyword whole DATA brightred/18
+
+ keyword whole do magenta/23
+ keyword whole if magenta/23
+ keyword whole until magenta/23
+ keyword whole elsif magenta/23
+ keyword whole else magenta/23
+ keyword whole unless magenta/23
+ keyword whole while magenta/23
+ keyword whole foreach magenta/23
+ keyword whole goto magenta/23
+ keyword whole last magenta/23
+ keyword whole next magenta/23
+ keyword whole bless magenta/23
+ keyword whole caller magenta/23
+ keyword whole import magenta/23
+ keyword whole package magenta/23
+ keyword whole require magenta/23
+ keyword whole return magenta/23
+ keyword whole untie magenta/23
+ keyword whole use magenta/23
+
+ keyword whole diagnostics brightcyan/17
+ keyword whole integer brightcyan/17
+ keyword whole less brightcyan/17
+ keyword whole lib brightcyan/17
+ keyword whole ops brightcyan/17
+ keyword whole overload brightcyan/17
+ keyword whole sigtrap brightcyan/17
+ keyword whole strict brightcyan/17
+ keyword whole vars brightcyan/17
+
+ keyword whole abs yellow/24
+ keyword whole atan2 yellow/24
+ keyword whole cos yellow/24
+ keyword whole exp yellow/24
+ keyword whole int yellow/24
+ keyword whole log yellow/24
+ keyword whole rand yellow/24
+ keyword whole sin yellow/24
+ keyword whole sqrt yellow/24
+ keyword whole srand yellow/24
+ keyword whole time yellow/24
+ keyword whole chr yellow/24
+ keyword whole gmtime yellow/24
+ keyword whole hex yellow/24
+ keyword whole localtime yellow/24
+ keyword whole oct yellow/24
+ keyword whole ord yellow/24
+ keyword whole vec yellow/24
+ keyword whole pack yellow/24
+ keyword whole unpack yellow/24
+
+ keyword whole chomp yellow/YellowGreen
+ keyword whole chop yellow/YellowGreen
+ keyword whole crypt yellow/YellowGreen
+ keyword whole eval yellow/YellowGreen
+ keyword whole index yellow/YellowGreen
+ keyword whole length yellow/YellowGreen
+ keyword whole lc yellow/YellowGreen
+ keyword whole lcfirst yellow/YellowGreen
+ keyword whole quotemeta yellow/YellowGreen
+ keyword whole rindex yellow/YellowGreen
+ keyword whole substr yellow/YellowGreen
+ keyword whole uc yellow/YellowGreen
+ keyword whole ucfirst yellow/YellowGreen
+
+ keyword whole delete yellow/24
+ keyword whole each yellow/24
+ keyword whole exists yellow/24
+ keyword whole grep yellow/24
+ keyword whole join yellow/24
+ keyword whole keys yellow/24
+ keyword whole map yellow/24
+ keyword whole pop yellow/24
+ keyword whole push yellow/24
+ keyword whole reverse yellow/24
+ keyword whole scalar yellow/24
+ keyword whole shift yellow/24
+ keyword whole sort yellow/24
+ keyword whole splice yellow/24
+ keyword whole split yellow/24
+ keyword whole unshift yellow/24
+ keyword whole values yellow/24
+
+ keyword whole chmod yellow/24
+ keyword whole chown yellow/24
+ keyword whole truncate yellow/24
+ keyword whole link yellow/24
+ keyword whole lstat yellow/24
+ keyword whole mkdir yellow/24
+ keyword whole readlink yellow/24
+ keyword whole rename yellow/24
+ keyword whole rmdir yellow/24
+ keyword whole stat yellow/24
+ keyword whole symlink yellow/24
+ keyword whole unlink yellow/24
+ keyword whole utime yellow/24
+
+ keyword whole binmade yellow/24
+ keyword whole close yellow/24
+ keyword whole dbmclose yellow/24
+ keyword whole dbmopen yellow/24
+ keyword whole binmade yellow/24
+ keyword whole eof yellow/24
+ keyword whole fcntl yellow/24
+ keyword whole fileno yellow/24
+ keyword whole flock yellow/24
+ keyword whole getc yellow/24
+ keyword whole ioctl yellow/24
+ keyword whole open yellow/24
+ keyword whole pipe yellow/24
+ keyword whole print yellow/24
+ keyword whole printf yellow/24
+ keyword whole read yellow/24
+ keyword whole seek yellow/24
+ keyword whole select yellow/24
+ keyword whole sprintf yellow/24
+ keyword whole sysopen yellow/24
+ keyword whole sysread yellow/24
+ keyword whole syswrite yellow/24
+ keyword whole tell yellow/24
+
+ keyword whole formline yellow/24
+ keyword whole write yellow/24
+
+ keyword whole closedir yellow/24
+ keyword whole opendir yellow/24
+ keyword whole readdir yellow/24
+ keyword whole rewinddir yellow/24
+ keyword whole seekdir yellow/24
+ keyword whole telldir yellow/24
+
+ keyword whole alarm yellow/24
+ keyword whole chdir yellow/24
+ keyword whole chroot yellow/24
+ keyword whole die yellow/24
+ keyword whole exec yellow/24
+ keyword whole exit yellow/24
+ keyword whole fork yellow/24
+ keyword whole getlogin yellow/24
+ keyword whole getpgrp yellow/24
+ keyword whole getppid yellow/24
+ keyword whole getpriority yellow/24
+ keyword whole glob yellow/24
+ keyword whole kill yellow/24
+ keyword whole setpgrp yellow/24
+ keyword whole setpriority yellow/24
+ keyword whole sleep yellow/24
+ keyword whole syscall yellow/24
+ keyword whole system yellow/24
+ keyword whole times yellow/24
+ keyword whole umask yellow/24
+ keyword whole wait yellow/24
+ keyword whole waitpid yellow/24
+ keyword whole warn yellow/24
+
+ keyword whole accept yellow/24
+ keyword whole bind yellow/24
+ keyword whole connect yellow/24
+ keyword whole getpeername yellow/24
+ keyword whole getsockname yellow/24
+ keyword whole getsockopt yellow/24
+ keyword whole listen yellow/24
+ keyword whole recv yellow/24
+ keyword whole send yellow/24
+ keyword whole setsockopt yellow/24
+ keyword whole shutdown yellow/24
+ keyword whole socket yellow/24
+ keyword whole socketpair yellow/24
+
+ keyword whole msgctl yellow/24
+ keyword whole msgget yellow/24
+ keyword whole msgsnd yellow/24
+ keyword whole msgrcv yellow/24
+ keyword whole semctl yellow/24
+ keyword whole semget yellow/24
+ keyword whole semop yellow/24
+ keyword whole shmctl yellow/24
+ keyword whole shmget yellow/24
+ keyword whole shmread yellow/24
+ keyword whole shmwrite yellow/24
+
+ keyword whole defined yellow/24
+ keyword whole dump yellow/24
+ keyword whole eval yellow/24
+ keyword whole local yellow/24
+ keyword whole my yellow/24
+ keyword whole ref yellow/24
+ keyword whole reset yellow/24
+ keyword whole scalar yellow/24
+ keyword whole undef yellow/24
+ keyword whole wantarray yellow/24
+
+ keyword whole endpwent yellow/24
+ keyword whole getpwent yellow/24
+ keyword whole getpwnam yellow/24
+ keyword whole getpwuid yellow/24
+ keyword whole setpwent yellow/24
+ keyword whole endgrent yellow/24
+ keyword whole getgrgid yellow/24
+ keyword whole getgrnam yellow/24
+ keyword whole getgrent yellow/24
+ keyword whole setgrent yellow/24
+
+ keyword whole endhostent yellow/24
+ keyword whole gethostbyaddr yellow/24
+ keyword whole gethostbyname yellow/24
+ keyword whole gethostent yellow/24
+ keyword whole sethostent yellow/24
+
+ keyword whole endnetent yellow/24
+ keyword whole getnetbyaddr yellow/24
+ keyword whole getnetbyname yellow/24
+ keyword whole getnetent yellow/24
+ keyword whole setnetent yellow/24
+ keyword whole endservent yellow/24
+ keyword whole getservbyname yellow/24
+ keyword whole getservbyport yellow/24
+ keyword whole getservent yellow/24
+ keyword whole serservent yellow/24
+ keyword whole endprotoent yellow/24
+ keyword whole getprotobyname yellow/24
+ keyword whole getprotobynumber yellow/24
+ keyword whole getprotoent yellow/24
+ keyword whole setprotoent yellow/24
+
+context exclusive whole <\[\s\\\]EOF EOF green/6
+context # \n brown/22
+context linestart = =cut brown/22
+context " " green/6
+ keyword \\" brightgreen/16
+ keyword \\\\ brightgreen/16
+context ' ' brightgreen/16
+ keyword \\' green/6
+ keyword \\\\ green/6
+
+context exclusive ` ` white/26 black/0
+
+context whole __END__ guacomale_pudding white/26 black/0
+
+###############################################################################
+
diff -ruN old/mc-4.5.27/syntax/python.syntax new/mc-4.5.28/syntax/python.syntax
--- old/mc-4.5.27/syntax/python.syntax Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/syntax/python.syntax Fri Mar 26 15:30:45 1999
@@ -0,0 +1,278 @@
+context default
+ keyword : brightred/18
+ keyword > yellow/24
+ keyword < yellow/24
+ keyword \+ yellow/24
+ keyword - yellow/24
+ keyword \* yellow/24
+ keyword / yellow/24
+ keyword % yellow/24
+ keyword = yellow/24
+ keyword != yellow/24
+ keyword == yellow/24
+ keyword { brightcyan/14
+ keyword } brightcyan/14
+ keyword ( brightcyan/15
+ keyword ) brightcyan/15
+ keyword [ brightcyan/14
+ keyword ] brightcyan/14
+ keyword , brightcyan/14
+ keyword : brightcyan/14
+ keyword ; brightmagenta/19
+ keyword whole self brightred/18
+ keyword whole access yellow/24
+ keyword whole and yellow/24
+ keyword whole break yellow/24
+ keyword whole class yellow/24
+ keyword whole continue yellow/24
+ keyword whole def yellow/24
+ keyword whole del yellow/24
+ keyword whole elif yellow/24
+ keyword whole else yellow/24
+ keyword whole except yellow/24
+ keyword whole exec yellow/24
+ keyword whole finally yellow/24
+ keyword whole for yellow/24
+ keyword whole from yellow/24
+ keyword whole global yellow/24
+ keyword whole if yellow/24
+ keyword whole import yellow/24
+ keyword whole in yellow/24
+ keyword whole is yellow/24
+ keyword whole lambda yellow/24
+ keyword whole not yellow/24
+ keyword whole or yellow/24
+ keyword whole pass yellow/24
+ keyword whole print yellow/24
+ keyword whole raise yellow/24
+ keyword whole return yellow/24
+ keyword whole try yellow/24
+ keyword whole while yellow/24
+
+ keyword whole abs brightcyan/17
+ keyword whole apply brightcyan/17
+ keyword whole callable brightcyan/17
+ keyword whole chr brightcyan/17
+ keyword whole cmp brightcyan/17
+ keyword whole coerce brightcyan/17
+ keyword whole compile brightcyan/17
+ keyword whole delattr brightcyan/17
+ keyword whole dir brightcyan/17
+ keyword whole divmod brightcyan/17
+ keyword whole eval brightcyan/17
+ keyword whole exec brightcyan/17
+ keyword whole execfile brightcyan/17
+ keyword whole filter brightcyan/17
+ keyword whole float brightcyan/17
+ keyword whole getattr brightcyan/17
+ keyword whole globals brightcyan/17
+ keyword whole hasattr brightcyan/17
+ keyword whole hash brightcyan/17
+ keyword whole hex brightcyan/17
+ keyword whole id brightcyan/17
+ keyword whole input brightcyan/17
+ keyword whole int brightcyan/17
+ keyword whole len brightcyan/17
+ keyword whole locals brightcyan/17
+ keyword whole long brightcyan/17
+ keyword whole map brightcyan/17
+ keyword whole max brightcyan/17
+ keyword whole min brightcyan/17
+ keyword whole oct brightcyan/17
+ keyword whole open brightcyan/17
+ keyword whole ord brightcyan/17
+ keyword whole pow brightcyan/17
+ keyword whole range brightcyan/17
+ keyword whole raw_input brightcyan/17
+ keyword whole reduce brightcyan/17
+ keyword whole reload brightcyan/17
+ keyword whole repr brightcyan/17
+ keyword whole round brightcyan/17
+ keyword whole setattr brightcyan/17
+ keyword whole str brightcyan/17
+ keyword whole tuple brightcyan/17
+ keyword whole type brightcyan/17
+ keyword whole vars brightcyan/17
+ keyword whole xrange brightcyan/17
+
+ keyword whole atof magenta/23
+ keyword whole atoi magenta/23
+ keyword whole atol magenta/23
+ keyword whole expandtabs magenta/23
+ keyword whole find magenta/23
+ keyword whole rfind magenta/23
+ keyword whole index magenta/23
+ keyword whole rindex magenta/23
+ keyword whole count magenta/23
+ keyword whole split magenta/23
+ keyword whole splitfields magenta/23
+ keyword whole join magenta/23
+ keyword whole joinfields magenta/23
+ keyword whole strip magenta/23
+ keyword whole swapcase magenta/23
+ keyword whole upper magenta/23
+ keyword whole lower magenta/23
+ keyword whole ljust magenta/23
+ keyword whole rjust magenta/23
+ keyword whole center magenta/23
+ keyword whole zfill magenta/23
+
+ keyword whole __init__ lightgray/13
+ keyword whole __del__ lightgray/13
+ keyword whole __repr__ lightgray/13
+ keyword whole __str__ lightgray/13
+ keyword whole __cmp__ lightgray/13
+ keyword whole __hash__ lightgray/13
+ keyword whole __call__ lightgray/13
+ keyword whole __getattr__ lightgray/13
+ keyword whole __setattr__ lightgray/13
+ keyword whole __delattr__ lightgray/13
+ keyword whole __len__ lightgray/13
+ keyword whole __getitem__ lightgray/13
+ keyword whole __setitem__ lightgray/13
+ keyword whole __delitem__ lightgray/13
+ keyword whole __getslice__ lightgray/13
+ keyword whole __setslice__ lightgray/13
+ keyword whole __delslice__ lightgray/13
+ keyword whole __add__ lightgray/13
+ keyword whole __sub__ lightgray/13
+ keyword whole __mul__ lightgray/13
+ keyword whole __div__ lightgray/13
+ keyword whole __mod__ lightgray/13
+ keyword whole __divmod__ lightgray/13
+ keyword whole __pow__ lightgray/13
+ keyword whole __lshift__ lightgray/13
+ keyword whole __rshift__ lightgray/13
+ keyword whole __and__ lightgray/13
+ keyword whole __xor__ lightgray/13
+ keyword whole __or__ lightgray/13
+ keyword whole __neg__ lightgray/13
+ keyword whole __pos__ lightgray/13
+ keyword whole __abs__ lightgray/13
+ keyword whole __invert__ lightgray/13
+ keyword whole __nonzero__ lightgray/13
+ keyword whole __coerce__ lightgray/13
+ keyword whole __int__ lightgray/13
+ keyword whole __long__ lightgray/13
+ keyword whole __float__ lightgray/13
+ keyword whole __oct__ lightgray/13
+ keyword whole __hex__ lightgray/13
+
+ keyword whole __init__ lightgray/13
+ keyword whole __del__ lightgray/13
+ keyword whole __repr__ lightgray/13
+ keyword whole __str__ lightgray/13
+ keyword whole __cmp__ lightgray/13
+ keyword whole __hash__ lightgray/13
+ keyword whole __call__ lightgray/13
+ keyword whole __getattr__ lightgray/13
+ keyword whole __setattr__ lightgray/13
+ keyword whole __delattr__ lightgray/13
+ keyword whole __len__ lightgray/13
+ keyword whole __getitem__ lightgray/13
+ keyword whole __setitem__ lightgray/13
+ keyword whole __delitem__ lightgray/13
+ keyword whole __getslice__ lightgray/13
+ keyword whole __setslice__ lightgray/13
+ keyword whole __delslice__ lightgray/13
+ keyword whole __add__ lightgray/13
+ keyword whole __sub__ lightgray/13
+ keyword whole __mul__ lightgray/13
+ keyword whole __div__ lightgray/13
+ keyword whole __mod__ lightgray/13
+ keyword whole __divmod__ lightgray/13
+ keyword whole __pow__ lightgray/13
+ keyword whole __lshift__ lightgray/13
+ keyword whole __rshift__ lightgray/13
+ keyword whole __and__ lightgray/13
+ keyword whole __xor__ lightgray/13
+ keyword whole __or__ lightgray/13
+ keyword whole __neg__ lightgray/13
+ keyword whole __pos__ lightgray/13
+ keyword whole __abs__ lightgray/13
+ keyword whole __invert__ lightgray/13
+ keyword whole __nonzero__ lightgray/13
+ keyword whole __coerce__ lightgray/13
+ keyword whole __int__ lightgray/13
+ keyword whole __long__ lightgray/13
+ keyword whole __float__ lightgray/13
+ keyword whole __oct__ lightgray/13
+ keyword whole __hex__ lightgray/13
+
+ keyword whole __radd__ lightgray/13
+ keyword whole __rsub__ lightgray/13
+ keyword whole __rmul__ lightgray/13
+ keyword whole __rdiv__ lightgray/13
+ keyword whole __rmod__ lightgray/13
+ keyword whole __rdivmod__ lightgray/13
+ keyword whole __rpow__ lightgray/13
+ keyword whole __rlshift__ lightgray/13
+ keyword whole __rrshift__ lightgray/13
+ keyword whole __rand__ lightgray/13
+ keyword whole __rxor__ lightgray/13
+ keyword whole __ror__ lightgray/13
+
+ keyword whole __*__ brightred/18
+
+context """ """ brown/22
+context # \n brown/22
+context " " green/6
+ keyword \\" brightgreen/16
+ keyword %% brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]e brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]E brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]f brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]g brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]G brightgreen/16
+ keyword %\[0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]d brightgreen/16
+ keyword %\[0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]i brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]o brightgreen/16
+ keyword %\[0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]u brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]x brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]X brightgreen/16
+ keyword %\[hl\]n brightgreen/16
+ keyword %\[.\]\[0123456789\]s brightgreen/16
+ keyword %[*] brightgreen/16
+ keyword %c brightgreen/16
+ keyword \\\\ brightgreen/16
+ keyword \\' brightgreen/16
+ keyword \\a brightgreen/16
+ keyword \\b brightgreen/16
+ keyword \\t brightgreen/16
+ keyword \\n brightgreen/16
+ keyword \\v brightgreen/16
+ keyword \\f brightgreen/16
+ keyword \\r brightgreen/16
+ keyword \\0 brightgreen/16
+
+context ' ' green/6
+ keyword \\" brightgreen/16
+ keyword %% brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]e brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]E brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]f brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]g brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[L\]G brightgreen/16
+ keyword %\[0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]d brightgreen/16
+ keyword %\[0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]i brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]o brightgreen/16
+ keyword %\[0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]u brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]x brightgreen/16
+ keyword %\[#0\s-\+,\]\[0123456789\]\[.\]\[0123456789\]\[hl\]X brightgreen/16
+ keyword %\[hl\]n brightgreen/16
+ keyword %\[.\]\[0123456789\]s brightgreen/16
+ keyword %[*] brightgreen/16
+ keyword %c brightgreen/16
+ keyword \\\\ brightgreen/16
+ keyword \\' brightgreen/16
+ keyword \\a brightgreen/16
+ keyword \\b brightgreen/16
+ keyword \\t brightgreen/16
+ keyword \\n brightgreen/16
+ keyword \\v brightgreen/16
+ keyword \\f brightgreen/16
+ keyword \\r brightgreen/16
+ keyword \\0 brightgreen/16
+
+###############################################################################
+
diff -ruN old/mc-4.5.27/syntax/sh.syntax new/mc-4.5.28/syntax/sh.syntax
--- old/mc-4.5.27/syntax/sh.syntax Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/syntax/sh.syntax Fri Mar 26 15:30:45 1999
@@ -0,0 +1,507 @@
+
+context default
+ keyword whole for yellow/24
+ keyword whole in yellow/24
+ keyword whole do yellow/24
+ keyword whole done yellow/24
+ keyword whole select yellow/24
+ keyword whole case yellow/24
+ keyword whole esac yellow/24
+ keyword whole if yellow/24
+ keyword whole then yellow/24
+ keyword whole elif yellow/24
+ keyword whole else yellow/24
+ keyword whole fi yellow/24
+ keyword whole while yellow/24
+ keyword whole until yellow/24
+ keyword ;; brightred/18
+ keyword \\@ brightred/18
+ keyword \\$ brightred/18
+ keyword \\\\ brightred/18
+ keyword \\" brightred/18
+ keyword \\' brightred/18
+ keyword \\` brightred/18
+ keyword ` brightred/18
+ keyword ; brightcyan/17
+ keyword $(*) brightgreen/16
+ keyword ${*} brightgreen/16
+ keyword { brightcyan/14
+ keyword } brightcyan/14
+
+ keyword whole linestart #!\[\s\]/bin/\[abkpct\]sh brightcyan/17 black/0
+
+ keyword $\* brightred/18
+ keyword $@ brightred/18
+ keyword $# brightred/18
+ keyword $? brightred/18
+ keyword $- brightred/18
+ keyword $$ brightred/18
+ keyword $! brightred/18
+ keyword $_ brightred/18
+
+ keyword wholeright $\[0123456789\]0 brightred/18
+ keyword wholeright $\[0123456789\]1 brightred/18
+ keyword wholeright $\[0123456789\]2 brightred/18
+ keyword wholeright $\[0123456789\]3 brightred/18
+ keyword wholeright $\[0123456789\]4 brightred/18
+ keyword wholeright $\[0123456789\]5 brightred/18
+ keyword wholeright $\[0123456789\]6 brightred/18
+ keyword wholeright $\[0123456789\]7 brightred/18
+ keyword wholeright $\[0123456789\]8 brightred/18
+ keyword wholeright $\[0123456789\]9 brightred/18
+
+ keyword wholeright $+A brightgreen/16
+ keyword wholeright $+B brightgreen/16
+ keyword wholeright $+C brightgreen/16
+ keyword wholeright $+D brightgreen/16
+ keyword wholeright $+E brightgreen/16
+ keyword wholeright $+F brightgreen/16
+ keyword wholeright $+G brightgreen/16
+ keyword wholeright $+H brightgreen/16
+ keyword wholeright $+I brightgreen/16
+ keyword wholeright $+J brightgreen/16
+ keyword wholeright $+K brightgreen/16
+ keyword wholeright $+L brightgreen/16
+ keyword wholeright $+M brightgreen/16
+ keyword wholeright $+N brightgreen/16
+ keyword wholeright $+O brightgreen/16
+ keyword wholeright $+P brightgreen/16
+ keyword wholeright $+Q brightgreen/16
+ keyword wholeright $+R brightgreen/16
+ keyword wholeright $+S brightgreen/16
+ keyword wholeright $+T brightgreen/16
+ keyword wholeright $+U brightgreen/16
+ keyword wholeright $+V brightgreen/16
+ keyword wholeright $+W brightgreen/16
+ keyword wholeright $+X brightgreen/16
+ keyword wholeright $+Y brightgreen/16
+ keyword wholeright $+Z brightgreen/16
+
+ keyword wholeright $+a brightgreen/16
+ keyword wholeright $+b brightgreen/16
+ keyword wholeright $+c brightgreen/16
+ keyword wholeright $+d brightgreen/16
+ keyword wholeright $+e brightgreen/16
+ keyword wholeright $+f brightgreen/16
+ keyword wholeright $+g brightgreen/16
+ keyword wholeright $+h brightgreen/16
+ keyword wholeright $+i brightgreen/16
+ keyword wholeright $+j brightgreen/16
+ keyword wholeright $+k brightgreen/16
+ keyword wholeright $+l brightgreen/16
+ keyword wholeright $+m brightgreen/16
+ keyword wholeright $+n brightgreen/16
+ keyword wholeright $+o brightgreen/16
+ keyword wholeright $+p brightgreen/16
+ keyword wholeright $+q brightgreen/16
+ keyword wholeright $+r brightgreen/16
+ keyword wholeright $+s brightgreen/16
+ keyword wholeright $+t brightgreen/16
+ keyword wholeright $+u brightgreen/16
+ keyword wholeright $+v brightgreen/16
+ keyword wholeright $+w brightgreen/16
+ keyword wholeright $+x brightgreen/16
+ keyword wholeright $+y brightgreen/16
+ keyword wholeright $+z brightgreen/16
+
+ keyword wholeright $+0 brightgreen/16
+ keyword wholeright $+1 brightgreen/16
+ keyword wholeright $+2 brightgreen/16
+ keyword wholeright $+3 brightgreen/16
+ keyword wholeright $+4 brightgreen/16
+ keyword wholeright $+5 brightgreen/16
+ keyword wholeright $+6 brightgreen/16
+ keyword wholeright $+7 brightgreen/16
+ keyword wholeright $+8 brightgreen/16
+ keyword wholeright $+9 brightgreen/16
+
+ keyword $ brightgreen/16
+
+ keyword wholeleft function*() brightblue/11
+
+wholechars right abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._
+wholechars left abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._
+
+ keyword whole arch cyan/14
+ keyword whole ash cyan/14
+ keyword whole awk cyan/14
+ keyword whole basename cyan/14
+ keyword whole bash cyan/14
+ keyword whole basnemae cyan/14
+ keyword whole bg_backup cyan/14
+ keyword whole bg_restore cyan/14
+ keyword whole bsh cyan/14
+ keyword whole cat cyan/14
+ keyword whole chgrp cyan/14
+ keyword whole chmod cyan/14
+ keyword whole chown cyan/14
+ keyword whole cp cyan/14
+ keyword whole cpio cyan/14
+ keyword whole csh cyan/14
+ keyword whole date cyan/14
+ keyword whole dd cyan/14
+ keyword whole df cyan/14
+ keyword whole dmesg cyan/14
+ keyword whole dnsdomainname cyan/14
+ keyword whole doexec cyan/14
+ keyword whole domainname cyan/14
+ keyword whole echo cyan/14
+ keyword whole ed cyan/14
+ keyword whole egrep cyan/14
+ keyword whole ex cyan/14
+ keyword whole false cyan/14
+ keyword whole fgrep cyan/14
+ keyword whole fsconf cyan/14
+ keyword whole gawk cyan/14
+ keyword whole grep cyan/14
+ keyword whole gunzip cyan/14
+ keyword whole gzip cyan/14
+ keyword whole hostname cyan/14
+ keyword whole igawk cyan/14
+ keyword whole ipcalc cyan/14
+ keyword whole kill cyan/14
+ keyword whole ksh cyan/14
+ keyword whole linuxconf cyan/14
+ keyword whole ln cyan/14
+ keyword whole login cyan/14
+ keyword whole lpdconf cyan/14
+ keyword whole ls cyan/14
+ keyword whole mail cyan/14
+ keyword whole mkdir cyan/14
+ keyword whole mknod cyan/14
+ keyword whole mktemp cyan/14
+ keyword whole more cyan/14
+ keyword whole mount cyan/14
+ keyword whole mt cyan/14
+ keyword whole mv cyan/14
+ keyword whole netconf cyan/14
+ keyword whole netstat cyan/14
+ keyword whole nice cyan/14
+ keyword whole nisdomainname cyan/14
+ keyword whole ping cyan/14
+ keyword whole ps cyan/14
+ keyword whole pwd cyan/14
+ keyword whole red cyan/14
+ keyword whole remadmin cyan/14
+ keyword whole rm cyan/14
+ keyword whole rmdir cyan/14
+ keyword whole rpm cyan/14
+ keyword whole sed cyan/14
+ keyword whole setserial cyan/14
+ keyword whole sh cyan/14
+ keyword whole sleep cyan/14
+ keyword whole sort cyan/14
+ keyword whole stty cyan/14
+ keyword whole su cyan/14
+ keyword whole sync cyan/14
+ keyword whole taper cyan/14
+ keyword whole tar cyan/14
+ keyword whole tcsh cyan/14
+ keyword whole touch cyan/14
+ keyword whole true cyan/14
+ keyword whole umount cyan/14
+ keyword whole uname cyan/14
+ keyword whole userconf cyan/14
+ keyword whole usleep cyan/14
+ keyword whole vi cyan/14
+ keyword whole view cyan/14
+ keyword whole vim cyan/14
+ keyword whole xconf cyan/14
+ keyword whole ypdomainname cyan/14
+ keyword whole zcat cyan/14
+ keyword whole zsh cyan/14
+
+wholechars right abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_
+wholechars left abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_
+
+context # \n brown/22
+
+context exclusive whole <\[\s\\\]EOF EOF green/6
+
+context ' ' green/6
+
+context " " green/6
+ keyword \\* brightgreen/16
+ keyword \\@ brightgreen/16
+ keyword \\$ brightgreen/16
+ keyword \\\\ brightgreen/16
+ keyword \\` brightgreen/16
+ keyword \\" brightgreen/16
+ keyword $(*) brightgreen/16
+ keyword ${*} brightgreen/16
+ keyword $\* brightred/18
+ keyword $@ brightred/18
+ keyword $# brightred/18
+ keyword $? brightred/18
+ keyword $- brightred/18
+ keyword $$ brightred/18
+ keyword $! brightred/18
+ keyword $_ brightred/18
+ keyword wholeright $\[0123456789\]0 brightred/18
+ keyword wholeright $\[0123456789\]1 brightred/18
+ keyword wholeright $\[0123456789\]2 brightred/18
+ keyword wholeright $\[0123456789\]3 brightred/18
+ keyword wholeright $\[0123456789\]4 brightred/18
+ keyword wholeright $\[0123456789\]5 brightred/18
+ keyword wholeright $\[0123456789\]6 brightred/18
+ keyword wholeright $\[0123456789\]7 brightred/18
+ keyword wholeright $\[0123456789\]8 brightred/18
+ keyword wholeright $\[0123456789\]9 brightred/18
+
+ keyword wholeright $+A brightgreen/16
+ keyword wholeright $+B brightgreen/16
+ keyword wholeright $+C brightgreen/16
+ keyword wholeright $+D brightgreen/16
+ keyword wholeright $+E brightgreen/16
+ keyword wholeright $+F brightgreen/16
+ keyword wholeright $+G brightgreen/16
+ keyword wholeright $+H brightgreen/16
+ keyword wholeright $+I brightgreen/16
+ keyword wholeright $+J brightgreen/16
+ keyword wholeright $+K brightgreen/16
+ keyword wholeright $+L brightgreen/16
+ keyword wholeright $+M brightgreen/16
+ keyword wholeright $+N brightgreen/16
+ keyword wholeright $+O brightgreen/16
+ keyword wholeright $+P brightgreen/16
+ keyword wholeright $+Q brightgreen/16
+ keyword wholeright $+R brightgreen/16
+ keyword wholeright $+S brightgreen/16
+ keyword wholeright $+T brightgreen/16
+ keyword wholeright $+U brightgreen/16
+ keyword wholeright $+V brightgreen/16
+ keyword wholeright $+W brightgreen/16
+ keyword wholeright $+X brightgreen/16
+ keyword wholeright $+Y brightgreen/16
+ keyword wholeright $+Z brightgreen/16
+
+ keyword wholeright $+a brightgreen/16
+ keyword wholeright $+b brightgreen/16
+ keyword wholeright $+c brightgreen/16
+ keyword wholeright $+d brightgreen/16
+ keyword wholeright $+e brightgreen/16
+ keyword wholeright $+f brightgreen/16
+ keyword wholeright $+g brightgreen/16
+ keyword wholeright $+h brightgreen/16
+ keyword wholeright $+i brightgreen/16
+ keyword wholeright $+j brightgreen/16
+ keyword wholeright $+k brightgreen/16
+ keyword wholeright $+l brightgreen/16
+ keyword wholeright $+m brightgreen/16
+ keyword wholeright $+n brightgreen/16
+ keyword wholeright $+o brightgreen/16
+ keyword wholeright $+p brightgreen/16
+ keyword wholeright $+q brightgreen/16
+ keyword wholeright $+r brightgreen/16
+ keyword wholeright $+s brightgreen/16
+ keyword wholeright $+t brightgreen/16
+ keyword wholeright $+u brightgreen/16
+ keyword wholeright $+v brightgreen/16
+ keyword wholeright $+w brightgreen/16
+ keyword wholeright $+x brightgreen/16
+ keyword wholeright $+y brightgreen/16
+ keyword wholeright $+z brightgreen/16
+
+ keyword wholeright $+0 brightgreen/16
+ keyword wholeright $+1 brightgreen/16
+ keyword wholeright $+2 brightgreen/16
+ keyword wholeright $+3 brightgreen/16
+ keyword wholeright $+4 brightgreen/16
+ keyword wholeright $+5 brightgreen/16
+ keyword wholeright $+6 brightgreen/16
+ keyword wholeright $+7 brightgreen/16
+ keyword wholeright $+8 brightgreen/16
+ keyword wholeright $+9 brightgreen/16
+
+ keyword $ brightgreen/16
+
+context exclusive ` ` white/26 black/0
+ keyword '*' green/6
+ keyword " green/6
+ keyword ; brightcyan/17
+ keyword $(*) brightgreen/16
+ keyword ${*} brightgreen/16
+ keyword { brightcyan/14
+ keyword } brightcyan/14
+
+ keyword $\* brightred/18
+ keyword $@ brightred/18
+ keyword $# brightred/18
+ keyword $? brightred/18
+ keyword $- brightred/18
+ keyword $$ brightred/18
+ keyword $! brightred/18
+ keyword $_ brightred/18
+
+ keyword wholeright $\[0123456789\]0 brightred/18
+ keyword wholeright $\[0123456789\]1 brightred/18
+ keyword wholeright $\[0123456789\]2 brightred/18
+ keyword wholeright $\[0123456789\]3 brightred/18
+ keyword wholeright $\[0123456789\]4 brightred/18
+ keyword wholeright $\[0123456789\]5 brightred/18
+ keyword wholeright $\[0123456789\]6 brightred/18
+ keyword wholeright $\[0123456789\]7 brightred/18
+ keyword wholeright $\[0123456789\]8 brightred/18
+ keyword wholeright $\[0123456789\]9 brightred/18
+
+ keyword wholeright $+A brightgreen/16
+ keyword wholeright $+B brightgreen/16
+ keyword wholeright $+C brightgreen/16
+ keyword wholeright $+D brightgreen/16
+ keyword wholeright $+E brightgreen/16
+ keyword wholeright $+F brightgreen/16
+ keyword wholeright $+G brightgreen/16
+ keyword wholeright $+H brightgreen/16
+ keyword wholeright $+I brightgreen/16
+ keyword wholeright $+J brightgreen/16
+ keyword wholeright $+K brightgreen/16
+ keyword wholeright $+L brightgreen/16
+ keyword wholeright $+M brightgreen/16
+ keyword wholeright $+N brightgreen/16
+ keyword wholeright $+O brightgreen/16
+ keyword wholeright $+P brightgreen/16
+ keyword wholeright $+Q brightgreen/16
+ keyword wholeright $+R brightgreen/16
+ keyword wholeright $+S brightgreen/16
+ keyword wholeright $+T brightgreen/16
+ keyword wholeright $+U brightgreen/16
+ keyword wholeright $+V brightgreen/16
+ keyword wholeright $+W brightgreen/16
+ keyword wholeright $+X brightgreen/16
+ keyword wholeright $+Y brightgreen/16
+ keyword wholeright $+Z brightgreen/16
+
+ keyword wholeright $+a brightgreen/16
+ keyword wholeright $+b brightgreen/16
+ keyword wholeright $+c brightgreen/16
+ keyword wholeright $+d brightgreen/16
+ keyword wholeright $+e brightgreen/16
+ keyword wholeright $+f brightgreen/16
+ keyword wholeright $+g brightgreen/16
+ keyword wholeright $+h brightgreen/16
+ keyword wholeright $+i brightgreen/16
+ keyword wholeright $+j brightgreen/16
+ keyword wholeright $+k brightgreen/16
+ keyword wholeright $+l brightgreen/16
+ keyword wholeright $+m brightgreen/16
+ keyword wholeright $+n brightgreen/16
+ keyword wholeright $+o brightgreen/16
+ keyword wholeright $+p brightgreen/16
+ keyword wholeright $+q brightgreen/16
+ keyword wholeright $+r brightgreen/16
+ keyword wholeright $+s brightgreen/16
+ keyword wholeright $+t brightgreen/16
+ keyword wholeright $+u brightgreen/16
+ keyword wholeright $+v brightgreen/16
+ keyword wholeright $+w brightgreen/16
+ keyword wholeright $+x brightgreen/16
+ keyword wholeright $+y brightgreen/16
+ keyword wholeright $+z brightgreen/16
+
+ keyword wholeright $+0 brightgreen/16
+ keyword wholeright $+1 brightgreen/16
+ keyword wholeright $+2 brightgreen/16
+ keyword wholeright $+3 brightgreen/16
+ keyword wholeright $+4 brightgreen/16
+ keyword wholeright $+5 brightgreen/16
+ keyword wholeright $+6 brightgreen/16
+ keyword wholeright $+7 brightgreen/16
+ keyword wholeright $+8 brightgreen/16
+ keyword wholeright $+9 brightgreen/16
+
+ keyword $ brightgreen/16
+
+wholechars right abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._
+wholechars left abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._
+
+ keyword whole arch cyan/14
+ keyword whole ash cyan/14
+ keyword whole awk cyan/14
+ keyword whole basename cyan/14
+ keyword whole bash cyan/14
+ keyword whole basnemae cyan/14
+ keyword whole bg_backup cyan/14
+ keyword whole bg_restore cyan/14
+ keyword whole bsh cyan/14
+ keyword whole cat cyan/14
+ keyword whole chgrp cyan/14
+ keyword whole chmod cyan/14
+ keyword whole chown cyan/14
+ keyword whole cp cyan/14
+ keyword whole cpio cyan/14
+ keyword whole csh cyan/14
+ keyword whole date cyan/14
+ keyword whole dd cyan/14
+ keyword whole df cyan/14
+ keyword whole dmesg cyan/14
+ keyword whole dnsdomainname cyan/14
+ keyword whole doexec cyan/14
+ keyword whole domainname cyan/14
+ keyword whole echo cyan/14
+ keyword whole ed cyan/14
+ keyword whole egrep cyan/14
+ keyword whole ex cyan/14
+ keyword whole false cyan/14
+ keyword whole fgrep cyan/14
+ keyword whole fsconf cyan/14
+ keyword whole gawk cyan/14
+ keyword whole grep cyan/14
+ keyword whole gunzip cyan/14
+ keyword whole gzip cyan/14
+ keyword whole hostname cyan/14
+ keyword whole igawk cyan/14
+ keyword whole ipcalc cyan/14
+ keyword whole kill cyan/14
+ keyword whole ksh cyan/14
+ keyword whole linuxconf cyan/14
+ keyword whole ln cyan/14
+ keyword whole login cyan/14
+ keyword whole lpdconf cyan/14
+ keyword whole ls cyan/14
+ keyword whole mail cyan/14
+ keyword whole mkdir cyan/14
+ keyword whole mknod cyan/14
+ keyword whole mktemp cyan/14
+ keyword whole more cyan/14
+ keyword whole mount cyan/14
+ keyword whole mt cyan/14
+ keyword whole mv cyan/14
+ keyword whole netconf cyan/14
+ keyword whole netstat cyan/14
+ keyword whole nice cyan/14
+ keyword whole nisdomainname cyan/14
+ keyword whole ping cyan/14
+ keyword whole ps cyan/14
+ keyword whole pwd cyan/14
+ keyword whole red cyan/14
+ keyword whole remadmin cyan/14
+ keyword whole rm cyan/14
+ keyword whole rmdir cyan/14
+ keyword whole rpm cyan/14
+ keyword whole sed cyan/14
+ keyword whole setserial cyan/14
+ keyword whole sh cyan/14
+ keyword whole sleep cyan/14
+ keyword whole sort cyan/14
+ keyword whole stty cyan/14
+ keyword whole su cyan/14
+ keyword whole sync cyan/14
+ keyword whole taper cyan/14
+ keyword whole tar cyan/14
+ keyword whole tcsh cyan/14
+ keyword whole touch cyan/14
+ keyword whole true cyan/14
+ keyword whole umount cyan/14
+ keyword whole uname cyan/14
+ keyword whole userconf cyan/14
+ keyword whole usleep cyan/14
+ keyword whole vi cyan/14
+ keyword whole view cyan/14
+ keyword whole vim cyan/14
+ keyword whole xconf cyan/14
+ keyword whole ypdomainname cyan/14
+ keyword whole zcat cyan/14
+ keyword whole zsh cyan/14
+
+###############################################################################
+
diff -ruN old/mc-4.5.27/syntax/smalltalk.syntax new/mc-4.5.28/syntax/smalltalk.syntax
--- old/mc-4.5.27/syntax/smalltalk.syntax Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/syntax/smalltalk.syntax Fri Mar 26 15:30:45 1999
@@ -0,0 +1,160 @@
+###################################################################################
+# (GNU) SmallTalk syntax hilighting by Carlos Rodrigues <a9566@lei.di.fct.unl.pt> #
+###################################################################################
+
+# I guess this is not very syntax strict, but it makes the code
+# a lot more readable.
+
+context default
+ keyword whole methodsFor yellow/24
+ keyword whole subclass yellow/24
+ keyword whole class yellow/24
+ keyword whole nil yellow/24
+ keyword whole self yellow/24
+ keyword whole instanceVariableNames yellow/24
+ keyword whole classVariableNames yellow/24
+ keyword whole poolDictionaries yellow/24
+ keyword whole category yellow/24
+ keyword whole super yellow/24
+ keyword whole category yellow/24
+ keyword whole variableSubclass yellow/24
+ keyword whole variableByteSubclass yellow/24
+ keyword whole variableWordSubclass yellow/24
+ keyword whole superclass yellow/24
+
+ keyword whole not brightmagenta/23
+ keyword whole comment brightmagenta/23
+ keyword whole error brightmagenta/23
+ keyword whole at brightmagenta/23
+ keyword whole put brightmagenta/23
+ keyword whole add brightmagenta/23
+ keyword whole remove brightmagenta/23
+ keyword whole new brightmagenta/23
+ keyword whole ifTrue brightmagenta/23
+ keyword whole ifFalse brightmagenta/23
+ keyword whole whileTrue brightmagenta/23
+ keyword whole whileFalse brightmagenta/23
+ keyword whole ifAbsent brightmagenta/23
+ keyword whole init brightmagenta/23
+ keyword whole do brightmagenta/23
+ keyword whole from brightmagenta/23
+ keyword whole with brightmagenta/23
+ keyword whole do brightmagenta/23
+ keyword whole true brightmagenta/23
+ keyword whole false brightmagenta/23
+ keyword whole or brightmagenta/23
+ keyword whole and brightmagenta/23
+ keyword whole to brightmagenta/23
+ keyword whole by brightmagenta/23
+
+ keyword whole Smalltalk brightgreen/6
+ keyword whole Object brightgreen/6
+ keyword whole Autoload brightgreen/6
+ keyword whole Behavior brightgreen/6
+ keyword whole ClassDescription brightgreen/6
+ keyword whole Class brightgreen/6
+ keyword whole MetaClass brightgreen/6
+ keyword whole BlockContext brightgreen/6
+ keyword whole Boolean brightgreen/6
+ keyword whole False brightgreen/6
+ keyword whole True brightgreen/6
+ keyword whole CFunctionDescriptor brightgreen/6
+ keyword whole CObject brightgreen/6
+ keyword whole Collection brightgreen/6
+ keyword whole Bag brightgreen/6
+ keyword whole MappedCollection brightgreen/6
+ keyword whole SequenceableCollection brightgreen/6
+ keyword whole ArrayedCollection brightgreen/6
+ keyword whole Array brightgreen/6
+ keyword whole ByteArray brightgreen/6
+ keyword whole CompiledCollection brightgreen/6
+ keyword whole String brightgreen/6
+ keyword whole Symbol brightgreen/6
+ keyword whole Interval brightgreen/6
+ keyword whole LinkedList brightgreen/6
+ keyword whole Semaphore brightgreen/6
+ keyword whole OrderedCollection brightgreen/6
+ keyword whole SortedCollection brightgreen/6
+ keyword whole Set brightgreen/6
+ keyword whole Dictionary brightgreen/6
+ keyword whole IdentityDictionary brightgreen/6
+ keyword whole SystemDictionary brightgreen/6
+ keyword whole Delay brightgreen/6
+ keyword whole FileSegment brightgreen/6
+ keyword whole Link brightgreen/6
+ keyword whole Process brightgreen/6
+ keyword whole SymLink brightgreen/6
+ keyword whole Magnitude brightgreen/6
+ keyword whole Character brightgreen/6
+ keyword whole Date brightgreen/6
+ keyword whole LookupKey brightgreen/6
+ keyword whole Association brightgreen/6
+ keyword whole Number brightgreen/6
+ keyword whole Float brightgreen/6
+ keyword whole Integer brightgreen/6
+ keyword whole Time brightgreen/6
+ keyword whole Memory brightgreen/6
+ keyword whole ByteMemory brightgreen/6
+ keyword whole WordMemory brightgreen/6
+ keyword whole Message brightgreen/6
+ keyword whole MethodContext brightgreen/6
+ keyword whole MethodInfo brightgreen/6
+ keyword whole ProcessorScheduler brightgreen/6
+ keyword whole SharedQueue brightgreen/6
+ keyword whole Stream brightgreen/6
+ keyword whole PositionableStream brightgreen/6
+ keyword whole ReadStream brightgreen/6
+ keyword whole WriteStream brightgreen/6
+ keyword whole ReadWriteStream brightgreen/6
+ keyword whole FileStream brightgreen/6
+ keyword whole Random brightgreen/6
+ keyword whole TokenStream brightgreen/6
+ keyword whole UndefinedObject brightgreen/6
+
+ keyword wholeright !! brightred/18
+ keyword wholeright ! brightred/18
+ keyword wholeleft ! brightred/18
+ keyword wholeright . brightred/18
+
+ keyword > cyan/16
+ keyword <> cyan/16
+ keyword < cyan/16
+ keyword \+ cyan/16
+ keyword - cyan/16
+ keyword \* cyan/16
+ keyword / cyan/16
+ keyword % cyan/16
+ keyword = cyan/16
+ keyword | cyan/16
+ keyword # cyan/16
+ keyword @ cyan/16
+ keyword ^ cyan/16
+ keyword { cyan/16
+ keyword } cyan/16
+ keyword ( cyan/16
+ keyword ) cyan/16
+ keyword [ cyan/16
+ keyword ] cyan/16
+ keyword , cyan/16
+ keyword : cyan/16
+ keyword & cyan/16
+ keyword $ cyan/16
+ keyword . cyan/16
+ keyword ! cyan/16
+ keyword ; cyan/16
+ keyword _ cyan/16
+ keyword ~ cyan/16
+ keyword ? cyan/16
+
+context $ ; cyan/16
+
+context " " brown/22
+
+context ' ' brightcyan/8
+
+ keyword \\\n brightmagenta/23
+ keyword \\" brightmagenta/23
+ keyword \\\\ brightmagenta/23
+ keyword \\' brightmagenta/23
+
+
diff -ruN old/mc-4.5.27/vfs/ChangeLog new/mc-4.5.28/vfs/ChangeLog
--- old/mc-4.5.27/vfs/ChangeLog Thu Mar 18 20:42:26 1999
+++ new/mc-4.5.28/vfs/ChangeLog Fri Mar 26 15:30:38 1999
@@ -1,3 +1,21 @@
+1999-03-22 David Martin <dmartina@mailexcite.com>
+
+ * ftpfs.c: Internationalize the messages that are displayed as
+ hints.
+
+1999-03-22 Miguel de Icaza <miguel@nuclecu.unam.mx>
+
+ * extfs.c (extfs_init): Fix the code here: If the key is empty or
+ only contains a new line, C would be pointing into an invalid location.
+
+Mon Mar 22 02:56:23 1999 Timur I. Bakeyev <mc@bat.ru>
+
+ * Makefile-mc.in: s/$(libdir)\/extfs/$(extfsdir)/
+
+Mon Mar 22 02:00:16 1999 Valery Kornienkov <vlk@st.simbirsk.su>
+
+ * extfs/uha.in: Add support for ha archives.
+
1999-03-12 Miguel de Icaza <miguel@nuclecu.unam.mx>
* vfs.c (vfs_parse_ls_lga): Handle stupid servers that send n_link
diff -ruN old/mc-4.5.27/vfs/Make-mc.in new/mc-4.5.28/vfs/Make-mc.in
--- old/mc-4.5.27/vfs/Make-mc.in Thu Mar 18 20:42:26 1999
+++ new/mc-4.5.28/vfs/Make-mc.in Fri Mar 26 15:30:38 1999
@@ -82,6 +82,7 @@
ftplist.in \
uar.in \
ulha.in \
+ uha.in \
uzip.in
EXTFS_OUT = \
@@ -93,6 +94,7 @@
ftplist \
uar \
ulha \
+ uha \
uzip
EXTFSSTUFF = $(EXTFS_MISC) $(EXTFS_CONST) $(EXTFS_IN)
@@ -189,25 +191,25 @@
install.extfs:
for I in $(EXTFS_MISC); do \
$(INSTALL_DATA) $(srcdir)/extfs/$$I \
- $(DESTDIR)$(libdir)/extfs/$$I; \
+ $(DESTDIR)$(extfsdir)/$$I; \
done
for I in $(EXTFS_CONST) ; do \
$(INSTALL_PROGRAM) $(srcdir)/extfs/$$I \
- $(DESTDIR)$(libdir)/extfs/$$I; \
+ $(DESTDIR)$(extfsdir)/$$I; \
done
for I in $(EXTFS_OUT) ; do \
$(INSTALL_PROGRAM) $(builddir)/vfs/extfs/$$I \
- $(DESTDIR)$(libdir)/extfs/$$I; \
+ $(DESTDIR)$(extfsdir)/$$I; \
done
uninstall:
for I in $(EXTFS_MISC); do \
- $(RMF) $(DESTDIR)$(libdir)/extfs/$$I; \
+ $(RMF) $(DESTDIR)$(extfsdir)/$$I; \
done
for I in $(EXTFS_CONST) $(EXTFS_OUT); do \
- $(RMF) $(DESTDIR)$(libdir)/extfs/$$I; \
+ $(RMF) $(DESTDIR)$(extfsdir)/$$I; \
done
- -rmdir $(DESTDIR)$(libdir)/extfs
+ -rmdir $(DESTDIR)$(extfsdir)
-$(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcserv
distcopy:
diff -ruN old/mc-4.5.27/vfs/extfs/extfs.ini new/mc-4.5.28/vfs/extfs/extfs.ini
--- old/mc-4.5.27/vfs/extfs/extfs.ini Thu Mar 18 20:42:27 1999
+++ new/mc-4.5.28/vfs/extfs/extfs.ini Fri Mar 26 15:30:39 1999
@@ -5,6 +5,7 @@
uzoo
ulha
urar
+uha
# For arj usage you need special patch to unarj
uarj
diff -ruN old/mc-4.5.27/vfs/extfs/uha.in new/mc-4.5.28/vfs/extfs/uha.in
--- old/mc-4.5.27/vfs/extfs/uha.in Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.28/vfs/extfs/uha.in Fri Mar 26 15:30:39 1999
@@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# It is the uhafs Valery Kornienkov vlk@st.simbirsk.su 2:5051/30@fidonet
+# ver ? :)
+
+HA=ha # for HA 0.999 Copyright (c) 1995 Harri Hirvola
+ # Source: ftp://sunsite.unc.edu/pub/Linux/compress/ha0999p-linux.tar.gz
+
+mchafs_list ()
+{
+ eval $HA lf $1 2>/dev/null |@AWK@ -v uid=${UID-0} '
+{ date="JanFebMarAprMayJunJulAugSepOctNovDec" }
+/^===========/ {next}
+{
+ if ($5="%" && $8~/DIR|ASC|CPY/) {
+ split($6, a, "-")
+ split($7, t, ":")
+ filename=$1
+ filesize=$2
+ getline
+ if ($2=="(none)") $2=""
+ path=$2
+ getline
+ if ($1~/^d.*/) next
+ printf "%s %s %-8d %-8d %8d %3s %2d %4d %s:%s %s%s \n",\
+ $1,1,0,0,filesize, substr(date,(a[2]-1)*3+1,3),a[3],a[1],t[1],t[2],\
+ path,filename
+ }
+}' 2>/dev/null
+}
+
+mchafs_copyout ()
+{
+ cd /tmp
+ eval $HA xy $1 $2 >/dev/null 2>&1
+ mv -f $2 $3
+}
+
+case "$1" in
+ list) shift; mchafs_list $1; exit 0;;
+ copyout) shift; mchafs_copyout $1 $2 $3; exit 0;;
+esac
+exit 1
diff -ruN old/mc-4.5.27/vfs/extfs.c new/mc-4.5.28/vfs/extfs.c
--- old/mc-4.5.27/vfs/extfs.c Thu Mar 18 20:42:27 1999
+++ new/mc-4.5.28/vfs/extfs.c Fri Mar 26 15:30:38 1999
@@ -916,11 +916,15 @@
if (*key == '#')
continue;
- if ((c = strchr( key, '\n')))
+ if ((c = strchr (key, '\n'))){
*c = 0;
- c = &key [strlen (key)-1];
+ c = &key [strlen (key)-1];
+ } else {
+ c = &key;
+ }
extfs_need_archive [extfs_no] = !(*c==':');
- if (*c==':') *c = 0;
+ if (*c==':')
+ *c = 0;
if (!(*key))
continue;
diff -ruN old/mc-4.5.27/vfs/ftpfs.c new/mc-4.5.28/vfs/ftpfs.c
--- old/mc-4.5.27/vfs/ftpfs.c Thu Mar 18 20:42:27 1999
+++ new/mc-4.5.28/vfs/ftpfs.c Fri Mar 26 15:30:38 1999
@@ -323,7 +323,7 @@
struct connection *bucket = data;
if (qsock (bucket) != -1){
- print_vfs_message ("ftpfs: Disconnecting from %s", qhost (bucket));
+ print_vfs_message (_("ftpfs: Disconnecting from %s"), qhost (bucket));
command(bucket, NONE, "QUIT");
close(qsock(bucket));
}
@@ -374,7 +374,7 @@
char *p;
if (!bucket->password){
- p = g_strconcat (" FTP: Password required for ", quser (bucket),
+ p = g_strconcat (_(" FTP: Password required for "), quser (bucket),
" ", NULL);
op = vfs_get_password (p);
g_free (p);
@@ -406,7 +406,7 @@
g_free (host);
if (proxypass)
wipe_password (proxypass);
- p = g_strconcat (" Proxy: Password required for ", proxyname, " ",
+ p = g_strconcat (_(" Proxy: Password required for "), proxyname, " ",
NULL);
proxypass = vfs_get_password (p);
g_free (p);
@@ -432,19 +432,19 @@
}
#if defined(HSC_PROXY)
if (qproxy (bucket)){
- print_vfs_message ("ftpfs: sending proxy login name");
+ print_vfs_message (_("ftpfs: sending proxy login name"));
if (command (bucket, 1, "USER %s", proxyname) != CONTINUE)
goto proxyfail;
- print_vfs_message ("ftpfs: sending proxy user password");
+ print_vfs_message (_("ftpfs: sending proxy user password"));
if (command (bucket, 1, "PASS %s", proxypass) != COMPLETE)
goto proxyfail;
- print_vfs_message ("ftpfs: proxy authentication succeeded");
+ print_vfs_message (_("ftpfs: proxy authentication succeeded"));
if (command (bucket, 1, "SITE %s", qhost (bucket)+1) != COMPLETE)
goto proxyfail;
- print_vfs_message ("ftpfs: connected to %s", qhost (bucket)+1);
+ print_vfs_message (_("ftpfs: connected to %s"), qhost (bucket)+1);
if (0) {
proxyfail:
bucket->failed_on_login = 1;
@@ -461,17 +461,17 @@
g_free (proxyname);
}
#endif
- print_vfs_message ("ftpfs: sending login name");
+ print_vfs_message (_("ftpfs: sending login name"));
code = command (bucket, WAIT_REPLY, "USER %s", name);
switch (code){
case CONTINUE:
- print_vfs_message ("ftpfs: sending user password");
+ print_vfs_message (_("ftpfs: sending user password"));
if (command (bucket, WAIT_REPLY, "PASS %s", pass) != COMPLETE)
break;
case COMPLETE:
- print_vfs_message ("ftpfs: logged in");
+ print_vfs_message (_("ftpfs: logged in"));
wipe_password (pass);
g_free (name);
return 1;
@@ -486,7 +486,7 @@
goto login_fail;
}
}
- print_vfs_message ("ftpfs: Login incorrect for user %s ", quser (bucket));
+ print_vfs_message (_("ftpfs: Login incorrect for user %s "), quser (bucket));
login_fail:
wipe_password (pass);
g_free (name);
@@ -647,7 +647,7 @@
host = qhost (bucket);
if (!host || !*host){
- print_vfs_message ("ftpfs: Invalid host name.");
+ print_vfs_message (_("ftpfs: Invalid host name."));
my_errno = EINVAL;
return -1;
}
@@ -667,7 +667,7 @@
else {
hp = gethostbyname (host);
if (hp == NULL){
- print_vfs_message ("ftpfs: Invalid host address.");
+ print_vfs_message (_("ftpfs: Invalid host address."));
my_errno = EINVAL;
if (free_host)
g_free (host);
@@ -692,7 +692,7 @@
}
setup_source_route (my_socket, server_address.sin_addr.s_addr);
- print_vfs_message ("ftpfs: making connection to %s", host);
+ print_vfs_message (_("ftpfs: making connection to %s"), host);
if (free_host)
g_free (host);
@@ -702,9 +702,9 @@
sizeof (server_address)) < 0){
my_errno = errno;
if (errno == EINTR && got_interrupt ())
- print_vfs_message ("ftpfs: connection interrupted by user");
+ print_vfs_message (_("ftpfs: connection interrupted by user"));
else
- print_vfs_message ("ftpfs: connection to server failed: %s",
+ print_vfs_message (_("ftpfs: connection to server failed: %s"),
unix_error_string(errno));
disable_interrupt_key();
close (my_socket);
@@ -788,7 +788,7 @@
retry_seconds = ftpfs_retry_seconds;
enable_interrupt_key ();
for (count_down = retry_seconds; count_down; count_down--){
- print_vfs_message ("Waiting to retry... %d (Control-C to cancel)", count_down);
+ print_vfs_message (_("Waiting to retry... %d (Control-C to cancel)"), count_down);
sleep (1);
if (got_interrupt ()){
/* my_errno = E; */
@@ -982,7 +982,7 @@
if ((c = setup_passive (data, bucket, &data_addr)))
return data;
- print_vfs_message("ftpfs: could not setup passive mode for source routing");
+ print_vfs_message(_("ftpfs: could not setup passive mode for source routing"));
bucket->use_source_route = 0;
}
#else
@@ -992,7 +992,7 @@
bucket->use_source_route = 0;
bucket->use_passive_connection = 0;
- print_vfs_message ("ftpfs: could not setup passive mode");
+ print_vfs_message (_("ftpfs: could not setup passive mode"));
}
#endif
/* If passive setup fails, fallback to active connections */
@@ -1063,14 +1063,14 @@
fd_set mask;
char buf[1024];
- print_vfs_message("ftpfs: aborting transfer.");
+ print_vfs_message(_("ftpfs: aborting transfer."));
if (send(qsock(bucket), ipbuf, sizeof(ipbuf), MSG_OOB) != sizeof(ipbuf)) {
- print_vfs_message("ftpfs: abort error: %s", unix_error_string(errno));
+ print_vfs_message(_("ftpfs: abort error: %s"), unix_error_string(errno));
return;
}
if (command(bucket, NONE, "%cABOR", DM) != COMPLETE){
- print_vfs_message ("ftpfs: abort failed");
+ print_vfs_message (_("ftpfs: abort failed"));
return;
}
if (dsock != -1) {
@@ -1156,7 +1156,7 @@
dir->symlink_status = FTPFS_RESOLVED_SYMLINKS;
if (strchr (dir->remote_path, ' ')) {
if (ftpfs_chdir_internal (bucket, dir->remote_path) != COMPLETE) {
- print_vfs_message("ftpfs: CWD failed.");
+ print_vfs_message(_("ftpfs: CWD failed."));
return;
}
sock = open_data_connection (bucket, "LIST -lLa", ".", TYPE_ASCII, 0);
@@ -1166,14 +1166,14 @@
dir->remote_path, TYPE_ASCII, 0);
if (sock == -1) {
- print_vfs_message("ftpfs: couldn't resolve symlink");
+ print_vfs_message(_("ftpfs: couldn't resolve symlink"));
return;
}
fp = fdopen(sock, "r");
if (fp == NULL) {
close(sock);
- print_vfs_message("ftpfs: couldn't resolve symlink");
+ print_vfs_message(_("ftpfs: couldn't resolve symlink"));
return;
}
enable_interrupt_key();
@@ -1218,7 +1218,7 @@
static void
resolve_symlink(struct connection *bucket, struct dir *dir)
{
- print_vfs_message("Resolving symlink...");
+ print_vfs_message(_("Resolving symlink..."));
if (bucket->strict_rfc959_list_cmd)
resolve_symlink_without_ls_options(bucket, dir);
@@ -1321,16 +1321,16 @@
has_symlinks = 0;
if (bucket->strict_rfc959_list_cmd)
- print_vfs_message("ftpfs: Reading FTP directory %s... (don't use UNIX ls options)", remote_path);
+ print_vfs_message(_("ftpfs: Reading FTP directory %s... (don't use UNIX ls options)"), remote_path);
else
- print_vfs_message("ftpfs: Reading FTP directory %s...", remote_path);
+ print_vfs_message(_("ftpfs: Reading FTP directory %s..."), remote_path);
if (has_spaces || bucket->strict_rfc959_list_cmd || ftpfs_first_cd_then_ls) {
char *p;
p = translate_path (bucket, remote_path);
if (ftpfs_chdir_internal (bucket, p) != COMPLETE) {
my_errno = ENOENT;
- print_vfs_message("ftpfs: CWD failed.");
+ print_vfs_message(_("ftpfs: CWD failed."));
return NULL;
}
}
@@ -1342,7 +1342,7 @@
if (dcache == NULL) {
my_errno = ENOMEM;
linklist_destroy(file_list, NULL);
- print_vfs_message("ftpfs: FAIL");
+ print_vfs_message(_("ftpfs: FAIL"));
return NULL;
}
gettimeofday(&dcache->timestamp, NULL);
@@ -1433,7 +1433,7 @@
}
if (got_intr){
disable_interrupt_key();
- print_vfs_message("ftpfs: reading FTP directory interrupt by user");
+ print_vfs_message(_("ftpfs: reading FTP directory interrupt by user"));
#ifdef OLD_READ
my_abort(bucket, fileno(fp));
#else
@@ -1462,7 +1462,7 @@
else
dcache->symlink_status = FTPFS_UNRESOLVED_SYMLINKS;
}
- print_vfs_message("ftpfs: got listing");
+ print_vfs_message(_("ftpfs: got listing"));
return dcache;
error_1:
disable_interrupt_key();
@@ -1475,7 +1475,7 @@
g_free(dcache->remote_path);
g_free(dcache);
linklist_destroy(file_list, direntry_destructor);
- print_vfs_message("ftpfs: failed");
+ print_vfs_message(_("ftpfs: failed"));
return NULL;
fallback:
@@ -1492,7 +1492,7 @@
g_free(dcache->remote_path);
g_free(dcache);
linklist_destroy(file_list, direntry_destructor);
- print_vfs_message("ftpfs: failed; nowhere to fallback to");
+ print_vfs_message(_("ftpfs: failed; nowhere to fallback to"));
return NULL;
}
@@ -1556,7 +1556,7 @@
goto error_return;
}
total += n;
- print_vfs_message("ftpfs: storing file %d (%d)",
+ print_vfs_message(_("ftpfs: storing file %d (%d)"),
total, s.st_size);
}
disable_interrupt_key();