From: Chris Allegretta <chrisa@asty.org>
Date: Tue, 1 May 2001 11:27:43 +0000 (+0000)
Subject: Commit the rest of the stuff backing down gettext changed *shrug*
X-Git-Tag: v1.1.0~66
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=09898d99d4a80a8f641b1f3e2723385c141879f6;p=nano.git

Commit the rest of the stuff backing down gettext changed *shrug*


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@632 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---

diff --git a/Makefile.in b/Makefile.in
index 3ab80dd9..e4498f52 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -57,24 +57,24 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CURSES_LIB = @CURSES_LIB@
 DATADIRNAME = @DATADIRNAME@
+GENCAT = @GENCAT@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_CONFIG = @GLIB_CONFIG@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-INTLBISON = @INTLBISON@
+GT_NO = @GT_NO@
+GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTOBJEXT = @INSTOBJEXT@
+INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-LIBICONV = @LIBICONV@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@
@@ -84,6 +84,7 @@ RANLIB = @RANLIB@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+l = @l@
 
 bin_PROGRAMS = nano
 nano_SOURCES = color.c 		cut.c 		files.c 		global.c 		move.c 		nano.c 		nano.h 		proto.h 		rcfile.c 		search.c 		utils.c 		winio.c 
diff --git a/aclocal.m4 b/aclocal.m4
index fbd0f506..efced845 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -125,24 +125,6 @@ for am_file in <<$1>>; do
 done<<>>dnl>>)
 changequote([,]))])
 
-#serial 1
-# This test replaces the one in autoconf.
-# Currently this macro should have the same name as the autoconf macro
-# because gettext's gettext.m4 (distributed in the automake package)
-# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
-# give these diagnostics:
-#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
-#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
-
-undefine([AC_ISC_POSIX])
-
-AC_DEFUN([AC_ISC_POSIX],
-  [
-    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-  ]
-)
-
 # Configure paths for GLIB
 # Owen Taylor     97-11-3
 
@@ -348,37 +330,9 @@ main ()
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
 
-# serial 9
-
-dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]).
-dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library
-dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-dnl    depending on --{enable,disable}-{shared,static} and on the presence of
-dnl    AM-DISABLE-SHARED). Otherwise, a static library
-dnl    $(top_builddir)/intl/libintl.a will be created.
-dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-dnl    implementations (in libc or libintl) without the ngettext() function
-dnl    will be ignored.
-dnl LIBDIR is used to find the intl libraries.  If empty,
-dnl    the value `$(top_builddir)/intl/' is used.
-dnl
-dnl The result of the configuration is one of three cases:
-dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-dnl    and used.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 2) GNU gettext has been found in the system's C library.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 3) No internationalization, always use English msgid.
-dnl    Catalog format: none
-dnl    Catalog extension: none
-dnl The use of .gmo is historical (it was needed to avoid overwriting the
-dnl GNU format catalogs when building on a platform with an X/Open gettext),
-dnl but we keep it in order not to force irrelevant filename changes on the
-dnl maintainers.
-dnl
-AC_DEFUN([AM_WITH_NLS],
+# serial 5
+
+AC_DEFUN(AM_WITH_NLS,
   [AC_MSG_CHECKING([whether NLS is requested])
     dnl Default is enabled NLS
     AC_ARG_ENABLE(nls,
@@ -387,14 +341,11 @@ AC_DEFUN([AM_WITH_NLS],
     AC_MSG_RESULT($USE_NLS)
     AC_SUBST(USE_NLS)
 
-    BUILD_INCLUDED_LIBINTL=no
     USE_INCLUDED_LIBINTL=no
 
     dnl If we use NLS figure out what method
     if test "$USE_NLS" = "yes"; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        [Define to 1 if translation of program messages to the user's native language
-   is requested.])
+      AC_DEFINE(ENABLE_NLS)
       AC_MSG_CHECKING([whether included gettext is requested])
       AC_ARG_WITH(included-gettext,
         [  --with-included-gettext use the GNU gettext library included here],
@@ -405,58 +356,86 @@ AC_DEFUN([AM_WITH_NLS],
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
         dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If GNU gettext is available we use this.  Else we have
-        dnl to fall back to GNU NLS library.
+        dnl to use.  If gettext or catgets are available (in this order) we
+        dnl use this.  Else we have to fall back to GNU NLS library.
+	dnl catgets is only used if permitted by option --with-catgets.
+	nls_cv_header_intl=
+	nls_cv_header_libgt=
 	CATOBJEXT=NONE
 
-        dnl Add a version number to the cache macros.
-        define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc])
-        define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl])
-
 	AC_CHECK_HEADER(libintl.h,
-	  [AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-	    [AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;],
-	       [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
-	       gt_cv_func_gnugettext_libc=yes,
-	       gt_cv_func_gnugettext_libc=no)])
-
-	   if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-	     AC_CACHE_CHECK([for GNU gettext in libintl],
-	       gt_cv_func_gnugettext_libintl,
-	       [gt_save_LIBS="$LIBS"
-		LIBS="$LIBS -lintl"
-		AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;],
-		  [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
-		  gt_cv_func_gnugettext_libintl=yes,
-		  gt_cv_func_gnugettext_libintl=no)
-		LIBS="$gt_save_LIBS"])
+	  [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
+	    [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
+	       gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
+
+	   if test "$gt_cv_func_gettext_libc" != "yes"; then
+	     AC_CHECK_LIB(intl, bindtextdomain,
+	       [AC_CACHE_CHECK([for gettext in libintl],
+		 gt_cv_func_gettext_libintl,
+		 [AC_CHECK_LIB(intl, gettext,
+		  gt_cv_func_gettext_libintl=yes,
+		  gt_cv_func_gettext_libintl=no)],
+		 gt_cv_func_gettext_libintl=no)])
 	   fi
 
-	   if test "$gt_cv_func_gnugettext_libc" = "yes" \
-	      || test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-	     AC_DEFINE(HAVE_GETTEXT, 1,
-               [Define if the GNU gettext() function is already present or preinstalled.])
-	     AC_CHECK_FUNCS(dcgettext)
-	     AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	       [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-	     if test "$MSGFMT" != "no"; then
-	       AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-	     fi
-	     AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-	       [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-	     CATOBJEXT=.gmo
-	     if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-	       INTLLIBS="-lintl"
-	     fi
-	   fi
+	   if test "$gt_cv_func_gettext_libc" = "yes" \
+	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
+	      AC_DEFINE(HAVE_GETTEXT)
+	      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+		[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+	      if test "$MSGFMT" != "no"; then
+		AC_CHECK_FUNCS(dcgettext)
+		AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+		AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+		  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+		AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+			       return _nl_msg_cat_cntr],
+		  [CATOBJEXT=.gmo
+		   DATADIRNAME=share],
+		  [CATOBJEXT=.mo
+		   DATADIRNAME=lib])
+		INSTOBJEXT=.mo
+	      fi
+	    fi
 	])
 
         if test "$CATOBJEXT" = "NONE"; then
-	  dnl GNU gettext is not found in the C library.
+	  AC_MSG_CHECKING([whether catgets can be used])
+	  AC_ARG_WITH(catgets,
+	    [  --with-catgets          use catgets functions if available],
+	    nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
+	  AC_MSG_RESULT($nls_cv_use_catgets)
+
+	  if test "$nls_cv_use_catgets" = "yes"; then
+	    dnl No gettext in C library.  Try catgets next.
+	    AC_CHECK_LIB(i, main)
+	    AC_CHECK_FUNC(catgets,
+	      [AC_DEFINE(HAVE_CATGETS)
+	       INTLOBJS="\$(CATOBJS)"
+	       AC_PATH_PROG(GENCAT, gencat, no)dnl
+	       if test "$GENCAT" != "no"; then
+		 AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
+		 if test "$GMSGFMT" = "no"; then
+		   AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
+		    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
+		 fi
+		 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+		   [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+		 USE_INCLUDED_LIBINTL=yes
+		 CATOBJEXT=.cat
+		 INSTOBJEXT=.cat
+		 DATADIRNAME=lib
+		 INTLDEPS='$(top_builddir)/intl/libintl.a'
+		 INTLLIBS=$INTLDEPS
+		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+		 nls_cv_header_intl=intl/libintl.h
+		 nls_cv_header_libgt=intl/libgettext.h
+	       fi])
+	  fi
+        fi
+
+        if test "$CATOBJEXT" = "NONE"; then
+	  dnl Neither gettext nor catgets in included in the C library.
 	  dnl Fall back on GNU gettext library.
 	  nls_cv_use_gnu_gettext=yes
         fi
@@ -471,17 +450,15 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
         AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
 	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
         AC_SUBST(MSGFMT)
-	BUILD_INCLUDED_LIBINTL=yes
 	USE_INCLUDED_LIBINTL=yes
         CATOBJEXT=.gmo
-	INTLLIBS='ifelse([$3],[],$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a'
-	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
-
-      dnl If iconv() is in a separate libiconv library, then anyone linking
-      dnl with libintl{.a,.so} also needs to link with libiconv.
-      if test -n "$LIBICONV" && test -n "$INTLLIBS"; then
-        INTLLIBS="$INTLLIBS $LIBICONV"
+        INSTOBJEXT=.mo
+        DATADIRNAME=share
+	INTLDEPS='$(top_builddir)/intl/libintl.a'
+	INTLLIBS=$INTLDEPS
+	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+        nls_cv_header_intl=intl/libintl.h
+        nls_cv_header_libgt=intl/libgettext.h
       fi
 
       dnl Test whether we really found GNU xgettext.
@@ -497,51 +474,25 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
 	fi
       fi
 
-      dnl We need to process the po/ directory.
+      # We need to process the po/ directory.
       POSUB=po
+    else
+      DATADIRNAME=share
+      nls_cv_header_intl=intl/libintl.h
+      nls_cv_header_libgt=intl/libgettext.h
     fi
+    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
     AC_OUTPUT_COMMANDS(
-     [case " "$CONFIG_FILES" " in *" po/Makefile.in "* | *" po/Makefile.in:"*)
+     [case "$CONFIG_FILES" in *po/Makefile.in*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-        ;;
       esac])
 
 
-    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-    dnl to 'yes' because some of the testsuite requires it.
+    # If this is used in GNU gettext we have to set USE_NLS to `yes'
+    # because some of the sources are only built for this goal.
     if test "$PACKAGE" = gettext; then
-      BUILD_INCLUDED_LIBINTL=yes
-    fi
-
-    dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-    dnl because plural.y uses bison specific features. It requires at least
-    dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-    dnl compile.
-    dnl bison is only needed for the maintainer (who touches plural.y). But in
-    dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-    dnl the rule in general Makefile. Now, some people carelessly touch the
-    dnl files or have a broken "make" program, hence the plural.c rule will
-    dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-    dnl present or too old.
-    AC_CHECK_PROGS([INTLBISON], [bison])
-    if test -z "$INTLBISON"; then
-      ac_verc_fail=yes
-    else
-      dnl Found it, now check the version.
-      AC_MSG_CHECKING([version of bison])
-changequote(<<,>>)dnl
-      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-      case $ac_prog_version in
-        '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-        1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-changequote([,])dnl
-           ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-        *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-      esac
-      AC_MSG_RESULT([$ac_prog_version])
-    fi
-    if test $ac_verc_fail = yes; then
-      INTLBISON=:
+      USE_NLS=yes
+      USE_INCLUDED_LIBINTL=yes
     fi
 
     dnl These rules are solely for the distribution goal.  While doing this
@@ -553,30 +504,22 @@ changequote([,])dnl
     done
 
     dnl Make all variables we use known to autoconf.
-    AC_SUBST(BUILD_INCLUDED_LIBINTL)
     AC_SUBST(USE_INCLUDED_LIBINTL)
     AC_SUBST(CATALOGS)
     AC_SUBST(CATOBJEXT)
+    AC_SUBST(DATADIRNAME)
     AC_SUBST(GMOFILES)
+    AC_SUBST(INSTOBJEXT)
+    AC_SUBST(INTLDEPS)
     AC_SUBST(INTLLIBS)
     AC_SUBST(INTLOBJS)
     AC_SUBST(POFILES)
     AC_SUBST(POSUB)
-
-    dnl For backward compatibility. Some configure.ins may be using this.
-    nls_cv_header_intl=
-    nls_cv_header_libgt=
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    DATADIRNAME=share
-    AC_SUBST(DATADIRNAME)
   ])
 
-dnl Usage: Just like AM_WITH_NLS, which see.
-AC_DEFUN([AM_GNU_GETTEXT],
+AC_DEFUN(AM_GNU_GETTEXT,
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
    AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_CANONICAL_HOST])dnl
    AC_REQUIRE([AC_PROG_RANLIB])dnl
    AC_REQUIRE([AC_ISC_POSIX])dnl
    AC_REQUIRE([AC_HEADER_STDC])dnl
@@ -587,16 +530,20 @@ AC_DEFUN([AM_GNU_GETTEXT],
    AC_REQUIRE([AC_FUNC_ALLOCA])dnl
    AC_REQUIRE([AC_FUNC_MMAP])dnl
 
-   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-stdlib.h string.h unistd.h sys/param.h])
-   AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd mempcpy munmap putenv \
-setenv setlocale stpcpy strchr strcasecmp strdup tsearch \
-__argz_count __argz_stringify __argz_next])
+   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
+unistd.h sys/param.h])
+   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
+strdup __argz_count __argz_stringify __argz_next])
+
+   if test "${ac_cv_func_stpcpy+set}" != "set"; then
+     AC_CHECK_FUNCS(stpcpy)
+   fi
+   if test "${ac_cv_func_stpcpy}" = "yes"; then
+     AC_DEFINE(HAVE_STPCPY)
+   fi
 
-   AM_ICONV
-   AM_LANGINFO_CODESET
    AM_LC_MESSAGES
-   AM_WITH_NLS([$1],[$2],[$3])
+   AM_WITH_NLS
 
    if test "x$CATOBJEXT" != "x"; then
      if test "x$ALL_LINGUAS" = "x"; then
@@ -604,21 +551,10 @@ __argz_count __argz_stringify __argz_next])
      else
        AC_MSG_CHECKING(for catalogs to be installed)
        NEW_LINGUAS=
-       for presentlang in $ALL_LINGUAS; do
-         useit=no
-         for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do
-           # Use the presentlang catalog if desiredlang is
-           #   a. equal to presentlang, or
-           #   b. a variant of presentlang (because in this case,
-           #      presentlang can be used as a fallback for messages
-           #      which are not translated in the desiredlang catalog).
-           case "$desiredlang" in
-             "$presentlang"*) useit=yes;;
-           esac
-         done
-         if test $useit = yes; then
-           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-         fi
+       for lang in ${LINGUAS=$ALL_LINGUAS}; do
+         case "$ALL_LINGUAS" in
+          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
+         esac
        done
        LINGUAS=$NEW_LINGUAS
        AC_MSG_RESULT($LINGUAS)
@@ -630,8 +566,47 @@ __argz_count __argz_stringify __argz_next])
      fi
    fi
 
+   dnl The reference to <locale.h> in the installed <libintl.h> file
+   dnl must be resolved because we cannot expect the users of this
+   dnl to define HAVE_LOCALE_H.
+   if test $ac_cv_header_locale_h = yes; then
+     INCLUDE_LOCALE_H="#include <locale.h>"
+   else
+     INCLUDE_LOCALE_H="\
+/* The system does not provide the header <locale.h>.  Take care yourself.  */"
+   fi
+   AC_SUBST(INCLUDE_LOCALE_H)
+
+   dnl Determine which catalog format we have (if any is needed)
+   dnl For now we know about two different formats:
+   dnl   Linux libc-5 and the normal X/Open format
+   test -d intl || mkdir intl
+   if test "$CATOBJEXT" = ".cat"; then
+     AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
+
+     dnl Transform the SED scripts while copying because some dumb SEDs
+     dnl cannot handle comments.
+     sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
+   fi
+   dnl po2tbl.sed is always needed.
+   sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
+     $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
+
+   dnl In the intl/Makefile.in we have a special dependency which makes
+   dnl only sense for gettext.  We comment this out for non-gettext
+   dnl packages.
+   if test "$PACKAGE" = "gettext"; then
+     GT_NO="#NO#"
+     GT_YES=
+   else
+     GT_NO=
+     GT_YES="#YES#"
+   fi
+   AC_SUBST(GT_NO)
+   AC_SUBST(GT_YES)
+
    dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-   dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
+   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
    dnl Try to locate is.
    MKINSTALLDIRS=
    if test -n "$ac_aux_dir"; then
@@ -642,28 +617,25 @@ __argz_count __argz_stringify __argz_next])
    fi
    AC_SUBST(MKINSTALLDIRS)
 
-   dnl Enable libtool support if the surrounding package wishes it.
-   INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], [])
-   AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
+   dnl *** For now the libtool support in intl/Makefile is not for real.
+   l=
+   AC_SUBST(l)
 
    dnl Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.  But only do this if the po directory
-   dnl exists in srcdir.
-   if test -d $srcdir/po; then
-      test -d po || mkdir po
-      if test "x$srcdir" != "x."; then
-	if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-	  posrcprefix="$srcdir/"
-   	else
-      	  posrcprefix="../$srcdir/"
-      	fi
-      else
-      	posrcprefix="../"
-      fi
-      rm -f po/POTFILES
-      sed -e "/^#/d" -e "/^\$/d" -e "s,.*,     $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-       	< $srcdir/po/POTFILES.in > po/POTFILES
+   dnl be included in po/Makefile.
+   test -d po || mkdir po
+   if test "x$srcdir" != "x."; then
+     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+       posrcprefix="$srcdir/"
+     else
+       posrcprefix="../$srcdir/"
+     fi
+   else
+     posrcprefix="../"
    fi
+   rm -f po/POTFILES
+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+	< $srcdir/po/POTFILES.in > po/POTFILES
   ])
 
 # Search path for a program which passes the given test.
@@ -678,7 +650,7 @@ __argz_count __argz_stringify __argz_next])
 
 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
 dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
+AC_DEFUN(AM_PATH_PROG_WITH_TEST,
 [# Extract the first word of "$2", so it can be a program name with args.
 set dummy $2; ac_word=[$]2
 AC_MSG_CHECKING([for $ac_word])
@@ -714,85 +686,6 @@ fi
 AC_SUBST($1)dnl
 ])
 
-#serial AM1
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_ICONV],
-[
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-      [iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);],
-      am_cv_func_iconv=yes)
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS -liconv"
-      AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
-        am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes)
-      LIBS="$am_save_LIBS"
-    fi
-  ])
-  if test "$am_cv_func_iconv" = yes; then
-    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
-    AC_MSG_CHECKING([for iconv declaration])
-    AC_CACHE_VAL(am_cv_proto_iconv, [
-      AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([$]{ac_t:-
-         }[$]am_cv_proto_iconv)
-    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
-      [Define as const if the declaration of iconv() needs const.])
-  fi
-  LIBICONV=
-  if test "$am_cv_lib_iconv" = yes; then
-    LIBICONV="-liconv"
-  fi
-  AC_SUBST(LIBICONV)
-])
-
-#serial AM1
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_LANGINFO_CODESET],
-[
-  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
-    [AC_TRY_LINK([#include <langinfo.h>],
-      [char* cs = nl_langinfo(CODESET);],
-      am_cv_langinfo_codeset=yes,
-      am_cv_langinfo_codeset=no)
-    ])
-  if test $am_cv_langinfo_codeset = yes; then
-    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-  fi
-])
-
 # Check whether LC_MESSAGES is available in <locale.h>.
 # Ulrich Drepper <drepper@cygnus.com>, 1995.
 #
@@ -801,16 +694,15 @@ AC_DEFUN([AM_LANGINFO_CODESET],
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
 
-# serial 2
+# serial 1
 
-AC_DEFUN([AM_LC_MESSAGES],
+AC_DEFUN(AM_LC_MESSAGES,
   [if test $ac_cv_header_locale_h = yes; then
     AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
       [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
        am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
     if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES, 1,
-        [Define if your <locale.h> file defines LC_MESSAGES.])
+      AC_DEFINE(HAVE_LC_MESSAGES)
     fi
   fi])
 
diff --git a/config.h.in b/config.h.in
index a49aeb29..fb264c00 100644
--- a/config.h.in
+++ b/config.h.in
@@ -31,6 +31,9 @@
 /* Define to `long' if <sys/types.h> doesn't define.  */
 #undef off_t
 
+/* Define if you need to in order for stat and other things to work.  */
+#undef _POSIX_SOURCE
+
 /* Define as the return type of signal handlers (int or void).  */
 #undef RETSIGTYPE
 
@@ -58,6 +61,21 @@
 /* Define this if your curses lib has the _use_keypad flag */
 #undef HAVE_USEKEYPAD
 
+/* Define this if you have NLS */
+#undef ENABLE_NLS
+
+/* Define this is you have the catgets command */
+#undef HAVE_CATGETS
+
+/* Define this is you have GNU gettext */
+#undef HAVE_GETTEXT
+
+/* Define this for HAVE_LC_MESSAGES */
+#undef HAVE_LC_MESSAGES
+
+/* Define this if you have the stpcpy function (cool) */
+#undef HAVE_STPCPY
+
 /* Define this to make the nano executable as small as possible */
 #undef NANO_SMALL
 
@@ -109,12 +127,6 @@
 /* Define if you have the dcgettext function.  */
 #undef HAVE_DCGETTEXT
 
-/* Define if you have the feof_unlocked function.  */
-#undef HAVE_FEOF_UNLOCKED
-
-/* Define if you have the fgets_unlocked function.  */
-#undef HAVE_FGETS_UNLOCKED
-
 /* Define if you have the getcwd function.  */
 #undef HAVE_GETCWD
 
@@ -124,9 +136,6 @@
 /* Define if you have the getpagesize function.  */
 #undef HAVE_GETPAGESIZE
 
-/* Define if you have the mempcpy function.  */
-#undef HAVE_MEMPCPY
-
 /* Define if you have the munmap function.  */
 #undef HAVE_MUNMAP
 
@@ -154,9 +163,6 @@
 /* Define if you have the strdup function.  */
 #undef HAVE_STRDUP
 
-/* Define if you have the tsearch function.  */
-#undef HAVE_TSEARCH
-
 /* Define if you have the vsnprintf function.  */
 #undef HAVE_VSNPRINTF
 
@@ -190,12 +196,6 @@
 /* Define if you have the <regex.h> header file.  */
 #undef HAVE_REGEX_H
 
-/* Define if you have the <stddef.h> header file.  */
-#undef HAVE_STDDEF_H
-
-/* Define if you have the <stdlib.h> header file.  */
-#undef HAVE_STDLIB_H
-
 /* Define if you have the <string.h> header file.  */
 #undef HAVE_STRING_H
 
@@ -211,28 +211,12 @@
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
 
+/* Define if you have the i library (-li).  */
+#undef HAVE_LIBI
+
 /* Name of package */
 #undef PACKAGE
 
 /* Version number of package */
 #undef VERSION
 
-/* Define if you have the iconv() function. */
-#undef HAVE_ICONV
-
-/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
-
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#undef HAVE_LANGINFO_CODESET
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#undef HAVE_LC_MESSAGES
-
-/* Define to 1 if translation of program messages to the user's native language
-   is requested. */
-#undef ENABLE_NLS
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#undef HAVE_GETTEXT
-
diff --git a/configure b/configure
index 7e96ca26..bfa16a93 100755
--- a/configure
+++ b/configure
@@ -48,6 +48,8 @@ ac_help="$ac_help
   --disable-nls           do not use Native Language Support"
 ac_help="$ac_help
   --with-included-gettext use the GNU gettext library included here"
+ac_help="$ac_help
+  --with-catgets          use catgets functions if available"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -589,7 +591,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:593: checking for a BSD compatible install" >&5
+echo "configure:595: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -642,7 +644,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:646: checking whether build environment is sane" >&5
+echo "configure:648: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -699,7 +701,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:703: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:705: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -745,7 +747,7 @@ EOF
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:749: checking for working aclocal" >&5
+echo "configure:751: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -758,7 +760,7 @@ else
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:762: checking for working autoconf" >&5
+echo "configure:764: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -771,7 +773,7 @@ else
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:775: checking for working automake" >&5
+echo "configure:777: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -784,7 +786,7 @@ else
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:788: checking for working autoheader" >&5
+echo "configure:790: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -797,7 +799,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:801: checking for working makeinfo" >&5
+echo "configure:803: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -818,7 +820,7 @@ ALL_LINGUAS="es de fr it id fi hu ca cs gl"
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:822: checking for $ac_word" >&5
+echo "configure:824: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -848,7 +850,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:852: checking for $ac_word" >&5
+echo "configure:854: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -899,7 +901,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:903: checking for $ac_word" >&5
+echo "configure:905: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -931,7 +933,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:935: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:937: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -942,12 +944,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 946 "configure"
+#line 948 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -973,12 +975,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:977: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:979: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:982: checking whether we are using GNU C" >&5
+echo "configure:984: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -987,7 +989,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1006,7 +1008,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1010: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1012: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1037,52 +1039,30 @@ else
   fi
 fi
 
-
-        echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
-echo "configure:1043: checking for strerror in -lcposix" >&5
-ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lcposix  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1051 "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
-    builtin and then its argument prototype would still apply.  */
-char strerror();
-
-int main() {
-strerror()
-; return 0; }
+echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
+echo "configure:1044: checking for POSIXized ISC" >&5
+if test -d /etc/conf/kconfig.d &&
+  grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
+then
+  echo "$ac_t""yes" 1>&6
+  ISC=yes # If later tests want to check for ISC.
+  cat >> confdefs.h <<\EOF
+#define _POSIX_SOURCE 1
 EOF
-if { (eval echo configure:1062: \"$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
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
 
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LIBS="$LIBS -lcposix"
+  if test "$GCC" = yes; then
+    CC="$CC -posix"
+  else
+    CC="$CC -Xp"
+  fi
 else
   echo "$ac_t""no" 1>&6
+  ISC=
 fi
 
-  
-
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1086: checking how to run the C preprocessor" >&5
+echo "configure:1066: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1097,13 +1077,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1101 "configure"
+#line 1081 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1107: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1087: \"$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
   :
@@ -1114,13 +1094,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1118 "configure"
+#line 1098 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1104: \"$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
   :
@@ -1131,13 +1111,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1135 "configure"
+#line 1115 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1121: \"$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
   :
@@ -1162,12 +1142,12 @@ fi
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1166: checking for ANSI C header files" >&5
+echo "configure:1146: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1171 "configure"
+#line 1151 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1175,7 +1155,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1159: \"$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*
@@ -1192,7 +1172,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1196 "configure"
+#line 1176 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1210,7 +1190,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1214 "configure"
+#line 1194 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1231,7 +1211,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1235 "configure"
+#line 1215 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1242,7 +1222,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1269,17 +1249,17 @@ for ac_hdr in fcntl.h unistd.h malloc.h termios.h termio.h limits.h getopt.h reg
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1273: checking for $ac_hdr" >&5
+echo "configure:1253: 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 1278 "configure"
+#line 1258 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1263: \"$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*
@@ -1467,7 +1447,7 @@ fi
 
 
 echo $ac_n "checking whether to use slang""... $ac_c" 1>&6
-echo "configure:1471: checking whether to use slang" >&5
+echo "configure:1451: checking whether to use slang" >&5
 CURSES_LIB_NAME=""
 # Check whether --with-slang or --without-slang was given.
 if test "${with_slang+set}" = set; then
@@ -1487,17 +1467,17 @@ if test "${with_slang+set}" = set; then
 
 	ac_safe=`echo "slcurses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for slcurses.h""... $ac_c" 1>&6
-echo "configure:1491: checking for slcurses.h" >&5
+echo "configure:1471: checking for slcurses.h" >&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 1496 "configure"
+#line 1476 "configure"
 #include "confdefs.h"
 #include <slcurses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1481: \"$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*
@@ -1514,21 +1494,21 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for SLtt_initialize in -lslang""... $ac_c" 1>&6
-echo "configure:1518: checking for SLtt_initialize in -lslang" >&5
+echo "configure:1498: checking for SLtt_initialize in -lslang" >&5
 	    _libs=$LIBS
 	    LIBS="$LIBS -lslang"
 	    if test "$cross_compiling" = yes; then
   echo "configure: warning: *** Can not use slang when cross-compiling" 1>&2
 else
   cat > conftest.$ac_ext <<EOF
-#line 1525 "configure"
+#line 1505 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
 #include <slcurses.h>
 int main () { SLtt_initialize (NULL); return 0; }
 EOF
-if { (eval echo configure:1532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   echo "$ac_t""yes" 1>&6
 		cat >> confdefs.h <<\EOF
@@ -1551,7 +1531,7 @@ else
 		# We might need the term library
 		for termlib in ncurses curses termcap terminfo termlib; do
 		    echo $ac_n "checking for tputs in -l${termlib}""... $ac_c" 1>&6
-echo "configure:1555: checking for tputs in -l${termlib}" >&5
+echo "configure:1535: checking for tputs in -l${termlib}" >&5
 ac_lib_var=`echo ${termlib}'_'tputs | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1559,7 +1539,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l${termlib}  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1563 "configure"
+#line 1543 "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
@@ -1570,7 +1550,7 @@ int main() {
 tputs()
 ; return 0; }
 EOF
-if { (eval echo configure:1574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1554: \"$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
@@ -1594,20 +1574,20 @@ fi
 		done
 
 		echo $ac_n "checking for SLtt_initialize in -lslang $tcap""... $ac_c" 1>&6
-echo "configure:1598: checking for SLtt_initialize in -lslang $tcap" >&5
+echo "configure:1578: checking for SLtt_initialize in -lslang $tcap" >&5
 		LIBS="$LIBS $tcap"
 		if test "$cross_compiling" = yes; then
   echo "configure: warning: *** Can not use slang when cross-compiling" 1>&2
 else
   cat > conftest.$ac_ext <<EOF
-#line 1604 "configure"
+#line 1584 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
 #include <slcurses.h>
 int main () { SLtt_initialize (NULL); return 0; }
 EOF
-if { (eval echo configure:1611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   echo "$ac_t""yes" 1>&6
 		    cat >> confdefs.h <<\EOF
@@ -1629,20 +1609,20 @@ else
 		    echo "$ac_t""no" 1>&6
 		    # We might need the math library
 		    echo $ac_n "checking for SLtt_initialize in -lslang $tcap -lm""... $ac_c" 1>&6
-echo "configure:1633: checking for SLtt_initialize in -lslang $tcap -lm" >&5
+echo "configure:1613: checking for SLtt_initialize in -lslang $tcap -lm" >&5
 		    LIBS="$LIBS -lm"
 		    if test "$cross_compiling" = yes; then
   echo "configure: warning: *** Can not use slang when cross-compiling" 1>&2
 else
   cat > conftest.$ac_ext <<EOF
-#line 1639 "configure"
+#line 1619 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
 #include <slcurses.h>
 int main () { SLtt_initialize (NULL); return 0; }
 EOF
-if { (eval echo configure:1646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   echo "$ac_t""yes" 1>&6
 			cat >> confdefs.h <<\EOF
@@ -1699,12 +1679,12 @@ fi
 for ac_func in snprintf vsnprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1703: checking for $ac_func" >&5
+echo "configure:1683: 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 1708 "configure"
+#line 1688 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1727,7 +1707,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1711: \"$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
@@ -1806,7 +1786,7 @@ fi
   # Extract the first word of "glib-config", so it can be a program name with args.
 set dummy glib-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1810: checking for $ac_word" >&5
+echo "configure:1790: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1841,7 +1821,7 @@ fi
 
   min_glib_version=1.2.4
   echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
-echo "configure:1845: checking for GLIB - version >= $min_glib_version" >&5
+echo "configure:1825: checking for GLIB - version >= $min_glib_version" >&5
   no_glib=""
   if test "$GLIB_CONFIG" = "no" ; then
     no_glib=yes
@@ -1864,7 +1844,7 @@ echo "configure:1845: checking for GLIB - version >= $min_glib_version" >&5
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 1868 "configure"
+#line 1848 "configure"
 #include "confdefs.h"
 
 #include <glib.h>
@@ -1940,7 +1920,7 @@ main ()
 }
 
 EOF
-if { (eval echo configure:1944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1974,7 +1954,7 @@ fi
           CFLAGS="$CFLAGS $GLIB_CFLAGS"
           LIBS="$LIBS $GLIB_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 1978 "configure"
+#line 1958 "configure"
 #include "confdefs.h"
 
 #include <glib.h>
@@ -1984,7 +1964,7 @@ int main() {
  return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:1988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GLIB or finding the wrong"
@@ -2031,12 +2011,12 @@ fi
 
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2035: checking return type of signal handlers" >&5
+echo "configure:2015: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2040 "configure"
+#line 2020 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -2053,7 +2033,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:2057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -2072,12 +2052,12 @@ EOF
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:2076: checking for vprintf" >&5
+echo "configure:2056: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2081 "configure"
+#line 2061 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -2100,7 +2080,7 @@ vprintf();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -2124,12 +2104,12 @@ fi
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:2128: checking for _doprnt" >&5
+echo "configure:2108: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2133 "configure"
+#line 2113 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -2152,7 +2132,7 @@ _doprnt();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -2179,12 +2159,12 @@ fi
 for ac_func in getopt_long
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2183: checking for $ac_func" >&5
+echo "configure:2163: 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 2188 "configure"
+#line 2168 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2207,7 +2187,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2191: \"$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
@@ -2240,17 +2220,17 @@ then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2244: checking for $ac_hdr" >&5
+echo "configure:2224: 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 2249 "configure"
+#line 2229 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2234: \"$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*
@@ -2277,7 +2257,7 @@ fi
 done
 
     echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:2281: checking for tgetent in -lncurses" >&5
+echo "configure:2261: checking for tgetent in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2285,7 +2265,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2289 "configure"
+#line 2269 "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
@@ -2296,7 +2276,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:2300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2280: \"$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
@@ -2321,7 +2301,7 @@ fi
 if eval "test x$CURSES_LIB_NAME = x"
 then
     echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:2325: checking for tgetent in -lcurses" >&5
+echo "configure:2305: checking for tgetent in -lcurses" >&5
 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2329,7 +2309,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2333 "configure"
+#line 2313 "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
@@ -2340,7 +2320,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:2344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2324: \"$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
@@ -2366,7 +2346,7 @@ fi
 if eval "test x$CURSES_LIB_NAME = x"
 then
     echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
-echo "configure:2370: checking for initscr in -lcurses" >&5
+echo "configure:2350: checking for initscr in -lcurses" >&5
 ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2374,7 +2354,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2378 "configure"
+#line 2358 "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
@@ -2385,7 +2365,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:2389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2369: \"$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
@@ -2410,7 +2390,7 @@ fi
 if eval "test x$CURSES_LIB_NAME = x"
 then
     echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:2414: checking for tgetent in -ltermcap" >&5
+echo "configure:2394: checking for tgetent in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2418,7 +2398,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2422 "configure"
+#line 2402 "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
@@ -2429,7 +2409,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:2433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2413: \"$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
@@ -2463,7 +2443,7 @@ fi
 
 
 echo $ac_n "checking for use_default_colors in -l$CURSES_LIB_NAME""... $ac_c" 1>&6
-echo "configure:2467: checking for use_default_colors in -l$CURSES_LIB_NAME" >&5
+echo "configure:2447: checking for use_default_colors in -l$CURSES_LIB_NAME" >&5
 ac_lib_var=`echo $CURSES_LIB_NAME'_'use_default_colors | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2471,7 +2451,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$CURSES_LIB_NAME  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2475 "configure"
+#line 2455 "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
@@ -2482,7 +2462,7 @@ int main() {
 use_default_colors()
 ; return 0; }
 EOF
-if { (eval echo configure:2486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2466: \"$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
@@ -2507,7 +2487,7 @@ fi
 
 if test x$slang_support != xyes; then
     echo $ac_n "checking for wresize in -l$CURSES_LIB_NAME""... $ac_c" 1>&6
-echo "configure:2511: checking for wresize in -l$CURSES_LIB_NAME" >&5
+echo "configure:2491: checking for wresize in -l$CURSES_LIB_NAME" >&5
 ac_lib_var=`echo $CURSES_LIB_NAME'_'wresize | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2515,7 +2495,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$CURSES_LIB_NAME  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2519 "configure"
+#line 2499 "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
@@ -2526,7 +2506,7 @@ int main() {
 wresize()
 ; return 0; }
 EOF
-if { (eval echo configure:2530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2510: \"$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
@@ -2550,7 +2530,7 @@ else
 fi
 
     echo $ac_n "checking for resizeterm in -l$CURSES_LIB_NAME""... $ac_c" 1>&6
-echo "configure:2554: checking for resizeterm in -l$CURSES_LIB_NAME" >&5
+echo "configure:2534: checking for resizeterm in -l$CURSES_LIB_NAME" >&5
 ac_lib_var=`echo $CURSES_LIB_NAME'_'resizeterm | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2558,7 +2538,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$CURSES_LIB_NAME  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2562 "configure"
+#line 2542 "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
@@ -2569,7 +2549,7 @@ int main() {
 resizeterm()
 ; return 0; }
 EOF
-if { (eval echo configure:2573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2553: \"$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
@@ -2595,12 +2575,12 @@ fi
 
     # Taken from aumix (can't tell form the variable name?)
     echo $ac_n "checking for private member _use_keypad in WINDOW""... $ac_c" 1>&6
-echo "configure:2599: checking for private member _use_keypad in WINDOW" >&5
+echo "configure:2579: checking for private member _use_keypad in WINDOW" >&5
 if eval "test \"`echo '$''{'aumix_cv_struct_window_usekeypad'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2604 "configure"
+#line 2584 "configure"
 #include "confdefs.h"
 #ifdef HAVE_NCURSES_H
 #include <ncurses.h>
@@ -2611,7 +2591,7 @@ int main() {
 WINDOW w; w._use_keypad;
 ; return 0; }
 EOF
-if { (eval echo configure:2615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   aumix_cv_struct_window_usekeypad=yes
 else
@@ -2654,37 +2634,10 @@ then
 	LDFLAGS="$LDFLAGS $glib_libs"
 fi
 
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:2665: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2688: checking for $ac_word" >&5
+echo "configure:2641: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2712,12 +2665,12 @@ else
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2716: checking for working const" >&5
+echo "configure:2669: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2721 "configure"
+#line 2674 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2766,7 +2719,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:2770: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -2787,21 +2740,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2791: checking for inline" >&5
+echo "configure:2744: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 2798 "configure"
+#line 2751 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:2805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -2827,12 +2780,12 @@ EOF
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2831: checking for off_t" >&5
+echo "configure:2784: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2836 "configure"
+#line 2789 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2860,12 +2813,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2864: checking for size_t" >&5
+echo "configure:2817: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2869 "configure"
+#line 2822 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2895,19 +2848,19 @@ fi
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:2899: checking for working alloca.h" >&5
+echo "configure:2852: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2904 "configure"
+#line 2857 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:2911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -2928,12 +2881,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2932: checking for alloca" >&5
+echo "configure:2885: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2937 "configure"
+#line 2890 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -2961,7 +2914,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:2965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -2993,12 +2946,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2997: checking whether alloca needs Cray hooks" >&5
+echo "configure:2950: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3002 "configure"
+#line 2955 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -3023,12 +2976,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3027: checking for $ac_func" >&5
+echo "configure:2980: 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 3032 "configure"
+#line 2985 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3051,7 +3004,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3008: \"$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
@@ -3078,7 +3031,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:3082: checking stack direction for C alloca" >&5
+echo "configure:3035: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3086,7 +3039,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 3090 "configure"
+#line 3043 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -3105,7 +3058,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:3109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -3130,17 +3083,17 @@ for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3134: checking for $ac_hdr" >&5
+echo "configure:3087: 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 3139 "configure"
+#line 3092 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3097: \"$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*
@@ -3169,12 +3122,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3173: checking for $ac_func" >&5
+echo "configure:3126: 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 3178 "configure"
+#line 3131 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3197,7 +3150,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3154: \"$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
@@ -3222,7 +3175,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:3226: checking for working mmap" >&5
+echo "configure:3179: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3230,7 +3183,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 3234 "configure"
+#line 3187 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -3370,7 +3323,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:3374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -3392,23 +3345,23 @@ EOF
 
 fi
 
-                                 
-   for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-stdlib.h string.h unistd.h sys/param.h
+                              
+   for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \
+unistd.h sys/param.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3402: checking for $ac_hdr" >&5
+echo "configure:3355: 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 3407 "configure"
+#line 3360 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3365: \"$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*
@@ -3434,17 +3387,16 @@ else
 fi
 done
 
-   for ac_func in feof_unlocked fgets_unlocked getcwd mempcpy munmap putenv \
-setenv setlocale stpcpy strchr strcasecmp strdup tsearch \
-__argz_count __argz_stringify __argz_next
+   for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \
+strdup __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3443: checking for $ac_func" >&5
+echo "configure:3395: 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 3448 "configure"
+#line 3400 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3467,7 +3419,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3423: \"$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
@@ -3492,171 +3444,85 @@ fi
 done
 
 
-   
-      echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:3498: checking for iconv" >&5
-if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
+   if test "${ac_cv_func_stpcpy+set}" != "set"; then
+     for ac_func in stpcpy
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:3452: 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
-  
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    cat > conftest.$ac_ext <<EOF
-#line 3506 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-#include <iconv.h>
-int main() {
-iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);
-; return 0; }
-EOF
-if { (eval echo configure:3516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  am_cv_func_iconv=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS -liconv"
-      cat > conftest.$ac_ext <<EOF
-#line 3528 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 3457 "configure"
 #include "confdefs.h"
-#include <stdlib.h>
-#include <iconv.h>
-int main() {
-iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);
-; return 0; }
-EOF
-if { (eval echo configure:3538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-      LIBS="$am_save_LIBS"
-    fi
-  
-fi
-
-echo "$ac_t""$am_cv_func_iconv" 1>&6
-  if test "$am_cv_func_iconv" = yes; then
-    cat >> confdefs.h <<\EOF
-#define HAVE_ICONV 1
-EOF
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
 
-    echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
-echo "configure:3559: checking for iconv declaration" >&5
-    if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-      cat > conftest.$ac_ext <<EOF
-#line 3565 "configure"
-#include "confdefs.h"
+int main() {
 
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
 #else
-size_t iconv();
+$ac_func();
 #endif
 
-int main() {
-
 ; return 0; }
 EOF
-if { (eval echo configure:3584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  am_cv_proto_iconv_arg1=""
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  am_cv_proto_iconv_arg1="const"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
 fi
 
-    am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    echo "$ac_t""${ac_t:-
-         }$am_cv_proto_iconv" 1>&6
-    cat >> confdefs.h <<EOF
-#define ICONV_CONST $am_cv_proto_iconv_arg1
-EOF
-
-  fi
-  LIBICONV=
-  if test "$am_cv_lib_iconv" = yes; then
-    LIBICONV="-liconv"
-  fi
-  
-
-   
-  echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
-echo "configure:3613: checking for nl_langinfo and CODESET" >&5
-if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3618 "configure"
-#include "confdefs.h"
-#include <langinfo.h>
-int main() {
-char* cs = nl_langinfo(CODESET);
-; return 0; }
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
 EOF
-if { (eval echo configure:3625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  am_cv_langinfo_codeset=yes
+ 
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  am_cv_langinfo_codeset=no
-fi
-rm -f conftest*
-    
+  echo "$ac_t""no" 1>&6
 fi
+done
 
-echo "$ac_t""$am_cv_langinfo_codeset" 1>&6
-  if test $am_cv_langinfo_codeset = yes; then
-    cat >> confdefs.h <<\EOF
-#define HAVE_LANGINFO_CODESET 1
+   fi
+   if test "${ac_cv_func_stpcpy}" = "yes"; then
+     cat >> confdefs.h <<\EOF
+#define HAVE_STPCPY 1
 EOF
 
-  fi
+   fi
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:3648: checking for LC_MESSAGES" >&5
+echo "configure:3514: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3653 "configure"
+#line 3519 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:3660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
 else
@@ -3677,7 +3543,7 @@ EOF
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:3681: checking whether NLS is requested" >&5
+echo "configure:3547: checking whether NLS is requested" >&5
         # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
   enableval="$enable_nls"
@@ -3689,7 +3555,6 @@ fi
     echo "$ac_t""$USE_NLS" 1>&6
     
 
-    BUILD_INCLUDED_LIBINTL=no
     USE_INCLUDED_LIBINTL=no
 
         if test "$USE_NLS" = "yes"; then
@@ -3698,7 +3563,7 @@ fi
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:3702: checking whether included gettext is requested" >&5
+echo "configure:3567: checking whether included gettext is requested" >&5
       # Check whether --with-included-gettext or --without-included-gettext was given.
 if test "${with_included_gettext+set}" = set; then
   withval="$with_included_gettext"
@@ -3711,24 +3576,23 @@ fi
 
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-                        	CATOBJEXT=NONE
-
-                
-        
+                        		nls_cv_header_intl=
+	nls_cv_header_libgt=
+	CATOBJEXT=NONE
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:3722: checking for libintl.h" >&5
+echo "configure:3586: checking for libintl.h" >&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 3727 "configure"
+#line 3591 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3596: \"$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*
@@ -3744,84 +3608,173 @@ rm -f conftest*
 fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6
-echo "configure:3749: checking for GNU gettext in libc" >&5
-if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then
+  echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
+echo "configure:3613: checking for gettext in libc" >&5
+if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3754 "configure"
+#line 3618 "configure"
 #include "confdefs.h"
 #include <libintl.h>
-extern int _nl_msg_cat_cntr;
 int main() {
-bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr
+return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:3763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  gt_cv_func_gnugettext1_libc=yes
+  gt_cv_func_gettext_libc=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  gt_cv_func_gnugettext1_libc=no
+  gt_cv_func_gettext_libc=no
 fi
 rm -f conftest*
 fi
 
-echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6
+echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6
 
-	   if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
-	     echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
-echo "configure:3779: checking for GNU gettext in libintl" >&5
-if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then
+	   if test "$gt_cv_func_gettext_libc" != "yes"; then
+	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
+echo "configure:3641: checking for bindtextdomain in -lintl" >&5
+ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  gt_save_LIBS="$LIBS"
-		LIBS="$LIBS -lintl"
-		cat > conftest.$ac_ext <<EOF
-#line 3786 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-lintl  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 3649 "configure"
 #include "confdefs.h"
-#include <libintl.h>
-extern int _nl_msg_cat_cntr;
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char bindtextdomain();
+
+int main() {
+bindtextdomain()
+; return 0; }
+EOF
+if { (eval echo configure:3660: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
+echo "configure:3676: checking for gettext in libintl" >&5
+if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
+echo "configure:3681: checking for gettext in -lintl" >&5
+ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lintl  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 3689 "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
+    builtin and then its argument prototype would still apply.  */
+char gettext();
+
 int main() {
-bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr
+gettext()
 ; return 0; }
 EOF
-if { (eval echo configure:3795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  gt_cv_func_gnugettext1_libintl=yes
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  gt_cv_func_gnugettext1_libintl=no
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-		LIBS="$gt_save_LIBS"
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  gt_cv_func_gettext_libintl=yes
+else
+  echo "$ac_t""no" 1>&6
+gt_cv_func_gettext_libintl=no
+fi
+
+fi
+
+echo "$ac_t""$gt_cv_func_gettext_libintl" 1>&6
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-echo "$ac_t""$gt_cv_func_gnugettext1_libintl" 1>&6
 	   fi
 
-	   if test "$gt_cv_func_gnugettext1_libc" = "yes" \
-	      || test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
-	     cat >> confdefs.h <<\EOF
+	   if test "$gt_cv_func_gettext_libc" = "yes" \
+	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
+	      cat >> confdefs.h <<\EOF
 #define HAVE_GETTEXT 1
 EOF
 
-	     for ac_func in dcgettext
+	      # Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:3739: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$MSGFMT" in
+  /*)
+  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
+	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
+  ;;
+esac
+fi
+MSGFMT="$ac_cv_path_MSGFMT"
+if test -n "$MSGFMT"; then
+  echo "$ac_t""$MSGFMT" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+	      if test "$MSGFMT" != "no"; then
+		for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3820: checking for $ac_func" >&5
+echo "configure:3773: 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 3825 "configure"
+#line 3778 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3844,7 +3797,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3801: \"$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
@@ -3868,44 +3821,251 @@ else
 fi
 done
 
-	     # Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
+		# Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3875: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
+echo "configure:3828: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  case "$MSGFMT" in
+  case "$GMSGFMT" in
   /*)
-  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
   ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
-	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
-	break
-      fi
+      ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
+      break
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
   ;;
 esac
 fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test -n "$MSGFMT"; then
-  echo "$ac_t""$MSGFMT" 1>&6
+GMSGFMT="$ac_cv_path_GMSGFMT"
+if test -n "$GMSGFMT"; then
+  echo "$ac_t""$GMSGFMT" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
-	     if test "$MSGFMT" != "no"; then
-	       # Extract the first word of "gmsgfmt", so it can be a program name with args.
+
+		# Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:3864: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$XGETTEXT" in
+  /*)
+  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
+	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+  ;;
+esac
+fi
+XGETTEXT="$ac_cv_path_XGETTEXT"
+if test -n "$XGETTEXT"; then
+  echo "$ac_t""$XGETTEXT" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+		cat > conftest.$ac_ext <<EOF
+#line 3896 "configure"
+#include "confdefs.h"
+
+int main() {
+extern int _nl_msg_cat_cntr;
+			       return _nl_msg_cat_cntr
+; return 0; }
+EOF
+if { (eval echo configure:3904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  CATOBJEXT=.gmo
+		   DATADIRNAME=share
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CATOBJEXT=.mo
+		   DATADIRNAME=lib
+fi
+rm -f conftest*
+		INSTOBJEXT=.mo
+	      fi
+	    fi
+	
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+        if test "$CATOBJEXT" = "NONE"; then
+	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
+echo "configure:3927: checking whether catgets can be used" >&5
+	  # Check whether --with-catgets or --without-catgets was given.
+if test "${with_catgets+set}" = set; then
+  withval="$with_catgets"
+  nls_cv_use_catgets=$withval
+else
+  nls_cv_use_catgets=no
+fi
+
+	  echo "$ac_t""$nls_cv_use_catgets" 1>&6
+
+	  if test "$nls_cv_use_catgets" = "yes"; then
+	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
+echo "configure:3940: checking for main in -li" >&5
+ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-li  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 3948 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:3955: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo i | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-li $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
+echo "configure:3983: checking for catgets" >&5
+if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3988 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char catgets(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char catgets();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_catgets) || defined (__stub___catgets)
+choke me
+#else
+catgets();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:4011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_catgets=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_catgets=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'catgets`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
+#define HAVE_CATGETS 1
+EOF
+
+	       INTLOBJS="\$(CATOBJS)"
+	       # Extract the first word of "gencat", so it can be a program name with args.
+set dummy gencat; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:4033: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$GENCAT" in
+  /*)
+  ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_GENCAT="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_GENCAT" && ac_cv_path_GENCAT="no"
+  ;;
+esac
+fi
+GENCAT="$ac_cv_path_GENCAT"
+if test -n "$GENCAT"; then
+  echo "$ac_t""$GENCAT" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+	       if test "$GENCAT" != "no"; then
+		 # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3909: checking for $ac_word" >&5
+echo "configure:4069: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3927,7 +4087,42 @@ else
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no"
+  ;;
+esac
+fi
+GMSGFMT="$ac_cv_path_GMSGFMT"
+if test -n "$GMSGFMT"; then
+  echo "$ac_t""$GMSGFMT" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+		 if test "$GMSGFMT" = "no"; then
+		   # Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:4106: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$GMSGFMT" in
+  /*)
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
+	ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no"
   ;;
 esac
 fi
@@ -3938,11 +4133,11 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-	     fi
-	     # Extract the first word of "xgettext", so it can be a program name with args.
+		 fi
+		 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3946: checking for $ac_word" >&5
+echo "configure:4141: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3973,16 +4168,22 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-	     CATOBJEXT=.gmo
-	     if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
-	       INTLLIBS="-lintl"
-	     fi
-	   fi
-	
+		 USE_INCLUDED_LIBINTL=yes
+		 CATOBJEXT=.cat
+		 INSTOBJEXT=.cat
+		 DATADIRNAME=lib
+		 INTLDEPS='$(top_builddir)/intl/libintl.a'
+		 INTLLIBS=$INTLDEPS
+		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+		 nls_cv_header_intl=intl/libintl.h
+		 nls_cv_header_libgt=intl/libgettext.h
+	       fi
 else
   echo "$ac_t""no" 1>&6
 fi
 
+	  fi
+        fi
 
         if test "$CATOBJEXT" = "NONE"; then
 	  	  	  nls_cv_use_gnu_gettext=yes
@@ -3994,7 +4195,7 @@ fi
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3998: checking for $ac_word" >&5
+echo "configure:4199: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4028,7 +4229,7 @@ fi
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4032: checking for $ac_word" >&5
+echo "configure:4233: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4064,7 +4265,7 @@ fi
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4068: checking for $ac_word" >&5
+echo "configure:4269: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4096,15 +4297,15 @@ else
 fi
 
         
-	BUILD_INCLUDED_LIBINTL=yes
 	USE_INCLUDED_LIBINTL=yes
         CATOBJEXT=.gmo
-	INTLLIBS='$(top_builddir)/intl/libintl.a'
-	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
-
-                  if test -n "$LIBICONV" && test -n "$INTLLIBS"; then
-        INTLLIBS="$INTLLIBS $LIBICONV"
+        INSTOBJEXT=.mo
+        DATADIRNAME=share
+	INTLDEPS='$(top_builddir)/intl/libintl.a'
+	INTLLIBS=$INTLDEPS
+	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+        nls_cv_header_intl=intl/libintl.h
+        nls_cv_header_libgt=intl/libgettext.h
       fi
 
             if test "$XGETTEXT" != ":"; then
@@ -4116,65 +4317,22 @@ fi
 	fi
       fi
 
-            POSUB=po
+      # We need to process the po/ directory.
+      POSUB=po
+    else
+      DATADIRNAME=share
+      nls_cv_header_intl=intl/libintl.h
+      nls_cv_header_libgt=intl/libgettext.h
     fi
     
+    
 
 
-            if test "$PACKAGE" = gettext; then
-      BUILD_INCLUDED_LIBINTL=yes
-    fi
-
-                                            for ac_prog in bison
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4134: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$INTLBISON"; then
-  ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_INTLBISON="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-INTLBISON="$ac_cv_prog_INTLBISON"
-if test -n "$INTLBISON"; then
-  echo "$ac_t""$INTLBISON" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$INTLBISON" && break
-done
-
-    if test -z "$INTLBISON"; then
-      ac_verc_fail=yes
-    else
-            echo $ac_n "checking version of bison""... $ac_c" 1>&6
-echo "configure:4167: checking version of bison" >&5
-      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-      case $ac_prog_version in
-        '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-        1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-           ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-        *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-      esac
-      echo "$ac_t""$ac_prog_version" 1>&6
-    fi
-    if test $ac_verc_fail = yes; then
-      INTLBISON=:
+    # If this is used in GNU gettext we have to set USE_NLS to `yes'
+    # because some of the sources are only built for this goal.
+    if test "$PACKAGE" = gettext; then
+      USE_NLS=yes
+      USE_INCLUDED_LIBINTL=yes
     fi
 
                 for lang in $ALL_LINGUAS; do
@@ -4191,11 +4349,7 @@ echo "configure:4167: checking version of bison" >&5
     
     
     
-
-        nls_cv_header_intl=
-    nls_cv_header_libgt=
-
-        DATADIRNAME=share
+    
     
   
 
@@ -4204,23 +4358,12 @@ echo "configure:4167: checking version of bison" >&5
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:4208: checking for catalogs to be installed" >&5
+echo "configure:4362: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
-       for presentlang in $ALL_LINGUAS; do
-         useit=no
-         for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do
-           # Use the presentlang catalog if desiredlang is
-           #   a. equal to presentlang, or
-           #   b. a variant of presentlang (because in this case,
-           #      presentlang can be used as a fallback for messages
-           #      which are not translated in the desiredlang catalog).
-           case "$desiredlang" in
-             "$presentlang"*) useit=yes;;
-           esac
-         done
-         if test $useit = yes; then
-           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-         fi
+       for lang in ${LINGUAS=$ALL_LINGUAS}; do
+         case "$ALL_LINGUAS" in
+          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
+         esac
        done
        LINGUAS=$NEW_LINGUAS
        echo "$ac_t""$LINGUAS" 1>&6
@@ -4231,6 +4374,66 @@ echo "configure:4208: checking for catalogs to be installed" >&5
      fi
    fi
 
+            if test $ac_cv_header_locale_h = yes; then
+     INCLUDE_LOCALE_H="#include <locale.h>"
+   else
+     INCLUDE_LOCALE_H="\
+/* The system does not provide the header <locale.h>.  Take care yourself.  */"
+   fi
+   
+
+            test -d intl || mkdir intl
+   if test "$CATOBJEXT" = ".cat"; then
+     ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
+echo "configure:4390: checking for linux/version.h" >&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 4395 "configure"
+#include "confdefs.h"
+#include <linux/version.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:4400: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  msgformat=linux
+else
+  echo "$ac_t""no" 1>&6
+msgformat=xopen
+fi
+
+
+               sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
+   fi
+      sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
+     $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
+
+            if test "$PACKAGE" = "gettext"; then
+     GT_NO="#NO#"
+     GT_YES=
+   else
+     GT_NO=
+     GT_YES="#YES#"
+   fi
+   
+   
+
             MKINSTALLDIRS=
    if test -n "$ac_aux_dir"; then
      MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
@@ -4240,24 +4443,22 @@ echo "configure:4208: checking for catalogs to be installed" >&5
    fi
    
 
-      INTL_LIBTOOL_SUFFIX_PREFIX=
+      l=
    
 
-            if test -d $srcdir/po; then
-      test -d po || mkdir po
-      if test "x$srcdir" != "x."; then
-	if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-	  posrcprefix="$srcdir/"
-   	else
-      	  posrcprefix="../$srcdir/"
-      	fi
-      else
-      	posrcprefix="../"
-      fi
-      rm -f po/POTFILES
-      sed -e "/^#/d" -e "/^\$/d" -e "s,.*,     $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-       	< $srcdir/po/POTFILES.in > po/POTFILES
+         test -d po || mkdir po
+   if test "x$srcdir" != "x."; then
+     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+       posrcprefix="$srcdir/"
+     else
+       posrcprefix="../$srcdir/"
+     fi
+   else
+     posrcprefix="../"
    fi
+   rm -f po/POTFILES
+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+	< $srcdir/po/POTFILES.in > po/POTFILES
   
 
 trap '' 1 2 15
@@ -4410,31 +4611,29 @@ s%@GLIB_CONFIG@%$GLIB_CONFIG%g
 s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g
 s%@GLIB_LIBS@%$GLIB_LIBS%g
 s%@CURSES_LIB@%$CURSES_LIB%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
 s%@RANLIB@%$RANLIB%g
 s%@ALLOCA@%$ALLOCA%g
-s%@LIBICONV@%$LIBICONV%g
 s%@USE_NLS@%$USE_NLS%g
 s%@MSGFMT@%$MSGFMT%g
 s%@GMSGFMT@%$GMSGFMT%g
 s%@XGETTEXT@%$XGETTEXT%g
-s%@INTLBISON@%$INTLBISON%g
-s%@BUILD_INCLUDED_LIBINTL@%$BUILD_INCLUDED_LIBINTL%g
+s%@GENCAT@%$GENCAT%g
 s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g
 s%@CATALOGS@%$CATALOGS%g
 s%@CATOBJEXT@%$CATOBJEXT%g
+s%@DATADIRNAME@%$DATADIRNAME%g
 s%@GMOFILES@%$GMOFILES%g
+s%@INSTOBJEXT@%$INSTOBJEXT%g
+s%@INTLDEPS@%$INTLDEPS%g
 s%@INTLLIBS@%$INTLLIBS%g
 s%@INTLOBJS@%$INTLOBJS%g
 s%@POFILES@%$POFILES%g
 s%@POSUB@%$POSUB%g
-s%@DATADIRNAME@%$DATADIRNAME%g
+s%@INCLUDE_LOCALE_H@%$INCLUDE_LOCALE_H%g
+s%@GT_NO@%$GT_NO%g
+s%@GT_YES@%$GT_YES%g
 s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
-s%@INTL_LIBTOOL_SUFFIX_PREFIX@%$INTL_LIBTOOL_SUFFIX_PREFIX%g
+s%@l@%$l%g
 
 CEOF
 EOF
@@ -4642,6 +4841,51 @@ cat >> $CONFIG_STATUS <<\EOF
   fi
 fi; done
 
+EOF
+
+cat >> $CONFIG_STATUS <<EOF
+ac_sources="$nls_cv_header_libgt"
+ac_dests="$nls_cv_header_intl"
+EOF
+
+cat >> $CONFIG_STATUS <<\EOF
+srcdir=$ac_given_srcdir
+while test -n "$ac_sources"; do
+  set $ac_dests; ac_dest=$1; shift; ac_dests=$*
+  set $ac_sources; ac_source=$1; shift; ac_sources=$*
+
+  echo "linking $srcdir/$ac_source to $ac_dest"
+
+  if test ! -r $srcdir/$ac_source; then
+    { echo "configure: error: $srcdir/$ac_source: File not found" 1>&2; exit 1; }
+  fi
+  rm -f $ac_dest
+
+  # Make relative symlinks.
+  # Remove last slash and all that follows it.  Not all systems have dirname.
+  ac_dest_dir=`echo $ac_dest|sed 's%/[^/][^/]*$%%'`
+  if test "$ac_dest_dir" != "$ac_dest" && test "$ac_dest_dir" != .; then
+    # The dest file is in a subdirectory.
+    test ! -d "$ac_dest_dir" && mkdir "$ac_dest_dir"
+    ac_dest_dir_suffix="/`echo $ac_dest_dir|sed 's%^\./%%'`"
+    # A "../" for each directory in $ac_dest_dir_suffix.
+    ac_dots=`echo $ac_dest_dir_suffix|sed 's%/[^/]*%../%g'`
+  else
+    ac_dest_dir_suffix= ac_dots=
+  fi
+
+  case "$srcdir" in
+  [/$]*) ac_rel_source="$srcdir/$ac_source" ;;
+  *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;;
+  esac
+
+  # Make a symlink if possible; otherwise try a hard link.
+  if ln -s $ac_rel_source $ac_dest 2>/dev/null ||
+    ln $srcdir/$ac_source $ac_dest; then :
+  else
+    { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; }
+  fi
+done
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -4650,9 +4894,8 @@ cat >> $CONFIG_STATUS <<EOF
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
-case " "$CONFIG_FILES" " in *" po/Makefile.in "* | *" po/Makefile.in:"*)
+case "$CONFIG_FILES" in *po/Makefile.in*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-        ;;
       esac
 
 exit 0
diff --git a/po/ca.po b/po/ca.po
index 146697f6..be9a4329 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2001-04-18 18:10-0400\n"
+"POT-Creation-Date: 2001-04-30 09:44-0400\n"
 "PO-Revision-Date: 2001-03-21 23:45+0100\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>, Miquel Vidal "
 "<miquel@sindominio.net>\n"
@@ -16,429 +16,429 @@ msgstr ""
 "Content-Type: text/plain; charset=iso8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cut.c:44
+#: cut.c:45
 #, c-format
 msgid "add_to_cutbuffer called with inptr->data = %s\n"
 msgstr "add_to_cutbuffer cridat amb inptr->data = %s\n"
 
-#: cut.c:150
+#: cut.c:151
 msgid "Blew away cutbuffer =)\n"
 msgstr "Hem foragitat el cuttbuffer =)\n"
 
-#: files.c:123
+#: files.c:124
 msgid "read_line: not on first line and prev is NULL"
 msgstr "read_line: no som a la primera línia i la anterior és NULL"
 
-#: files.c:185 files.c:203
+#: files.c:186 files.c:204
 #, c-format
 msgid "Read %d lines"
 msgstr "%d línies llegides"
 
-#: files.c:221 search.c:193
+#: files.c:222 search.c:194
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" no trobat"
 
 #. We have a new file
-#: files.c:225
+#: files.c:226
 msgid "New File"
 msgstr "Nou Fitxer"
 
-#: files.c:238
+#: files.c:239
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr "Fitxer \"%s\" és un directori"
 
 #. Don't open character or block files.  Sorry, /dev/sndstat!
-#: files.c:241
+#: files.c:242
 #, c-format
 msgid "File \"%s\" is a device file"
 msgstr "El fitxer \"%s\" és un dispositiu"
 
-#: files.c:248
+#: files.c:249
 msgid "Reading File"
 msgstr "S'està llegint el Fitxer"
 
-#: files.c:264
+#: files.c:265
 msgid "File to insert [from ./] "
 msgstr "Fitxer a inserir [des de ./] "
 
-#: files.c:313 files.c:338 files.c:574 nano.c:1515
+#: files.c:314 files.c:339 files.c:575 nano.c:1520
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
-#: files.c:384 files.c:400 files.c:414 files.c:431 files.c:437
+#: files.c:385 files.c:401 files.c:415 files.c:432 files.c:438
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "No he pogut obrir el fitxer per a escriure: %s"
 
-#: files.c:419
+#: files.c:420
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Escrites >%s\n"
 
-#: files.c:446
+#: files.c:447
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "No he pogut tancar %s: %s"
 
 #. Try a rename??
-#: files.c:469 files.c:478 files.c:483
+#: files.c:470 files.c:479 files.c:484
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "No he pogut obrir %s per a escriure: %s"
 
-#: files.c:490
+#: files.c:491
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "No he pogut establir permisos %o en %s: %s"
 
-#: files.c:495
+#: files.c:496
 #, c-format
 msgid "Wrote %d lines"
 msgstr "%d línies escrites"
 
-#: files.c:530
+#: files.c:531
 msgid "File Name to write"
 msgstr "Nom de Fitxer a escriure"
 
-#: files.c:549
+#: files.c:550
 #, c-format
 msgid "filename is %s"
 msgstr "filename és %s"
 
-#: files.c:563
+#: files.c:564
 msgid "File exists, OVERWRITE ?"
 msgstr "El fitxer existeix, SOBREESCRIURE ?"
 
-#: files.c:985
+#: files.c:986
 msgid "(more)"
 msgstr "(més)"
 
-#: files.c:1256
+#: files.c:1257
 msgid "Can't move up a directory"
 msgstr "No puc ascendre de directori"
 
 # y, c-format
 #. We can't open this dir for some reason.  Complain
-#: files.c:1266 files.c:1314
+#: files.c:1267 files.c:1315
 #, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "No es pot obrir \"%s\": %s"
 
-#: files.c:1294 global.c:227
+#: files.c:1295 global.c:232
 #, fuzzy
 msgid "Goto Directory"
 msgstr "Anar a Línia"
 
-#: files.c:1299
+#: files.c:1300
 #, fuzzy
 msgid "Goto Cancelled"
 msgstr "Cancel·lat"
 
-#: global.c:139
+#: global.c:144
 msgid "Constant cursor position"
 msgstr "Posició del cursor constant"
 
-#: global.c:140
+#: global.c:145
 msgid "Auto indent"
 msgstr "Auto sagnar"
 
-#: global.c:141
+#: global.c:146
 msgid "Suspend"
 msgstr "Suspendre"
 
-#: global.c:142
+#: global.c:147
 msgid "Help mode"
 msgstr "Mode ajuda"
 
-#: global.c:143
+#: global.c:148
 msgid "Pico mode"
 msgstr "Mode Pico"
 
-#: global.c:144
+#: global.c:149
 msgid "Mouse support"
 msgstr "Suport per a ratolí"
 
-#: global.c:145
+#: global.c:150
 msgid "Cut to end"
 msgstr "Tallar fins al final de línia"
 
-#: global.c:147
+#: global.c:152
 msgid "Regular expressions"
 msgstr "Expressions regulars"
 
-#: global.c:149
+#: global.c:154
 msgid "Auto wrap"
 msgstr "Auto ajustar"
 
-#: global.c:194
+#: global.c:199
 msgid "Invoke the help menu"
 msgstr "Invocar el menú d'ajuda"
 
-#: global.c:195
+#: global.c:200
 msgid "Write the current file to disk"
 msgstr "Escriure el fitxer actual a disc"
 
-#: global.c:196
+#: global.c:201
 msgid "Exit from nano"
 msgstr "Sortir de nano"
 
-#: global.c:197
+#: global.c:202
 msgid "Goto a specific line number"
 msgstr "Anar a un número de línia específic"
 
-#: global.c:198
+#: global.c:203
 msgid "Justify the current paragraph"
 msgstr "Justificar el paràgraf actual"
 
-#: global.c:199
+#: global.c:204
 msgid "Unjustify after a justify"
 msgstr "Desjustificar després d'un justificar"
 
-#: global.c:200
+#: global.c:205
 msgid "Replace text within the editor"
 msgstr "Reemplaçar text al editor"
 
-#: global.c:201
+#: global.c:206
 msgid "Insert another file into the current one"
 msgstr "Inserir un altre fitxer dins del actual"
 
-#: global.c:202
+#: global.c:207
 msgid "Search for text within the editor"
 msgstr "Cercar un text al editor"
 
-#: global.c:203
+#: global.c:208
 msgid "Move to the previous screen"
 msgstr "Moure a la pàgina anterior"
 
-#: global.c:204
+#: global.c:209
 msgid "Move to the next screen"
 msgstr "Moure a la pàgina següent"
 
-#: global.c:205
+#: global.c:210
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Tallar la línia actual i desar-la al cutbuffer"
 
-#: global.c:206
+#: global.c:211
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Enganxar el cutbuffer a la línia actual"
 
-#: global.c:207
+#: global.c:212
 msgid "Show the posititon of the cursor"
 msgstr "Mostrar la posició del cursor"
 
-#: global.c:208
+#: global.c:213
 msgid "Invoke the spell checker (if available)"
 msgstr "Invocar el corrector ortogràfic (si està disponible)"
 
-#: global.c:209
+#: global.c:214
 msgid "Move up one line"
 msgstr "Moure una línia cap a dalt"
 
-#: global.c:210
+#: global.c:215
 msgid "Move down one line"
 msgstr "Moure una línia cap a baix"
 
-#: global.c:211
+#: global.c:216
 msgid "Move forward one character"
 msgstr "Moure endavant un caràcter"
 
-#: global.c:212
+#: global.c:217
 msgid "Move back one character"
 msgstr "Moure endarrere un caràcter"
 
-#: global.c:213
+#: global.c:218
 msgid "Move to the beginning of the current line"
 msgstr "Moure al principi de la línia actual"
 
-#: global.c:214
+#: global.c:219
 msgid "Move to the end of the current line"
 msgstr "Moure al final de la línia actual"
 
-#: global.c:215
+#: global.c:220
 msgid "Go to the first line of the file"
 msgstr "Anar a la primera línia del fitxer"
 
-#: global.c:216
+#: global.c:221
 msgid "Go to the last line of the file"
 msgstr "Anar a la darrera línia del fitxer"
 
-#: global.c:217
+#: global.c:222
 msgid "Refresh (redraw) the current screen"
 msgstr "Redibuixar la pantalla actual"
 
-#: global.c:218
+#: global.c:223
 msgid "Mark text at the current cursor location"
 msgstr "Marcar text a la posició actual del cursor"
 
-#: global.c:219
+#: global.c:224
 msgid "Delete the character under the cursor"
 msgstr "Suprimir el caràcter sota el cursor"
 
-#: global.c:221
+#: global.c:226
 msgid "Delete the character to the left of the cursor"
 msgstr "Suprimir el caràcter a l'esquerra del cursor"
 
-#: global.c:222
+#: global.c:227
 msgid "Insert a tab character"
 msgstr "Inserir un caràcter tab"
 
-#: global.c:223
+#: global.c:228
 msgid "Insert a carriage return at the cursor position"
 msgstr "Inserir un retorn a la posició del cursor"
 
-#: global.c:225
+#: global.c:230
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Fer que la recerca actual siga sensible a majúscules"
 
-#: global.c:226
+#: global.c:231
 msgid "Go to file browser"
 msgstr "Anar a l'explorador de fitxers"
 
-#: global.c:228
+#: global.c:233
 msgid "Cancel the current function"
 msgstr "Cancel·lar la funció actual"
 
-#: global.c:231
+#: global.c:236
 msgid "Get Help"
 msgstr "Veure Ajuda"
 
-#: global.c:234 global.c:415 global.c:442
+#: global.c:239 global.c:420 global.c:447
 msgid "Exit"
 msgstr "Sortir"
 
-#: global.c:237
+#: global.c:242
 msgid "WriteOut"
 msgstr "Desar"
 
-#: global.c:242 global.c:331
+#: global.c:247 global.c:336
 msgid "Justify"
 msgstr "Justificar"
 
-#: global.c:246 global.c:252
+#: global.c:251 global.c:257
 msgid "Read File"
 msgstr "L. Fitxer"
 
-#: global.c:256 global.c:327 global.c:355
+#: global.c:261 global.c:332 global.c:360
 msgid "Replace"
 msgstr "Reemplaçar"
 
-#: global.c:260
+#: global.c:265
 msgid "Where Is"
 msgstr "Cercar"
 
-#: global.c:264 global.c:407 global.c:431
+#: global.c:269 global.c:412 global.c:436
 msgid "Prev Page"
 msgstr "Pàg Ant"
 
-#: global.c:268 global.c:411 global.c:435
+#: global.c:273 global.c:416 global.c:440
 msgid "Next Page"
 msgstr "Pàg Seg"
 
-#: global.c:272
+#: global.c:277
 msgid "Cut Text"
 msgstr "TallarTxt"
 
-#: global.c:276
+#: global.c:281
 msgid "UnJustify"
 msgstr "Desjustificar"
 
-#: global.c:279
+#: global.c:284
 msgid "UnCut Txt"
 msgstr "EnganTxt"
 
-#: global.c:283
+#: global.c:288
 msgid "Cur Pos"
 msgstr "Pos Act"
 
-#: global.c:287
+#: global.c:292
 msgid "To Spell"
 msgstr "Ortografia"
 
-#: global.c:291
+#: global.c:296
 msgid "Up"
 msgstr "Dalt"
 
-#: global.c:294
+#: global.c:299
 msgid "Down"
 msgstr "Baix"
 
-#: global.c:297
+#: global.c:302
 msgid "Forward"
 msgstr "Endavant"
 
-#: global.c:300
+#: global.c:305
 msgid "Back"
 msgstr "Endarrere"
 
-#: global.c:303
+#: global.c:308
 msgid "Home"
 msgstr "Inici"
 
-#: global.c:306
+#: global.c:311
 msgid "End"
 msgstr "Fi"
 
-#: global.c:309
+#: global.c:314
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: global.c:312
+#: global.c:317
 msgid "Mark Text"
 msgstr "MarcarTxt"
 
-#: global.c:315
+#: global.c:320
 msgid "Delete"
 msgstr "Suprimir"
 
-#: global.c:319
+#: global.c:324
 msgid "Backspace"
 msgstr "Retrocés"
 
-#: global.c:323
+#: global.c:328
 msgid "Tab"
 msgstr "Tab"
 
-#: global.c:335
+#: global.c:340
 msgid "Enter"
 msgstr "Retorn"
 
-#: global.c:339 global.c:359 global.c:379
+#: global.c:344 global.c:364 global.c:384
 msgid "Goto Line"
 msgstr "Anar a Línia"
 
-#: global.c:345 global.c:366 global.c:387 global.c:397
+#: global.c:350 global.c:371 global.c:392 global.c:402
 msgid "First Line"
 msgstr "Primera Línia"
 
-#: global.c:348 global.c:369 global.c:390 global.c:400
+#: global.c:353 global.c:374 global.c:395 global.c:405
 msgid "Last Line"
 msgstr "Última Línia"
 
-#: global.c:351 global.c:372
+#: global.c:356 global.c:377
 msgid "Case Sens"
 msgstr "Maj/Min"
 
-#: global.c:362 global.c:382 global.c:393 global.c:403 global.c:424
-#: global.c:427 global.c:445 winio.c:1083
+#: global.c:367 global.c:387 global.c:398 global.c:408 global.c:429
+#: global.c:432 global.c:450 winio.c:1202
 msgid "Cancel"
 msgstr "Cancel·lar"
 
-#: global.c:375
+#: global.c:380
 msgid "No Replace"
 msgstr "No Reemplaçar"
 
-#: global.c:420
+#: global.c:425
 msgid "To Files"
 msgstr "A Fitxers"
 
-#: global.c:439
+#: global.c:444
 #, fuzzy
 msgid "Goto"
 msgstr "Anar a Línia"
 
-#: nano.c:136
+#: nano.c:137
 #, c-format
 msgid ""
 "\n"
@@ -447,7 +447,7 @@ msgstr ""
 "\n"
 "Buffer escrit a %s\n"
 
-#: nano.c:138
+#: nano.c:139
 #, c-format
 msgid ""
 "\n"
@@ -456,15 +456,15 @@ msgstr ""
 "\n"
 "No s'ha escrit %s (existeix el fitxer?)\n"
 
-#: nano.c:147
+#: nano.c:148
 msgid "Window size is too small for Nano..."
 msgstr "La mida de la terminal és massa petita per a Nano..."
 
-#: nano.c:155
+#: nano.c:156
 msgid "Key illegal in VIEW mode"
 msgstr "Tecla il·legal en mode VISUALITZACIÓ"
 
-#: nano.c:199
+#: nano.c:200
 msgid ""
 " nano help text\n"
 "\n"
@@ -477,9 +477,9 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
-"key sequences are notated with the Meta (M) symbol and can be entered using "
-"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
+"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
+"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
@@ -503,15 +503,15 @@ msgstr ""
 "opcionals estan representades entre parèntesi:\n"
 "\n"
 
-#: nano.c:293
+#: nano.c:294
 msgid "delete_node(): free'd a node, YAY!\n"
 msgstr "delete_node(): alliberat un node, YEAH!\n"
 
-#: nano.c:298
+#: nano.c:299
 msgid "delete_node(): free'd last node.\n"
 msgstr "delete_node(): alliberat l'últim node.\n"
 
-#: nano.c:353
+#: nano.c:354
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
@@ -519,85 +519,85 @@ msgstr ""
 "Sintaxi: nano [opció llarga GNU] [opció] +LÍNIA <fitxer>\n"
 "\n"
 
-#: nano.c:354
+#: nano.c:355
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Opció\t\tOpció llarga\t\tSignificat\n"
 
-#: nano.c:356
+#: nano.c:357
 msgid " -T [num]\t--tabsize=[num]\t\tSet width of a tab to num\n"
 msgstr " -T [num]\t--tabsize=[num]\t\tFixar l'amplada de tab en num\n"
 
-#: nano.c:359
+#: nano.c:360
 msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
 msgstr " -R\t\t--regexp\t\tUtilitzar expressions regulars per a ls recerques\n"
 
-#: nano.c:363
+#: nano.c:364
 msgid " -V \t\t--version\t\tPrint version information and exit\n"
 msgstr " -V \t\t--version\t\tImprimir versió i sortir\n"
 
-#: nano.c:365
+#: nano.c:366
 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
 msgstr " -c \t\t--const\t\t\tMostrar constantment la posició del cursor\n"
 
-#: nano.c:367
+#: nano.c:368
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr " -h \t\t--help\t\t\tMostrar aquest missatge\n"
 
-#: nano.c:369
+#: nano.c:370
 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
 msgstr " -i \t\t--autoindent\t\tSagnar automàticament noves línies\n"
 
-#: nano.c:372
+#: nano.c:373
 msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
 msgstr " -k \t\t--cut\t\t\t^K talla des del cursor al final de línia\n"
 
-#: nano.c:375
+#: nano.c:376
 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite\n"
 msgstr " -l \t\t--nofollow\t\tNo seguir enllaços simbólics, sobreescriure'ls\n"
 
-#: nano.c:378
+#: nano.c:379
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr " -m \t\t--mouse\t\t\tHabilitar ratolí\n"
 
-#: nano.c:382
+#: nano.c:383
 msgid " -p\t \t--pico\t\t\tEmulate Pico as closely as possible\n"
 msgstr " -p\t \t--pico\t\t\tEmular a Pico tant com sigui possible\n"
 
-#: nano.c:385
+#: nano.c:386
 msgid ""
 " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
 msgstr " -r [#cols] \t--fill=[#cols]\t\tReplenar columnes (ajustar en) #cols\n"
 
-#: nano.c:388
+#: nano.c:389
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr ""
 " -s [prog] \t--speller=[prog]\tHabilitar corrector ortogràfic alternatiu\n"
 
-#: nano.c:391
+#: nano.c:392
 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\t--tempfile\t\tAutodesar en sortir, sense preguntar\n"
 
-#: nano.c:393
+#: nano.c:394
 msgid " -v \t\t--view\t\t\tView (read only) mode\n"
 msgstr " -v \t\t--view\t\t\tMode visualització (sols lectura)\n"
 
-#: nano.c:396
+#: nano.c:397
 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
 msgstr " -w \t\t--nowrap\t\tNo ajustar línies llargues\n"
 
-#: nano.c:399
+#: nano.c:400
 msgid " -x \t\t--nohelp\t\tDon't show help window\n"
 msgstr " -x \t\t--nohelp\t\tNo mostrar la finestra d'ajuda\n"
 
-#: nano.c:401
+#: nano.c:402
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr " -z \t\t--suspend\t\tHabilitar suspensió\n"
 
-#: nano.c:403
+#: nano.c:404
 msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
 msgstr " +LINE\t\t\t\t\tIniciar a la línia número LÍNIA\n"
 
-#: nano.c:405
+#: nano.c:406
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
@@ -605,92 +605,92 @@ msgstr ""
 "Sintaxi: nano [opció] +LÍNIA <fitxer>\n"
 "\n"
 
-#: nano.c:406
+#: nano.c:407
 msgid "Option\t\tMeaning\n"
 msgstr "Opción\t\tSignificat\n"
 
-#: nano.c:407
+#: nano.c:408
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr " -T [num]\tFixar l'amplada de tab a num\n"
 
-#: nano.c:408
+#: nano.c:409
 msgid " -R\t\tUse regular expressions for search\n"
 msgstr " -R\t\tFer servir expressions regulars per a les recerques\n"
 
-#: nano.c:409
+#: nano.c:410
 msgid " -V \t\tPrint version information and exit\n"
 msgstr " -V \t\tImprimir informació sobre la versió i sortir\n"
 
-#: nano.c:410
+#: nano.c:411
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr " -c \t\tMostrar constantment la posició del cursor\n"
 
-#: nano.c:411
+#: nano.c:412
 msgid " -h \t\tShow this message\n"
 msgstr " -h \t\tMostrar aquest missatge\n"
 
-#: nano.c:412
+#: nano.c:413
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr " -v \t\tSagnar automàticament noves línies\n"
 
-#: nano.c:414
+#: nano.c:415
 msgid " -k \t\tLet ^K cut from cursor to end of line\n"
 msgstr " -k \t\t^K talla des del cursor al final de línia\n"
 
-#: nano.c:417
+#: nano.c:418
 msgid " -l \t\tDon't follow symbolic links, overwrite\n"
 msgstr " -l \t\tNo seguir enllaços simbòlics, sobreescriure'ls\n"
 
-#: nano.c:420
+#: nano.c:421
 msgid " -m \t\tEnable mouse\n"
 msgstr " -m \t\tHabilitar ratolí\n"
 
-#: nano.c:423
+#: nano.c:424
 msgid " -p \t\tEmulate Pico as closely as possible\n"
 msgstr " -p \t\tEmular a Pico tant com sigui possible\n"
 
-#: nano.c:425
+#: nano.c:426
 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
 msgstr " -r [#cols] \tOmplir columnes (wrapear línies en) #cols\n"
 
-#: nano.c:427
+#: nano.c:428
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr " -s [prog] \tHabilitar corrector alternatiu\n"
 
-#: nano.c:429
+#: nano.c:430
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\tAutodesar en sortir, no preguntar\n"
 
-#: nano.c:430
+#: nano.c:431
 msgid " -v \t\tView (read only) mode\n"
 msgstr " -v \t\tMode visualització (només de lectura)\n"
 
-#: nano.c:432
+#: nano.c:433
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr " -w \t\tNo ajustar línies llargues\n"
 
-#: nano.c:434
+#: nano.c:435
 msgid " -x \t\tDon't show help window\n"
 msgstr " -x \t\tNo mostrar la finestra d'ajuda\n"
 
-#: nano.c:435
+#: nano.c:436
 msgid " -z \t\tEnable suspend\n"
 msgstr " -z \t\tHabilitar suspensió\n"
 
-#: nano.c:436
+#: nano.c:437
 msgid " +LINE\t\tStart at line number LINE\n"
 msgstr " +LÍNEA\t\tComençar en la línia número LÍNIA\n"
 
-#: nano.c:443
+#: nano.c:444
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano versió %s (compilat %s, %s)\n"
 
-#: nano.c:446
+#: nano.c:447
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 msgstr " Correu-e: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 
-#: nano.c:447
+#: nano.c:448
 msgid ""
 "\n"
 " Compiled options:"
@@ -698,268 +698,262 @@ msgstr ""
 "\n"
 " Opcions compilades:"
 
-#: nano.c:522
+#: nano.c:526
 msgid "Mark Set"
 msgstr "Marca Establida"
 
-#: nano.c:527
+#: nano.c:531
 msgid "Mark UNset"
 msgstr "Marca Esborrada"
 
-#: nano.c:1029
+#: nano.c:1033
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap cridat amb inptr->data=\"%s\"\n"
 
-#: nano.c:1081
+#: nano.c:1085
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data ara = \"%d\"\n"
 
-#: nano.c:1133
+#: nano.c:1137
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Després, data = \"%s\"\n"
 
-#: nano.c:1234
+#: nano.c:1238
 msgid "Edit a replacement"
 msgstr "Editar un reemplaçament"
 
-#: nano.c:1463
+#: nano.c:1468
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "No s'ha pogut crear un fitxer temporal: %s"
 
-#: nano.c:1469
+#: nano.c:1474
 msgid "Spell checking failed: unable to write temp file!"
 msgstr "Revisió d'ortografia fallida: no s'ha pogut escriure fitxer temporal!"
 
-#: nano.c:1481
+#: nano.c:1486
 msgid "Finished checking spelling"
 msgstr "Revisió d'ortografia finalitzada"
 
-#: nano.c:1483
+#: nano.c:1488
 msgid "Spell checking failed"
 msgstr "Revisió d'ortografia fallida"
 
-#: nano.c:1502
+#: nano.c:1507
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Desar el buffer modificat (RESPONDRE \"No\" DESTRUIRÀ ELS CAMVIS) ?"
 
-#: nano.c:1619
+#: nano.c:1624
 msgid "Received SIGHUP"
 msgstr "SIGHUP rebut"
 
-#: nano.c:1682
+#: nano.c:1687
 msgid "Cannot resize top win"
 msgstr "No es pot canviar la mida de la finestra superior"
 
-#: nano.c:1684
+#: nano.c:1689
 msgid "Cannot move top win"
 msgstr "No es pot moure la finestra superior"
 
-#: nano.c:1686
+#: nano.c:1691
 msgid "Cannot resize edit win"
 msgstr "No es pot canviar la mida de la finestra d'edició"
 
-#: nano.c:1688
+#: nano.c:1693
 msgid "Cannot move edit win"
 msgstr "No es pot moure la finestra d'edició"
 
-#: nano.c:1690
+#: nano.c:1695
 msgid "Cannot resize bottom win"
 msgstr "No es pot canviar la mida de la finestra inferior"
 
-#: nano.c:1692
+#: nano.c:1697
 msgid "Cannot move bottom win"
 msgstr "No es pot moure la finestra inferior"
 
-#: nano.c:2001
+#: nano.c:2006
 msgid "Can now UnJustify!"
 msgstr "Ara pots desjustificar!"
 
-#: nano.c:2099
+#: nano.c:2104
 #, c-format
 msgid "%s enable/disable"
 msgstr "%s habilitar/inhabilitar"
 
-#: nano.c:2114
+#: nano.c:2119
 msgid "enabled"
 msgstr "habilitat"
 
-#: nano.c:2115
+#: nano.c:2120
 msgid "disabled"
 msgstr "inhabilitat"
 
-#: nano.c:2168
+#: nano.c:2173
 msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 msgstr ""
 "Detectat NumLock trencat.  El tecl. numèric funcionarà amb NumLock activat"
 
-#: nano.c:2396
+#: nano.c:2405
 msgid "Main: set up windows\n"
 msgstr "Main: configurar les finestres\n"
 
-#: nano.c:2403
+#: nano.c:2416
 msgid "Main: bottom win\n"
 msgstr "Main: finestra inferior\n"
 
-#: nano.c:2409
+#: nano.c:2422
 msgid "Main: open file\n"
 msgstr "Main: obrir fitxer\n"
 
-#: nano.c:2464
+#: nano.c:2478
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "He agafat Alt-O-%c! (%d)\n"
 
-#: nano.c:2491
+#: nano.c:2505
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "He agafat Alt-[-1-%c! (%d)\n"
 
-#: nano.c:2524
+#: nano.c:2538
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "He agafat Alt-[-2-%c! (%d)\n"
 
-#: nano.c:2566
+#: nano.c:2584
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "He agafat Alt-[-%c! (%d)\n"
 
-#: nano.c:2592
+#: nano.c:2610
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "He agafat Alt-%c! (%d)\n"
 
-#: search.c:117
+#: search.c:118
 #, c-format
 msgid "Case Sensitive Regexp Search%s%s"
 msgstr "Recerca amb Regexp i Majúscules/Minúscules%s%s"
 
-#: search.c:119
+#: search.c:120
 #, c-format
 msgid "Regexp Search%s%s"
 msgstr "Recerca amb Regexp%s%s"
 
-#: search.c:121
+#: search.c:122
 #, c-format
 msgid "Case Sensitive Search%s%s"
 msgstr "Recerca amb Regexp i Majúscules/Minúscules%s%s"
 
-#: search.c:123
+#: search.c:124
 #, c-format
 msgid "Search%s%s"
 msgstr "Cercar%s%s"
 
-#: search.c:126
+#: search.c:127
 msgid " (to replace)"
 msgstr " (a reemplaçar)"
 
-#: search.c:135 search.c:326
+#: search.c:136 search.c:327
 msgid "Search Cancelled"
 msgstr "Recerca Cancel·lada"
 
-#: search.c:199
+#: search.c:200
 #, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s...\" no trobat"
 
-#: search.c:248
+#: search.c:249
 msgid "Search Wrapped"
 msgstr "Recerca Recomençada"
 
-#: search.c:348
+#: search.c:349
 #, c-format
 msgid "Replaced %d occurrences"
 msgstr "%d ocurrències reemplaçadas"
 
-#: search.c:350
+#: search.c:351
 msgid "Replaced 1 occurrence"
 msgstr "1 ocurrència reemplaçada"
 
-#: search.c:488 search.c:592 search.c:608
+#: search.c:489 search.c:599 search.c:615
 msgid "Replace Cancelled"
 msgstr "Reemplaçar Cancel·lat"
 
-#: search.c:538
+#: search.c:539
 msgid "Replace this instance?"
 msgstr "Reemplaçar aquesta instància?"
 
-#: search.c:550
+#: search.c:551
 msgid "Replace failed: unknown subexpression!"
 msgstr "Impossible de reemplaçar: subexpressió desconeguda!"
 
-#: search.c:633
+#: search.c:640
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Reemplaçar amb [%s]"
 
-#: search.c:637 search.c:641
+#: search.c:644 search.c:648
 msgid "Replace with"
 msgstr "Reemplaçar amb"
 
-#. Ask for it
-#: search.c:676
+#: search.c:682
 msgid "Enter line number"
 msgstr "Introdueix número de línia"
 
-#: search.c:678
+#: search.c:684
 msgid "Aborted"
 msgstr "Avortat"
 
-#: search.c:698
+#: search.c:693
 msgid "Come on, be reasonable"
 msgstr "Au vinga, sigues assenyat"
 
-#: search.c:703
-#, c-format
-msgid "Only %d lines available, skipping to last line"
-msgstr "Només hi ha %d línies, ometent fins al final"
-
-#: winio.c:123
+#: winio.c:124
 #, c-format
 msgid "actual_x_from_start for xplus=%d returned %d\n"
 msgstr "actual_x_from_start per a xplus=%d ha retornat %d\n"
 
-#: winio.c:279
+#: winio.c:288
 #, fuzzy, c-format
 msgid "Aha! '%c' (%d)\n"
 msgstr "entrada '%c' (%d)\n"
 
-#: winio.c:461
+#: winio.c:470
 #, c-format
 msgid "input '%c' (%d)\n"
 msgstr "entrada '%c' (%d)\n"
 
-#: winio.c:503
+#: winio.c:519
 msgid "New Buffer"
 msgstr "Nou Buffer"
 
-#: winio.c:507
+#: winio.c:523
 msgid "  File: ..."
 msgstr "Fitxer: ..."
 
-#: winio.c:509
+#: winio.c:525
 msgid "   DIR: ..."
 msgstr "   DIR: ..."
 
-#: winio.c:520
+#: winio.c:536
 msgid "Modified"
 msgstr "Modificat"
 
-#: winio.c:972
+#: winio.c:1078
 #, c-format
 msgid "Moved to (%d, %d) in edit buffer\n"
 msgstr "Mogut a (%d, %d) a buffer d'edició\n"
 
-#: winio.c:983
+#: winio.c:1089
 #, c-format
 msgid "current->data = \"%s\"\n"
 msgstr "current->data = \"%s\"\n"
 
-#: winio.c:1028
+#: winio.c:1146
 #, c-format
 msgid "I got \"%s\"\n"
 msgstr "He aconseguit \"%s\"\n"
@@ -967,80 +961,83 @@ msgstr "He aconseguit \"%s\"\n"
 #. Yes, no and all are strings of any length.  Each string consists of
 #. all characters accepted as a valid character for that value.
 #. The first value will be the one displayed in the shortcuts.
-#: winio.c:1057
+#: winio.c:1175
 msgid "Yy"
 msgstr "Ss"
 
-#: winio.c:1058
+#: winio.c:1176
 msgid "Nn"
 msgstr "Nn"
 
-#: winio.c:1059
+#: winio.c:1177
 msgid "Aa"
 msgstr "Tt"
 
-#: winio.c:1072
+#: winio.c:1191
 msgid "Yes"
 msgstr "Sí"
 
-#: winio.c:1076
+#: winio.c:1195
 msgid "All"
 msgstr "Totes"
 
-#: winio.c:1081
+#: winio.c:1200
 msgid "No"
 msgstr "No"
 
-#: winio.c:1257
+#: winio.c:1400
 #, c-format
 msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
-#: winio.c:1261
+#: winio.c:1404
 #, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "línia %d de %d (%.0f%%), caràcter %d de %d (%.0f%%)"
 
-#: winio.c:1402
+#: winio.c:1545
 msgid "Dumping file buffer to stderr...\n"
 msgstr "Abocant buffer de fitxer a stderr...\n"
 
-#: winio.c:1404
+#: winio.c:1547
 msgid "Dumping cutbuffer to stderr...\n"
 msgstr "Abocant el cutbuffer a stderr...\n"
 
-#: winio.c:1406
+#: winio.c:1549
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Abocant un buffer a stderr...\n"
 
-#: winio.c:1481
+#: winio.c:1624
 msgid "The nano text editor"
 msgstr "L'editor de textos GNU nano"
 
-#: winio.c:1482
+#: winio.c:1625
 msgid "version "
 msgstr "versió "
 
-#: winio.c:1483
+#: winio.c:1626
 msgid "Brought to you by:"
 msgstr "Per cortesia de:"
 
-#: winio.c:1484
+#: winio.c:1627
 msgid "Special thanks to:"
 msgstr "Agraïments especials per a:"
 
-#: winio.c:1485
+#: winio.c:1628
 msgid "The Free Software Foundation"
 msgstr "La Fundació per al Software Lliure (FSF)"
 
-#: winio.c:1486
+#: winio.c:1629
 msgid "Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurses"
 msgstr "Pavel Curtis, Zeyd Ben-Halim i Eric S. Raymond per ncurses"
 
-#: winio.c:1487
+#: winio.c:1630
 msgid "and anyone else we forgot..."
 msgstr "i per qualsevol dels qui ens hem oblidat esmentar..."
 
-#: winio.c:1488
+#: winio.c:1631
 msgid "Thank you for using nano!\n"
 msgstr "Gràcies per fer servir nano!\n"
+
+#~ msgid "Only %d lines available, skipping to last line"
+#~ msgstr "Només hi ha %d línies, ometent fins al final"
diff --git a/po/cs.po b/po/cs.po
index 638f249e..d2a46b3a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,442 +6,442 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0.0\n"
-"POT-Creation-Date: 2001-04-18 18:10-0400\n"
+"POT-Creation-Date: 2001-04-30 09:44-0400\n"
 "Last-Translator: Václav Haisman <V.Haisman@sh.cvut.cz>\n"
 "Language-Team: N/A\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: cut.c:44
+#: cut.c:45
 #, c-format
 msgid "add_to_cutbuffer called with inptr->data = %s\n"
 msgstr "add_to_cutbuffer voláno s inptr->data = %s\n"
 
-#: cut.c:150
+#: cut.c:151
 msgid "Blew away cutbuffer =)\n"
 msgstr "Blew away cutbuffer =)\n"
 
-#: files.c:123
+#: files.c:124
 msgid "read_line: not on first line and prev is NULL"
 msgstr "read_line: nejsme na první øádce a pøedchozí je NULL"
 
-#: files.c:185 files.c:203
+#: files.c:186 files.c:204
 #, c-format
 msgid "Read %d lines"
 msgstr "Pøeèteno %d øádek"
 
-#: files.c:221 search.c:193
+#: files.c:222 search.c:194
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" nenalezen"
 
 #. We have a new file
-#: files.c:225
+#: files.c:226
 msgid "New File"
 msgstr "Nový Soubor"
 
-#: files.c:238
+#: files.c:239
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr "Soubor \"%s\" je adresáø"
 
 #. Don't open character or block files.  Sorry, /dev/sndstat!
-#: files.c:241
+#: files.c:242
 #, fuzzy, c-format
 msgid "File \"%s\" is a device file"
 msgstr "Soubor \"%s\" je soubor zaøízení"
 
-#: files.c:248
+#: files.c:249
 msgid "Reading File"
 msgstr "Ètu Soubor"
 
-#: files.c:264
+#: files.c:265
 msgid "File to insert [from ./] "
 msgstr "Soubor pro vlo¾ení [z ./] "
 
-#: files.c:313 files.c:338 files.c:574 nano.c:1515
+#: files.c:314 files.c:339 files.c:575 nano.c:1520
 msgid "Cancelled"
 msgstr "Zru¹eno"
 
-#: files.c:384 files.c:400 files.c:414 files.c:431 files.c:437
+#: files.c:385 files.c:401 files.c:415 files.c:432 files.c:438
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Nemohu otevøít soubor pro zápis: %s"
 
-#: files.c:419
+#: files.c:420
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Zapsáno >%s\n"
 
-#: files.c:446
+#: files.c:447
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Nemohu zavøít %s: %s"
 
 #. Try a rename??
-#: files.c:469 files.c:478 files.c:483
+#: files.c:470 files.c:479 files.c:484
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Nemohu otevøít %s pro zápis: %s"
 
-#: files.c:490
+#: files.c:491
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Nemohu nastavit pøístupvá práva %o na %s: %s"
 
-#: files.c:495
+#: files.c:496
 #, c-format
 msgid "Wrote %d lines"
 msgstr "Zapsáno %d øádek"
 
-#: files.c:530
+#: files.c:531
 msgid "File Name to write"
 msgstr "Jméno Souboru pro zapsání"
 
-#: files.c:549
+#: files.c:550
 #, c-format
 msgid "filename is %s"
 msgstr "jméno souboru je %s"
 
-#: files.c:563
+#: files.c:564
 msgid "File exists, OVERWRITE ?"
 msgstr "Soubor existuje, PØEPSAT ?"
 
-#: files.c:985
+#: files.c:986
 msgid "(more)"
 msgstr "(více)"
 
-#: files.c:1256
+#: files.c:1257
 msgid "Can't move up a directory"
 msgstr "Nemohu se pøesunout o adresáø vý¹e"
 
 #. We can't open this dir for some reason.  Complain
-#: files.c:1266 files.c:1314
+#: files.c:1267 files.c:1315
 #, fuzzy, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "Nemohu zavøít %s: %s"
 
-#: files.c:1294 global.c:227
+#: files.c:1295 global.c:232
 #, fuzzy
 msgid "Goto Directory"
 msgstr "Jdi na Øádku"
 
-#: files.c:1299
+#: files.c:1300
 #, fuzzy
 msgid "Goto Cancelled"
 msgstr "Zru¹eno"
 
-#: global.c:139
+#: global.c:144
 #, fuzzy
 msgid "Constant cursor position"
 msgstr "Konstantní pozice kurzoru"
 
-#: global.c:140
+#: global.c:145
 msgid "Auto indent"
 msgstr "Automatické odsazení"
 
-#: global.c:141
+#: global.c:146
 msgid "Suspend"
 msgstr "Zastavit"
 
-#: global.c:142
+#: global.c:147
 msgid "Help mode"
 msgstr "Nápovìdný mód"
 
-#: global.c:143
+#: global.c:148
 msgid "Pico mode"
 msgstr "Pico mód"
 
-#: global.c:144
+#: global.c:149
 msgid "Mouse support"
 msgstr "Podpora my¹i"
 
-#: global.c:145
+#: global.c:150
 msgid "Cut to end"
 msgstr "Vyjmout do konce"
 
-#: global.c:147
+#: global.c:152
 msgid "Regular expressions"
 msgstr "Regulární výrazy"
 
-#: global.c:149
+#: global.c:154
 msgid "Auto wrap"
 msgstr "Automatické zalamování"
 
-#: global.c:194
+#: global.c:199
 msgid "Invoke the help menu"
 msgstr "Vyvolat menu nápovìdy"
 
-#: global.c:195
+#: global.c:200
 msgid "Write the current file to disk"
 msgstr "Zapsat aktuální soubor na disk"
 
-#: global.c:196
+#: global.c:201
 msgid "Exit from nano"
 msgstr "Ukonèit nano"
 
-#: global.c:197
+#: global.c:202
 #, fuzzy
 msgid "Goto a specific line number"
 msgstr "Jdi na øádku"
 
-#: global.c:198
+#: global.c:203
 msgid "Justify the current paragraph"
 msgstr "Zarovnej aktuální odstavec"
 
-#: global.c:199
+#: global.c:204
 msgid "Unjustify after a justify"
 msgstr "Zru¹ pøedchozí zarovnání"
 
-#: global.c:200
+#: global.c:205
 msgid "Replace text within the editor"
 msgstr "Zamìn text v editoru"
 
-#: global.c:201
+#: global.c:206
 msgid "Insert another file into the current one"
 msgstr "Vlo¾ soubor do aktuálního souboru"
 
-#: global.c:202
+#: global.c:207
 msgid "Search for text within the editor"
 msgstr "Hledej text v editoru"
 
-#: global.c:203
+#: global.c:208
 msgid "Move to the previous screen"
 msgstr "Pøesuò se na pøedchozí obrazovku"
 
-#: global.c:204
+#: global.c:209
 msgid "Move to the next screen"
 msgstr "Pøesuò se na dal¹í obrazovku"
 
-#: global.c:205
+#: global.c:210
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Vyjmi aktuální øádku a ulo¾ ji v cutbufferu"
 
-#: global.c:206
+#: global.c:211
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Vlo¾ z cutbufferu do aktuální øádky"
 
-#: global.c:207
+#: global.c:212
 msgid "Show the posititon of the cursor"
 msgstr "Uka¾ pozici kurzoru"
 
-#: global.c:208
+#: global.c:213
 msgid "Invoke the spell checker (if available)"
 msgstr "Vyvolej kontrolu pravopisu (pokud je k dispozici)"
 
-#: global.c:209
+#: global.c:214
 msgid "Move up one line"
 msgstr "Pøesun o rádek nahoru"
 
-#: global.c:210
+#: global.c:215
 msgid "Move down one line"
 msgstr "Pøesun o øádek dolu"
 
-#: global.c:211
+#: global.c:216
 msgid "Move forward one character"
 msgstr "Pøesun o znak dopøedu"
 
-#: global.c:212
+#: global.c:217
 msgid "Move back one character"
 msgstr "Pøesun o znak zpìt"
 
-#: global.c:213
+#: global.c:218
 msgid "Move to the beginning of the current line"
 msgstr "Pøesun na zaèátek aktuální øádky"
 
-#: global.c:214
+#: global.c:219
 msgid "Move to the end of the current line"
 msgstr "Pøesun na konec aktuální øádky"
 
-#: global.c:215
+#: global.c:220
 msgid "Go to the first line of the file"
 msgstr "Pøesun na první øádku souboru"
 
-#: global.c:216
+#: global.c:221
 msgid "Go to the last line of the file"
 msgstr "Pøesun na poslední øádku souboru"
 
-#: global.c:217
+#: global.c:222
 msgid "Refresh (redraw) the current screen"
 msgstr "Obnov (pøekresli) obrazovku"
 
-#: global.c:218
+#: global.c:223
 msgid "Mark text at the current cursor location"
 msgstr "Oznaè text na souèasné pozici kurzoru"
 
-#: global.c:219
+#: global.c:224
 msgid "Delete the character under the cursor"
 msgstr "Sma¾ znak pod kurzorem"
 
-#: global.c:221
+#: global.c:226
 msgid "Delete the character to the left of the cursor"
 msgstr "Sma¾ znak nalevo od kurzoru"
 
-#: global.c:222
+#: global.c:227
 msgid "Insert a tab character"
 msgstr "Vlo¾ znak tabulátoru"
 
-#: global.c:223
+#: global.c:228
 msgid "Insert a carriage return at the cursor position"
 msgstr "Vlo¾ konec øádky na pozici kurzoru"
 
-#: global.c:225
+#: global.c:230
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "(Ne)rozly¹uj malá/VELKÁ písmena v souèasném vyhledávání nebo zámìnì"
 
-#: global.c:226
+#: global.c:231
 msgid "Go to file browser"
 msgstr "Jdi do prohlí¾eè souborù"
 
-#: global.c:228
+#: global.c:233
 msgid "Cancel the current function"
 msgstr "Zru¹ aktuální funkci"
 
-#: global.c:231
+#: global.c:236
 msgid "Get Help"
 msgstr "Nápovìda"
 
-#: global.c:234 global.c:415 global.c:442
+#: global.c:239 global.c:420 global.c:447
 msgid "Exit"
 msgstr "Konec"
 
-#: global.c:237
+#: global.c:242
 msgid "WriteOut"
 msgstr "Zapi¹"
 
-#: global.c:242 global.c:331
+#: global.c:247 global.c:336
 msgid "Justify"
 msgstr "Zarovnání"
 
-#: global.c:246 global.c:252
+#: global.c:251 global.c:257
 #, fuzzy
 msgid "Read File"
 msgstr "Èíst Soubor"
 
-#: global.c:256 global.c:327 global.c:355
+#: global.c:261 global.c:332 global.c:360
 #, fuzzy
 msgid "Replace"
 msgstr "Zámìna"
 
-#: global.c:260
+#: global.c:265
 msgid "Where Is"
 msgstr "Kde Je"
 
-#: global.c:264 global.c:407 global.c:431
+#: global.c:269 global.c:412 global.c:436
 msgid "Prev Page"
 msgstr "Pøedchozí Strana"
 
-#: global.c:268 global.c:411 global.c:435
+#: global.c:273 global.c:416 global.c:440
 msgid "Next Page"
 msgstr "Dal¹í Strana"
 
-#: global.c:272
+#: global.c:277
 msgid "Cut Text"
 msgstr "Vyjmi Text"
 
-#: global.c:276
+#: global.c:281
 msgid "UnJustify"
 msgstr "OdZarovnej"
 
-#: global.c:279
+#: global.c:284
 msgid "UnCut Txt"
 msgstr "Zru¹ vyjmutí textu"
 
-#: global.c:283
+#: global.c:288
 msgid "Cur Pos"
 msgstr "Pozice Kurzoru"
 
-#: global.c:287
+#: global.c:292
 msgid "To Spell"
 msgstr "Pravopis"
 
-#: global.c:291
+#: global.c:296
 msgid "Up"
 msgstr "Nahoru"
 
-#: global.c:294
+#: global.c:299
 msgid "Down"
 msgstr "Dolu"
 
-#: global.c:297
+#: global.c:302
 msgid "Forward"
 msgstr "Dopøedu"
 
-#: global.c:300
+#: global.c:305
 msgid "Back"
 msgstr "Zpìt"
 
-#: global.c:303
+#: global.c:308
 msgid "Home"
 msgstr "Domù"
 
-#: global.c:306
+#: global.c:311
 msgid "End"
 msgstr "Konec"
 
-#: global.c:309
+#: global.c:314
 msgid "Refresh"
 msgstr "Obnov"
 
-#: global.c:312
+#: global.c:317
 #, fuzzy
 msgid "Mark Text"
 msgstr "Oznaè Text"
 
-#: global.c:315
+#: global.c:320
 msgid "Delete"
 msgstr "Zma¾"
 
-#: global.c:319
+#: global.c:324
 msgid "Backspace"
 msgstr "Backspace"
 
-#: global.c:323
+#: global.c:328
 msgid "Tab"
 msgstr "Tab"
 
-#: global.c:335
+#: global.c:340
 msgid "Enter"
 msgstr "Enter"
 
-#: global.c:339 global.c:359 global.c:379
+#: global.c:344 global.c:364 global.c:384
 msgid "Goto Line"
 msgstr "Jdi na Øádku"
 
-#: global.c:345 global.c:366 global.c:387 global.c:397
+#: global.c:350 global.c:371 global.c:392 global.c:402
 msgid "First Line"
 msgstr "První Øádka"
 
-#: global.c:348 global.c:369 global.c:390 global.c:400
+#: global.c:353 global.c:374 global.c:395 global.c:405
 msgid "Last Line"
 msgstr "Poslední Øádka"
 
-#: global.c:351 global.c:372
+#: global.c:356 global.c:377
 msgid "Case Sens"
 msgstr "Case Sens"
 
-#: global.c:362 global.c:382 global.c:393 global.c:403 global.c:424
-#: global.c:427 global.c:445 winio.c:1083
+#: global.c:367 global.c:387 global.c:398 global.c:408 global.c:429
+#: global.c:432 global.c:450 winio.c:1202
 msgid "Cancel"
 msgstr "Storno"
 
-#: global.c:375
+#: global.c:380
 #, fuzzy
 msgid "No Replace"
 msgstr "Bez zámìny"
 
-#: global.c:420
+#: global.c:425
 #, fuzzy
 msgid "To Files"
 msgstr "K Souborùm"
 
-#: global.c:439
+#: global.c:444
 #, fuzzy
 msgid "Goto"
 msgstr "Jdi na Øádku"
 
-#: nano.c:136
+#: nano.c:137
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -450,7 +450,7 @@ msgstr ""
 "\n"
 "Buffer zapsán do %s\n"
 
-#: nano.c:138
+#: nano.c:139
 #, c-format
 msgid ""
 "\n"
@@ -459,15 +459,15 @@ msgstr ""
 "\n"
 "No %s written (file exists?)\n"
 
-#: nano.c:147
+#: nano.c:148
 msgid "Window size is too small for Nano..."
 msgstr "Okno je moc malé pro Nano..."
 
-#: nano.c:155
+#: nano.c:156
 msgid "Key illegal in VIEW mode"
 msgstr "Klávesa nepøípustná v PROHLÍ®ECÍM re¾imu"
 
-#: nano.c:199
+#: nano.c:200
 msgid ""
 " nano help text\n"
 "\n"
@@ -480,9 +480,9 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
-"key sequences are notated with the Meta (M) symbol and can be entered using "
-"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
+"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
+"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
@@ -502,17 +502,17 @@ msgstr ""
 "nastavenou klávesnici. Následující klávesy jsou dostupné v hlavním oknì "
 "editoru. Náhradní klávesy jsou v závorkách:\n"
 
-#: nano.c:293
+#: nano.c:294
 #, fuzzy
 msgid "delete_node(): free'd a node, YAY!\n"
 msgstr "delete_node(): uzel uvolnìn, YAY!\n"
 
-#: nano.c:298
+#: nano.c:299
 #, fuzzy
 msgid "delete_node(): free'd last node.\n"
 msgstr "delete_node(): poslední uzel uvolnìn.\n"
 
-#: nano.c:353
+#: nano.c:354
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
@@ -520,86 +520,86 @@ msgstr ""
 "Pou¾ití: nano [GNU dlouhá volba] [volba] +ØÁDEK <soubor>\n"
 "\n"
 
-#: nano.c:354
+#: nano.c:355
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Volba\t\tDlouhá volba\t\tSmysl\n"
 
-#: nano.c:356
+#: nano.c:357
 msgid " -T [num]\t--tabsize=[num]\t\tSet width of a tab to num\n"
 msgstr "-T [èís]\t--tabsize=[èís]\t\tNastav ¹íøku tabulátoru na èís\n"
 
-#: nano.c:359
+#: nano.c:360
 msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
 msgstr " -R\t\t--regexp\t\tPro vyhledávání pou¾ij regulární výraz\n"
 
-#: nano.c:363
+#: nano.c:364
 msgid " -V \t\t--version\t\tPrint version information and exit\n"
 msgstr " -V \t\t--version\t\tVypi¹ informace o verzi a skonèi\n"
 
-#: nano.c:365
+#: nano.c:366
 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
 msgstr " -c \t\t--const\t\t\tStále ukazuj pozici kurzoru\n"
 
-#: nano.c:367
+#: nano.c:368
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr " -h \t\t--help\t\t\tUka¾ tuto zpráva\n"
 
-#: nano.c:369
+#: nano.c:370
 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
 msgstr " -i \t\t--autoindent\t\tAutomaticky odsazuj nové øádky\n"
 
-#: nano.c:372
+#: nano.c:373
 msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
 msgstr " -k \t\t--cut\t\t\tNech ^K vyjímat od kurzoru do konce øádky\n"
 
-#: nano.c:375
+#: nano.c:376
 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite\n"
 msgstr " -l \t\t--nofollow\t\tNenásleduj symbolické odkazy, pøepi¹ je\n"
 
-#: nano.c:378
+#: nano.c:379
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr " -m \t\t--mouse\t\t\tPovol my¹\n"
 
-#: nano.c:382
+#: nano.c:383
 msgid " -p\t \t--pico\t\t\tEmulate Pico as closely as possible\n"
 msgstr " -p\t \t--pico\t\t\tNapodobuj Pico tak, jak jen to jde\n"
 
-#: nano.c:385
+#: nano.c:386
 msgid ""
 " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
 msgstr ""
 " -r [#sloupce] \t--fill=[#sloupce]\t\tNastav vyplnìné sloupce na (zalom "
 "øádky na) #sloupce\n"
 
-#: nano.c:388
+#: nano.c:389
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr " -s [program] \t--speller=[program]\tPou¾ij jiný kontroler pravopisu\n"
 
-#: nano.c:391
+#: nano.c:392
 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\t--tempfile\t\tAutomaticky ulo¾ pøi ukonèení, nedotazuj se\n"
 
-#: nano.c:393
+#: nano.c:394
 msgid " -v \t\t--view\t\t\tView (read only) mode\n"
 msgstr " -t \t\t--view\t\t\tPROHLÍ®ECÍ re¾im (pouze pro ètení)\n"
 
-#: nano.c:396
+#: nano.c:397
 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
 msgstr " -w \t\t--nowrap\t\tNezalamuj dlouhé øádky\n"
 
-#: nano.c:399
+#: nano.c:400
 msgid " -x \t\t--nohelp\t\tDon't show help window\n"
 msgstr " -x \t\t--nohelp\t\tNeukazuj okno nápovìdy\n"
 
-#: nano.c:401
+#: nano.c:402
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr " -z \t\t--suspend\t\tPovol zastavení\n"
 
-#: nano.c:403
+#: nano.c:404
 msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
 msgstr " +ØÁDKA\t\t\t\t\tZaèni na øádce èíslo ØÁDKA\n"
 
-#: nano.c:405
+#: nano.c:406
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
@@ -607,94 +607,94 @@ msgstr ""
 "Pou¾ití: nano [volba] +ØÁDKA <soubor>\n"
 "\n"
 
-#: nano.c:406
+#: nano.c:407
 msgid "Option\t\tMeaning\n"
 msgstr "Volba\t\tSmysl\n"
 
-#: nano.c:407
+#: nano.c:408
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr " -T [èís]\tNastav velikost tab na èís\n"
 
-#: nano.c:408
+#: nano.c:409
 msgid " -R\t\tUse regular expressions for search\n"
 msgstr " -R\t\tPou¾ívej pro vyhledávání regulární výrazy\n"
 
-#: nano.c:409
+#: nano.c:410
 msgid " -V \t\tPrint version information and exit\n"
 msgstr " -V \t\tVypi¹ informace o verzi a skonèi\n"
 
-#: nano.c:410
+#: nano.c:411
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr " -c \t\tStále ukazuj pozici kurzoru\n"
 
-#: nano.c:411
+#: nano.c:412
 msgid " -h \t\tShow this message\n"
 msgstr " -h \t\tUka¾ tuto zprávu\n"
 
-#: nano.c:412
+#: nano.c:413
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr " -i \t\tAutomaticky odsazuj nové øádky\n"
 
-#: nano.c:414
+#: nano.c:415
 msgid " -k \t\tLet ^K cut from cursor to end of line\n"
 msgstr " -k \t\tNech ^K vyjímat od kurzoru do konce øádky\n"
 
-#: nano.c:417
+#: nano.c:418
 msgid " -l \t\tDon't follow symbolic links, overwrite\n"
 msgstr " -l \t\tNenásleduj symbolické odkazy, pøepi¹ je\n"
 
-#: nano.c:420
+#: nano.c:421
 msgid " -m \t\tEnable mouse\n"
 msgstr " -m \t\tPovol my¹\n"
 
-#: nano.c:423
+#: nano.c:424
 msgid " -p \t\tEmulate Pico as closely as possible\n"
 msgstr " -p \t\tNapodobuj Pico tak, jak jen to jde\n"
 
-#: nano.c:425
+#: nano.c:426
 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
 msgstr ""
 " -r [#sloupce] \tNastav vyplnìné sloupce na (zalom øádky na) #sloupce\n"
 
-#: nano.c:427
+#: nano.c:428
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr " -s [program]  \tPou¾ij jiný kontroler pravopisu\n"
 
-#: nano.c:429
+#: nano.c:430
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\tAutomaticky ulo¾ pøi ukonèení, nedotazuj se\n"
 
-#: nano.c:430
+#: nano.c:431
 msgid " -v \t\tView (read only) mode\n"
 msgstr " -v \t\tPROHLÍ®ECÍ re¾im (pouze pro ètení)\n"
 
-#: nano.c:432
+#: nano.c:433
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr " -w \t\tNezalamuj dlouhé øádky\n"
 
-#: nano.c:434
+#: nano.c:435
 msgid " -x \t\tDon't show help window\n"
 msgstr " -x \t\tNeukazuj okno pomoci\n"
 
-#: nano.c:435
+#: nano.c:436
 msgid " -z \t\tEnable suspend\n"
 msgstr " -z \t\tPovol zastavení\n"
 
-#: nano.c:436
+#: nano.c:437
 msgid " +LINE\t\tStart at line number LINE\n"
 msgstr " +ØÁDKA\t\tZaèni na øádce ØÁDKA\n"
 
-#: nano.c:443
+#: nano.c:444
 #, fuzzy, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano verze %s (kompilováno %s, %s)\n"
 
-#: nano.c:446
+#: nano.c:447
 #, fuzzy
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 msgstr " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 
-#: nano.c:447
+#: nano.c:448
 msgid ""
 "\n"
 " Compiled options:"
@@ -702,271 +702,265 @@ msgstr ""
 "\n"
 " Skompilované volby:"
 
-#: nano.c:522
+#: nano.c:526
 msgid "Mark Set"
 msgstr "Znaèka Nastavena"
 
-#: nano.c:527
+#: nano.c:531
 msgid "Mark UNset"
 msgstr "Znaèka OdNastavena"
 
-#: nano.c:1029
+#: nano.c:1033
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap zavoláno s inptr->data=\"%s\"\n"
 
-#: nano.c:1081
+#: nano.c:1085
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data nyní = \"%s\"\n"
 
-#: nano.c:1133
+#: nano.c:1137
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Poté, data = \"%s\"\n"
 
-#: nano.c:1234
+#: nano.c:1238
 msgid "Edit a replacement"
 msgstr "Edituj náhradu"
 
-#: nano.c:1463
+#: nano.c:1468
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Nemohu vytvoøit doèasný soubor: %s"
 
-#: nano.c:1469
+#: nano.c:1474
 msgid "Spell checking failed: unable to write temp file!"
 msgstr "Kontrola pravopisu selhala: nemohu zapisovat do doèasného souboru!"
 
-#: nano.c:1481
+#: nano.c:1486
 msgid "Finished checking spelling"
 msgstr "Kontrola pravopisu dokonèena"
 
-#: nano.c:1483
+#: nano.c:1488
 msgid "Spell checking failed"
 msgstr "Kontrola pravopisu selhala"
 
-#: nano.c:1502
+#: nano.c:1507
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Ulo¾ zmìnìný buffer (ODPOVÌÏÍ \"Ne\" ZTRATÍTE ZMÌNY) ? "
 
-#: nano.c:1619
+#: nano.c:1624
 msgid "Received SIGHUP"
 msgstr "Pøijat signál SIGHUP"
 
-#: nano.c:1682
+#: nano.c:1687
 msgid "Cannot resize top win"
 msgstr "Nemohu zmìnit velikost vrchního okna"
 
-#: nano.c:1684
+#: nano.c:1689
 msgid "Cannot move top win"
 msgstr "Nemohu pøesunout vrchní okno"
 
-#: nano.c:1686
+#: nano.c:1691
 msgid "Cannot resize edit win"
 msgstr "Nemohu zmìnit velikost editovacího okna"
 
-#: nano.c:1688
+#: nano.c:1693
 msgid "Cannot move edit win"
 msgstr "Nemohu pøesunout editovací okno"
 
-#: nano.c:1690
+#: nano.c:1695
 msgid "Cannot resize bottom win"
 msgstr "Nemohu zmìnit velikost spodního okna"
 
-#: nano.c:1692
+#: nano.c:1697
 msgid "Cannot move bottom win"
 msgstr "Nemohu pøesunout spodní okno"
 
-#: nano.c:2001
+#: nano.c:2006
 msgid "Can now UnJustify!"
 msgstr "Mù¾e nyní OdZarovnat!"
 
-#: nano.c:2099
+#: nano.c:2104
 #, c-format
 msgid "%s enable/disable"
 msgstr "%s povol/zaka¾"
 
-#: nano.c:2114
+#: nano.c:2119
 msgid "enabled"
 msgstr "povoleno"
 
-#: nano.c:2115
+#: nano.c:2120
 msgid "disabled"
 msgstr "zakázáno"
 
-#: nano.c:2168
+#: nano.c:2173
 msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 msgstr ""
 "Zji¹tìna porucha NumLocku.  Numerická klávesnice nebude fungovat s vypnutým "
 "NumLockem"
 
-#: nano.c:2396
+#: nano.c:2405
 msgid "Main: set up windows\n"
 msgstr "Main: nastav okna\n"
 
-#: nano.c:2403
+#: nano.c:2416
 msgid "Main: bottom win\n"
 msgstr "Main: spodní okno\n"
 
-#: nano.c:2409
+#: nano.c:2422
 msgid "Main: open file\n"
 msgstr "Main: otevøi soubor\n"
 
-#: nano.c:2464
+#: nano.c:2478
 #, fuzzy, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "Mám Alt-O-%c! (%d)\n"
 
-#: nano.c:2491
+#: nano.c:2505
 #, fuzzy, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "Mám Alt-[-1-%c! (%d)\n"
 
-#: nano.c:2524
+#: nano.c:2538
 #, fuzzy, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "Mám Alt-[-2-%c! (%d)\n"
 
-#: nano.c:2566
+#: nano.c:2584
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Mám Alt-[-%c! (%d)\n"
 
-#: nano.c:2592
+#: nano.c:2610
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Mám Alt-%c! (%d)\n"
 
-#: search.c:117
+#: search.c:118
 #, fuzzy, c-format
 msgid "Case Sensitive Regexp Search%s%s"
 msgstr "Hledání Pomocí Regexp (rozli¹uj malá/VELKÁ písmena)%s%s"
 
-#: search.c:119
+#: search.c:120
 #, c-format
 msgid "Regexp Search%s%s"
 msgstr "Hledání pomocí Regexp%s%s"
 
-#: search.c:121
+#: search.c:122
 #, fuzzy, c-format
 msgid "Case Sensitive Search%s%s"
 msgstr "Hledání (rozli¹uj malá/VELKÁ písmena)%s%s"
 
-#: search.c:123
+#: search.c:124
 #, c-format
 msgid "Search%s%s"
 msgstr "Hledání"
 
-#: search.c:126
+#: search.c:127
 msgid " (to replace)"
 msgstr " (k zámìnì)"
 
-#: search.c:135 search.c:326
+#: search.c:136 search.c:327
 msgid "Search Cancelled"
 msgstr "Hledání Zru¹eno"
 
-#: search.c:199
+#: search.c:200
 #, fuzzy, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s...\" nenalezen"
 
-#: search.c:248
+#: search.c:249
 msgid "Search Wrapped"
 msgstr "Hledání Zalomeno"
 
-#: search.c:348
+#: search.c:349
 #, fuzzy, c-format
 msgid "Replaced %d occurrences"
 msgstr "Zamìnìno %d výskytù"
 
-#: search.c:350
+#: search.c:351
 #, fuzzy
 msgid "Replaced 1 occurrence"
 msgstr "Zamìnìn 1 výskyt"
 
-#: search.c:488 search.c:592 search.c:608
+#: search.c:489 search.c:599 search.c:615
 msgid "Replace Cancelled"
 msgstr "Zámìna Zru¹ena"
 
-#: search.c:538
+#: search.c:539
 msgid "Replace this instance?"
 msgstr "Zamìnit tuto instanci?"
 
-#: search.c:550
+#: search.c:551
 msgid "Replace failed: unknown subexpression!"
 msgstr "Zámìna selhala: neznámý podvýraz!"
 
-#: search.c:633
+#: search.c:640
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Zamìn s [%s]"
 
-#: search.c:637 search.c:641
+#: search.c:644 search.c:648
 msgid "Replace with"
 msgstr "Zamìn s"
 
-#. Ask for it
-#: search.c:676
+#: search.c:682
 msgid "Enter line number"
 msgstr "Zadej èíslo øádky"
 
-#: search.c:678
+#: search.c:684
 msgid "Aborted"
 msgstr "Pøeru¹eno"
 
-#: search.c:698
+#: search.c:693
 msgid "Come on, be reasonable"
 msgstr "Notak, buï rozumný."
 
-#: search.c:703
-#, c-format
-msgid "Only %d lines available, skipping to last line"
-msgstr "Pouze %d øádek k dispozici, skáèu na poslední øádku"
-
-#: winio.c:123
+#: winio.c:124
 #, fuzzy, c-format
 msgid "actual_x_from_start for xplus=%d returned %d\n"
 msgstr "actual_x_from_start pro xplus=%d vrátilo %d\n"
 
-#: winio.c:279
+#: winio.c:288
 #, fuzzy, c-format
 msgid "Aha! '%c' (%d)\n"
 msgstr "vstup '%c' (%d)\n"
 
-#: winio.c:461
+#: winio.c:470
 #, c-format
 msgid "input '%c' (%d)\n"
 msgstr "vstup '%c' (%d)\n"
 
-#: winio.c:503
+#: winio.c:519
 msgid "New Buffer"
 msgstr "Nový Buffer"
 
-#: winio.c:507
+#: winio.c:523
 msgid "  File: ..."
 msgstr "  Soubor: ..."
 
-#: winio.c:509
+#: winio.c:525
 #, fuzzy
 msgid "   DIR: ..."
 msgstr "   Adresáø: ..."
 
-#: winio.c:520
+#: winio.c:536
 msgid "Modified"
 msgstr "Zmìnìn"
 
-#: winio.c:972
+#: winio.c:1078
 #, c-format
 msgid "Moved to (%d, %d) in edit buffer\n"
 msgstr "Pøesunut na (%d, %d) v editovacím bufferu\n"
 
-#: winio.c:983
+#: winio.c:1089
 #, c-format
 msgid "current->data = \"%s\"\n"
 msgstr "current->data = \"%s\"\n"
 
-#: winio.c:1028
+#: winio.c:1146
 #, c-format
 msgid "I got \"%s\"\n"
 msgstr "Mám \"%s\"\n"
@@ -974,84 +968,87 @@ msgstr "M
 #. Yes, no and all are strings of any length.  Each string consists of
 #. all characters accepted as a valid character for that value.
 #. The first value will be the one displayed in the shortcuts.
-#: winio.c:1057
+#: winio.c:1175
 msgid "Yy"
 msgstr "Aa"
 
-#: winio.c:1058
+#: winio.c:1176
 msgid "Nn"
 msgstr "Nn"
 
-#: winio.c:1059
+#: winio.c:1177
 msgid "Aa"
 msgstr "Vv"
 
-#: winio.c:1072
+#: winio.c:1191
 msgid "Yes"
 msgstr "Ano"
 
-#: winio.c:1076
+#: winio.c:1195
 msgid "All"
 msgstr "V¹e"
 
-#: winio.c:1081
+#: winio.c:1200
 msgid "No"
 msgstr "Ne"
 
-#: winio.c:1257
+#: winio.c:1400
 #, c-format
 msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
-#: winio.c:1261
+#: winio.c:1404
 #, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "øádka %d z %d (%.0f%%), znak %d z %d (%.0f%%)"
 
-#: winio.c:1402
+#: winio.c:1545
 msgid "Dumping file buffer to stderr...\n"
 msgstr "Vyhazuji souborový buffer od stderr...\n"
 
-#: winio.c:1404
+#: winio.c:1547
 msgid "Dumping cutbuffer to stderr...\n"
 msgstr "Vyhazuji cutbuffer do stderr...\n"
 
-#: winio.c:1406
+#: winio.c:1549
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Vyhazuji buffer do stderr...\n"
 
-#: winio.c:1481
+#: winio.c:1624
 msgid "The nano text editor"
 msgstr "Nano texotvý editor"
 
-#: winio.c:1482
+#: winio.c:1625
 msgid "version "
 msgstr "verze "
 
-#: winio.c:1483
+#: winio.c:1626
 msgid "Brought to you by:"
 msgstr "Pøinesen k Vám od:"
 
-#: winio.c:1484
+#: winio.c:1627
 msgid "Special thanks to:"
 msgstr "Speciální díky:"
 
-#: winio.c:1485
+#: winio.c:1628
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: winio.c:1486
+#: winio.c:1629
 msgid "Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurses"
 msgstr "Pavel Curtis, Zeyd Ben-Halim a Eric S. Raymond za ncurses"
 
-#: winio.c:1487
+#: winio.c:1630
 msgid "and anyone else we forgot..."
 msgstr "a komukoliv na koho jsem zapomìli..."
 
-#: winio.c:1488
+#: winio.c:1631
 msgid "Thank you for using nano!\n"
 msgstr "Dìkuji za u¾ívání nano!\n"
 
+#~ msgid "Only %d lines available, skipping to last line"
+#~ msgstr "Pouze %d øádek k dispozici, skáèu na poslední øádku"
+
 #~ msgid "nano: malloc: out of memory!"
 #~ msgstr "nano: malloc: nedostatek pamìti!"
 
diff --git a/po/de.po b/po/de.po
index b02b65cf..94bb469c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.0.0\n"
-"POT-Creation-Date: 2001-04-18 18:10-0400\n"
+"POT-Creation-Date: 2001-04-30 09:44-0400\n"
 "PO-Revision-Date: 2001-02-08 17:56+0200\n"
 "Last-Translator: Florian König <floki@bigfoot.com>\n"
 "Language-Team: German <floki@bigfoot.com>\n"
@@ -15,429 +15,429 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: cut.c:44
+#: cut.c:45
 #, c-format
 msgid "add_to_cutbuffer called with inptr->data = %s\n"
 msgstr "add_to_cutbuffer aufgerufen mit inptr->data = %s\n"
 
-#: cut.c:150
+#: cut.c:151
 msgid "Blew away cutbuffer =)\n"
 msgstr "Inhalt der Zwischenablage verworfen\n"
 
-#: files.c:123
+#: files.c:124
 msgid "read_line: not on first line and prev is NULL"
 msgstr "read_line: nicht in der ersten Zeile und prev ist NULL"
 
-#: files.c:185 files.c:203
+#: files.c:186 files.c:204
 #, c-format
 msgid "Read %d lines"
 msgstr "%d Zeilen gelesen"
 
-#: files.c:221 search.c:193
+#: files.c:222 search.c:194
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" nicht gefunden"
 
 #. We have a new file
-#: files.c:225
+#: files.c:226
 msgid "New File"
 msgstr "Neue Datei"
 
-#: files.c:238
+#: files.c:239
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr "Datei \"%s\" ist ein Verzeichnis"
 
 #. Don't open character or block files.  Sorry, /dev/sndstat!
-#: files.c:241
+#: files.c:242
 #, c-format
 msgid "File \"%s\" is a device file"
 msgstr "Datei \"%s\" ist eine Gerätedatei"
 
-#: files.c:248
+#: files.c:249
 msgid "Reading File"
 msgstr "Lese Datei"
 
-#: files.c:264
+#: files.c:265
 msgid "File to insert [from ./] "
 msgstr "Datei einfügen [von ./] "
 
-#: files.c:313 files.c:338 files.c:574 nano.c:1515
+#: files.c:314 files.c:339 files.c:575 nano.c:1520
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: files.c:384 files.c:400 files.c:414 files.c:431 files.c:437
+#: files.c:385 files.c:401 files.c:415 files.c:432 files.c:438
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Konnte nicht in Datei schreiben: %s"
 
-#: files.c:419
+#: files.c:420
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Schrieb >%s\n"
 
-#: files.c:446
+#: files.c:447
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Konnte %s nicht schließen: %s"
 
 #. Try a rename??
-#: files.c:469 files.c:478 files.c:483
+#: files.c:470 files.c:479 files.c:484
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Konnte %s nicht zum Schreiben öffnen: %s"
 
-#: files.c:490
+#: files.c:491
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Konnte Rechte %o für %s nicht setzen: %s"
 
-#: files.c:495
+#: files.c:496
 #, c-format
 msgid "Wrote %d lines"
 msgstr "%d Zeilen geschrieben"
 
-#: files.c:530
+#: files.c:531
 msgid "File Name to write"
 msgstr "Dateiname zum Speichern"
 
-#: files.c:549
+#: files.c:550
 #, c-format
 msgid "filename is %s"
 msgstr "Dateiname ist %s"
 
-#: files.c:563
+#: files.c:564
 msgid "File exists, OVERWRITE ?"
 msgstr "Datei exisitiert, ÜBERSCHREIBEN ?"
 
-#: files.c:985
+#: files.c:986
 msgid "(more)"
 msgstr "(mehr)"
 
-#: files.c:1256
+#: files.c:1257
 msgid "Can't move up a directory"
 msgstr "Konnte nicht in bergeordnetes Verzeichnis wechseln"
 
 #. We can't open this dir for some reason.  Complain
-#: files.c:1266 files.c:1314
+#: files.c:1267 files.c:1315
 #, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "Konnte \"%s\" nicht öffnen: %s"
 
-#: files.c:1294 global.c:227
+#: files.c:1295 global.c:232
 #, fuzzy
 msgid "Goto Directory"
 msgstr "Zu Zeile"
 
-#: files.c:1299
+#: files.c:1300
 #, fuzzy
 msgid "Goto Cancelled"
 msgstr "Abgebrochen"
 
-#: global.c:139
+#: global.c:144
 msgid "Constant cursor position"
 msgstr "Cursorposition ständig anzeigen"
 
-#: global.c:140
+#: global.c:145
 msgid "Auto indent"
 msgstr "Automatischer Einzug"
 
-#: global.c:141
+#: global.c:146
 msgid "Suspend"
 msgstr "Suspend"
 
-#: global.c:142
+#: global.c:147
 msgid "Help mode"
 msgstr "Hilfe-Modus"
 
-#: global.c:143
+#: global.c:148
 msgid "Pico mode"
 msgstr "Pico-Modus"
 
-#: global.c:144
+#: global.c:149
 msgid "Mouse support"
 msgstr "Mausunterstützung"
 
-#: global.c:145
+#: global.c:150
 msgid "Cut to end"
 msgstr "Bis zum Ende ausschneiden"
 
-#: global.c:147
+#: global.c:152
 msgid "Regular expressions"
 msgstr "Reguläre Ausdrücke"
 
-#: global.c:149
+#: global.c:154
 msgid "Auto wrap"
 msgstr "Automatischer Umbruch"
 
-#: global.c:194
+#: global.c:199
 msgid "Invoke the help menu"
 msgstr "Hilfe-Menü anzeigen"
 
-#: global.c:195
+#: global.c:200
 msgid "Write the current file to disk"
 msgstr "Datei speichern"
 
-#: global.c:196
+#: global.c:201
 msgid "Exit from nano"
 msgstr "nano beenden"
 
-#: global.c:197
+#: global.c:202
 msgid "Goto a specific line number"
 msgstr "Zu einer Zeile springen"
 
-#: global.c:198
+#: global.c:203
 msgid "Justify the current paragraph"
 msgstr "Absatz ausrichten"
 
-#: global.c:199
+#: global.c:204
 msgid "Unjustify after a justify"
 msgstr "Absatzausrochtung rückgängig machen"
 
-#: global.c:200
+#: global.c:205
 msgid "Replace text within the editor"
 msgstr "Text im Editor ersetzen"
 
-#: global.c:201
+#: global.c:206
 msgid "Insert another file into the current one"
 msgstr "Datei einfügen"
 
-#: global.c:202
+#: global.c:207
 msgid "Search for text within the editor"
 msgstr "Im Editor nach Text suchen"
 
-#: global.c:203
+#: global.c:208
 msgid "Move to the previous screen"
 msgstr "Zu der vorhergehenden Seite springen"
 
-#: global.c:204
+#: global.c:209
 msgid "Move to the next screen"
 msgstr "Zu der folgenden Seite springen"
 
-#: global.c:205
+#: global.c:210
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Zeile ausschneiden und in dir Zwischenablage speichern"
 
-#: global.c:206
+#: global.c:211
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Aus der Zwischenablage einfügen"
 
-#: global.c:207
+#: global.c:212
 msgid "Show the posititon of the cursor"
 msgstr "Cursoposition anzeigen"
 
-#: global.c:208
+#: global.c:213
 msgid "Invoke the spell checker (if available)"
 msgstr "Rechtschreibprüfung aufrufen (wenn verfügbar)"
 
-#: global.c:209
+#: global.c:214
 msgid "Move up one line"
 msgstr "Zur vorhergehenden Zeile springen"
 
-#: global.c:210
+#: global.c:215
 msgid "Move down one line"
 msgstr "Zur folgenden Zeile springen"
 
-#: global.c:211
+#: global.c:216
 msgid "Move forward one character"
 msgstr "Zum folgenden Zeichen springen"
 
-#: global.c:212
+#: global.c:217
 msgid "Move back one character"
 msgstr "Zum vorhergehenden Zeichen springen"
 
-#: global.c:213
+#: global.c:218
 msgid "Move to the beginning of the current line"
 msgstr "Zum Zeilenanfang springen"
 
-#: global.c:214
+#: global.c:219
 msgid "Move to the end of the current line"
 msgstr "Zum Zeilenende springen"
 
-#: global.c:215
+#: global.c:220
 msgid "Go to the first line of the file"
 msgstr "Zur ersten Zeile springen"
 
-#: global.c:216
+#: global.c:221
 msgid "Go to the last line of the file"
 msgstr "Zur letzten Zeile springen"
 
-#: global.c:217
+#: global.c:222
 msgid "Refresh (redraw) the current screen"
 msgstr "Bildschirm auffrischen (neu zeichnen)"
 
-#: global.c:218
+#: global.c:223
 msgid "Mark text at the current cursor location"
 msgstr "Text an der derzeitigen Cursorposition markieren"
 
-#: global.c:219
+#: global.c:224
 msgid "Delete the character under the cursor"
 msgstr "Zeichen an der Cursorposition löschen"
 
-#: global.c:221
+#: global.c:226
 msgid "Delete the character to the left of the cursor"
 msgstr "Zeichen links vom Cursor löschen"
 
-#: global.c:222
+#: global.c:227
 msgid "Insert a tab character"
 msgstr "Tabulator einfügen"
 
-#: global.c:223
+#: global.c:228
 msgid "Insert a carriage return at the cursor position"
 msgstr "Zeilenumbruch an der Cursorposition einfügen"
 
-#: global.c:225
+#: global.c:230
 msgid "Make the current search or replace case (in)sensitive"
 msgstr ""
 "Groß- und Kleinschreibung bei Suche oder Erstzen (nicht) berücksichtigen"
 
-#: global.c:226
+#: global.c:231
 msgid "Go to file browser"
 msgstr "Zum Dateibrowser"
 
-#: global.c:228
+#: global.c:233
 msgid "Cancel the current function"
 msgstr "Funktion abbrechen"
 
-#: global.c:231
+#: global.c:236
 msgid "Get Help"
 msgstr "Hilfe"
 
-#: global.c:234 global.c:415 global.c:442
+#: global.c:239 global.c:420 global.c:447
 msgid "Exit"
 msgstr "Beenden"
 
-#: global.c:237
+#: global.c:242
 msgid "WriteOut"
 msgstr "Speichern"
 
-#: global.c:242 global.c:331
+#: global.c:247 global.c:336
 msgid "Justify"
 msgstr "Ausrichten"
 
-#: global.c:246 global.c:252
+#: global.c:251 global.c:257
 msgid "Read File"
 msgstr "Datei öffnen"
 
-#: global.c:256 global.c:327 global.c:355
+#: global.c:261 global.c:332 global.c:360
 msgid "Replace"
 msgstr "Ersetzen"
 
-#: global.c:260
+#: global.c:265
 msgid "Where Is"
 msgstr "Wo ist"
 
-#: global.c:264 global.c:407 global.c:431
+#: global.c:269 global.c:412 global.c:436
 msgid "Prev Page"
 msgstr "Seite zurück"
 
-#: global.c:268 global.c:411 global.c:435
+#: global.c:273 global.c:416 global.c:440
 msgid "Next Page"
 msgstr "Seite vor"
 
-#: global.c:272
+#: global.c:277
 msgid "Cut Text"
 msgstr "Ausschneiden"
 
-#: global.c:276
+#: global.c:281
 msgid "UnJustify"
 msgstr "Ausrichten rückgängig"
 
-#: global.c:279
+#: global.c:284
 msgid "UnCut Txt"
 msgstr "Ausschneiden rückgängig"
 
-#: global.c:283
+#: global.c:288
 msgid "Cur Pos"
 msgstr "Cursor"
 
-#: global.c:287
+#: global.c:292
 msgid "To Spell"
 msgstr "Rechtschr."
 
-#: global.c:291
+#: global.c:296
 msgid "Up"
 msgstr "Hoch"
 
-#: global.c:294
+#: global.c:299
 msgid "Down"
 msgstr "Runter"
 
-#: global.c:297
+#: global.c:302
 msgid "Forward"
 msgstr "Vorwärts"
 
-#: global.c:300
+#: global.c:305
 msgid "Back"
 msgstr "Zurück"
 
-#: global.c:303
+#: global.c:308
 msgid "Home"
 msgstr "Pos 1"
 
-#: global.c:306
+#: global.c:311
 msgid "End"
 msgstr "Ende"
 
-#: global.c:309
+#: global.c:314
 msgid "Refresh"
 msgstr "Auffrischen"
 
-#: global.c:312
+#: global.c:317
 msgid "Mark Text"
 msgstr "Text markieren"
 
-#: global.c:315
+#: global.c:320
 msgid "Delete"
 msgstr "Löschen"
 
-#: global.c:319
+#: global.c:324
 msgid "Backspace"
 msgstr "Rücktaste"
 
-#: global.c:323
+#: global.c:328
 msgid "Tab"
 msgstr "Tab"
 
-#: global.c:335
+#: global.c:340
 msgid "Enter"
 msgstr "Enter"
 
-#: global.c:339 global.c:359 global.c:379
+#: global.c:344 global.c:364 global.c:384
 msgid "Goto Line"
 msgstr "Zu Zeile"
 
-#: global.c:345 global.c:366 global.c:387 global.c:397
+#: global.c:350 global.c:371 global.c:392 global.c:402
 msgid "First Line"
 msgstr "Erste Zeile"
 
-#: global.c:348 global.c:369 global.c:390 global.c:400
+#: global.c:353 global.c:374 global.c:395 global.c:405
 msgid "Last Line"
 msgstr "Letzte Zeile"
 
-#: global.c:351 global.c:372
+#: global.c:356 global.c:377
 msgid "Case Sens"
 msgstr "GROSZ/klein"
 
-#: global.c:362 global.c:382 global.c:393 global.c:403 global.c:424
-#: global.c:427 global.c:445 winio.c:1083
+#: global.c:367 global.c:387 global.c:398 global.c:408 global.c:429
+#: global.c:432 global.c:450 winio.c:1202
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: global.c:375
+#: global.c:380
 msgid "No Replace"
 msgstr "Keine Ersetzung"
 
-#: global.c:420
+#: global.c:425
 msgid "To Files"
 msgstr "In Dateien"
 
-#: global.c:439
+#: global.c:444
 #, fuzzy
 msgid "Goto"
 msgstr "Zu Zeile"
 
-#: nano.c:136
+#: nano.c:137
 #, c-format
 msgid ""
 "\n"
@@ -446,7 +446,7 @@ msgstr ""
 "\n"
 "Puffer in %s geschrieben\n"
 
-#: nano.c:138
+#: nano.c:139
 #, c-format
 msgid ""
 "\n"
@@ -455,15 +455,15 @@ msgstr ""
 "\n"
 "%s nicht geschrieben (Datei existiert?)\n"
 
-#: nano.c:147
+#: nano.c:148
 msgid "Window size is too small for Nano..."
 msgstr "Fenstergröße ist zu klein für Nano..."
 
-#: nano.c:155
+#: nano.c:156
 msgid "Key illegal in VIEW mode"
 msgstr "Unzulässige Taste im View Modus"
 
-#: nano.c:199
+#: nano.c:200
 #, fuzzy
 msgid ""
 " nano help text\n"
@@ -477,9 +477,9 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
-"key sequences are notated with the Meta (M) symbol and can be entered using "
-"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
+"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
+"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
@@ -494,22 +494,22 @@ msgstr ""
 "zeigt wichtige Meldungen. Die untersten zwei Zeilen listen die "
 "meistgebrauchten Tastenkombinationen von nano auf.\n"
 "\n"
-" Tastenkombinationen werden wie folgt abgekärzt: Kombinationen mit der Strg-"
-"Taste werden mit einem ^ ausgedräckt. Escape-Sequenzen werden mit dem Meta "
-"(M)-Symbol angegeben und können je nach Tastatureinstellung mit Esc, Alt "
-"oder Meta eingegeben werden. | Die folgenden Tasten(kombinationen) sind im "
-"Hauptfenster verfügbar. Optionale Tasten sind eingeklammert.\n"
+" Tastenkombinationen werden wie folgt abgekärzt: Kombinationen mit der "
+"Strg-Taste werden mit einem ^ ausgedräckt. Escape-Sequenzen werden mit dem "
+"Meta (M)-Symbol angegeben und können je nach Tastatureinstellung mit Esc, "
+"Alt oder Meta eingegeben werden. | Die folgenden Tasten(kombinationen) sind "
+"im Hauptfenster verfügbar. Optionale Tasten sind eingeklammert.\n"
 "\n"
 
-#: nano.c:293
+#: nano.c:294
 msgid "delete_node(): free'd a node, YAY!\n"
 msgstr "delete_node(): Knoten freigegeben.\n"
 
-#: nano.c:298
+#: nano.c:299
 msgid "delete_node(): free'd last node.\n"
 msgstr "delete_node(): letzter Knoten freigegeben.\n"
 
-#: nano.c:353
+#: nano.c:354
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
@@ -517,92 +517,92 @@ msgstr ""
 "Aufruf: nano [lange GNU Option] [Option] +ZEILE <Datei>\n"
 "\n"
 
-#: nano.c:354
+#: nano.c:355
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Option\t\tlange Option\t\tBedeutung\n"
 
-#: nano.c:356
+#: nano.c:357
 msgid " -T [num]\t--tabsize=[num]\t\tSet width of a tab to num\n"
 msgstr ""
 " -T [Anzahl]\t--tabsize=[Anzahl]\t\tTabulator-Größe auf Anzahl setzen\n"
 
-#: nano.c:359
+#: nano.c:360
 msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
 msgstr " -R\t\t--regexp\t\tRegulären Ausdruck zur Suche verwenden\n"
 
-#: nano.c:363
+#: nano.c:364
 msgid " -V \t\t--version\t\tPrint version information and exit\n"
 msgstr " -V \t\t--version\t\tVersionsinfo ausgeben und beenden\n"
 
-#: nano.c:365
+#: nano.c:366
 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
 msgstr " -c \t\t--const\t\t\tCursorposition ständig anzeigen\n"
 
-#: nano.c:367
+#: nano.c:368
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr " -h \t\t--help\t\t\tDiese Meldung anzeigen\n"
 
-#: nano.c:369
+#: nano.c:370
 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
 msgstr " -i \t\t--autoindent\t\tNeue Zeilen automatisch einrücken\n"
 
-#: nano.c:372
+#: nano.c:373
 msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
 msgstr " -k \t\t--cut\t\t\t^K schneidet vom Cursor bis zum Zeilenende aus\n"
 
-#: nano.c:375
+#: nano.c:376
 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite\n"
 msgstr ""
 " -l \t\t--nofollow\t\tSymbolischen Links nicht folgen, sondern "
 "Überschreiben.\n"
 
-#: nano.c:378
+#: nano.c:379
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr " -m \t\t--mouse\t\t\tMaus aktivieren\n"
 
-#: nano.c:382
+#: nano.c:383
 msgid " -p\t \t--pico\t\t\tEmulate Pico as closely as possible\n"
 msgstr " -\t \t--pico\t\t\tPico so genau wie möglich imitieren\n"
 
-#: nano.c:385
+#: nano.c:386
 msgid ""
 " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
 msgstr ""
 " -r [#Spalten] \t--fill=[#Spalten]\tSpalten auffüllen (Zeilenumbruch bei) "
 "#Spalten\n"
 
-#: nano.c:388
+#: nano.c:389
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr ""
 " -s [Programm] \t--speller=[Programm]\tAlternative Rechtschreibprüfung\n"
 
-#: nano.c:391
+#: nano.c:392
 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\t--tempfile\t\tBeim Beenden ohne Rückfrage speichern\n"
 
-#: nano.c:393
+#: nano.c:394
 msgid " -v \t\t--view\t\t\tView (read only) mode\n"
 msgstr ""
 " -v \t\t--view\t\t\tNur zum Lesen öffnen (keine Veränderungen m÷glich)\n"
 
-#: nano.c:396
+#: nano.c:397
 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
 msgstr " -w \t\t--nowrap\t\tLange Zeilen nicht in neue Zeilen umbrechen\n"
 
-#: nano.c:399
+#: nano.c:400
 msgid " -x \t\t--nohelp\t\tDon't show help window\n"
 msgstr " -x \t\t--nohelp\t\tHilfe-Fenster nicht anzeigen\n"
 
-#: nano.c:401
+#: nano.c:402
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr ""
 " -z \t\t--suspend\t\tSuspend (anhalten und zurück zur Shell) aktivieren\n"
 
-#: nano.c:403
+#: nano.c:404
 msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
 msgstr " +ZEILE\t\t\t\t\tBei Zeile ZEILE beginnen\n"
 
-#: nano.c:405
+#: nano.c:406
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
@@ -610,93 +610,93 @@ msgstr ""
 "Aufruf: nano [Option] +ZEILE <Datei>\n"
 "\n"
 
-#: nano.c:406
+#: nano.c:407
 msgid "Option\t\tMeaning\n"
 msgstr "Option\t\tBedeutung\n"
 
-#: nano.c:407
+#: nano.c:408
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr " -T [Anzahl]\tTabulator-Größe auf Anzahl setzen\n"
 
-#: nano.c:408
+#: nano.c:409
 msgid " -R\t\tUse regular expressions for search\n"
 msgstr " -R\t\tRegulären Ausdruck zur Suche verwenden\n"
 
-#: nano.c:409
+#: nano.c:410
 msgid " -V \t\tPrint version information and exit\n"
 msgstr " -V \t\tVersionsinfo ausgeben und beenden\n"
 
-#: nano.c:410
+#: nano.c:411
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr " -c \t\tCursorposition ständig anzeigen\n"
 
-#: nano.c:411
+#: nano.c:412
 msgid " -h \t\tShow this message\n"
 msgstr " -h \t\tDiese Meldung anzeigen\n"
 
-#: nano.c:412
+#: nano.c:413
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr " -i \t\tNeue Zeilen automatisch einrücken\n"
 
-#: nano.c:414
+#: nano.c:415
 msgid " -k \t\tLet ^K cut from cursor to end of line\n"
 msgstr " -k \t\t^K schneidet vom Cursor bis zum Zeilenende aus\n"
 
-#: nano.c:417
+#: nano.c:418
 msgid " -l \t\tDon't follow symbolic links, overwrite\n"
 msgstr " -l \t\tSymbolischen Links nicht folgen, sondern überschreiben\n"
 
-#: nano.c:420
+#: nano.c:421
 msgid " -m \t\tEnable mouse\n"
 msgstr " -m \t\tMaus aktivieren\n"
 
-#: nano.c:423
+#: nano.c:424
 msgid " -p \t\tEmulate Pico as closely as possible\n"
 msgstr "i -p \t\tPico so genau wie möglich imitieren\n"
 
-#: nano.c:425
+#: nano.c:426
 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
 msgstr " -r [#Spalten] \tSpalten auffüllen (Zeilenumbruch bei) #Spalten\n"
 
-#: nano.c:427
+#: nano.c:428
 #, fuzzy
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr " -s [Programm] |\tAlternative Rechtschreibprüfung\n"
 
-#: nano.c:429
+#: nano.c:430
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\tBeim Beenden ohne Rückfrage speichern\n"
 
-#: nano.c:430
+#: nano.c:431
 msgid " -v \t\tView (read only) mode\n"
 msgstr " -v \t\tNur zum Lesen öffnen (keine Veränderungen möglich)\n"
 
-#: nano.c:432
+#: nano.c:433
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr " -w \t\tLange Zeilen nicht in neue Zeilen umbrechen\n"
 
-#: nano.c:434
+#: nano.c:435
 msgid " -x \t\tDon't show help window\n"
 msgstr " -x \t\tHilfe-Fenster nicht anzeigen\n"
 
-#: nano.c:435
+#: nano.c:436
 msgid " -z \t\tEnable suspend\n"
 msgstr " -z \t\tSuspend (anhalten und zurück zur Shell) aktivieren\n"
 
-#: nano.c:436
+#: nano.c:437
 msgid " +LINE\t\tStart at line number LINE\n"
 msgstr " +ZEILE\t\tBei Zeile ZEILE beginnen\n"
 
-#: nano.c:443
+#: nano.c:444
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano Version %s (compiliert um %s, %s)\n"
 
-#: nano.c:446
+#: nano.c:447
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 msgstr " Email: nano@nano-editor.org\tWWW: http://www.nano-editor.org"
 
-#: nano.c:447
+#: nano.c:448
 msgid ""
 "\n"
 " Compiled options:"
@@ -704,276 +704,270 @@ msgstr ""
 "\n"
 " Kompilierte Optionen:"
 
-#: nano.c:522
+#: nano.c:526
 msgid "Mark Set"
 msgstr "Markierung gesetzt"
 
-#: nano.c:527
+#: nano.c:531
 msgid "Mark UNset"
 msgstr "Markierung gelöscht"
 
-#: nano.c:1029
+#: nano.c:1033
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap aufgerufen mit inptr->data=\"%s\"\n"
 
-#: nano.c:1081
+#: nano.c:1085
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data jetzt = \"%s\"\n"
 
-#: nano.c:1133
+#: nano.c:1137
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Nachher, data = \"%s\"\n"
 
-#: nano.c:1234
+#: nano.c:1238
 msgid "Edit a replacement"
 msgstr "Ersetzung editieren"
 
-#: nano.c:1463
+#: nano.c:1468
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Konnte keine temporäre Datei erzeugen: %s"
 
-#: nano.c:1469
+#: nano.c:1474
 msgid "Spell checking failed: unable to write temp file!"
 msgstr ""
 "Rechtschreibprüfung fehlgeschlagen: konnte nicht in temporäre Datei schreiben"
 
-#: nano.c:1481
+#: nano.c:1486
 msgid "Finished checking spelling"
 msgstr "Rechtschreibprüfung abgeschlossen"
 
-#: nano.c:1483
+#: nano.c:1488
 msgid "Spell checking failed"
 msgstr "Rechtschreibprüfung fehlgeschlagen"
 
-#: nano.c:1502
+#: nano.c:1507
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Veränderten Puffer speichern (\"Nein\" VERWIRFT DIE ÄNDERUGNEN) ? "
 
-#: nano.c:1619
+#: nano.c:1624
 msgid "Received SIGHUP"
 msgstr "SIGHUP empfangen"
 
-#: nano.c:1682
+#: nano.c:1687
 msgid "Cannot resize top win"
 msgstr "Kann die Größe des oberen Fensters nicht verändern"
 
-#: nano.c:1684
+#: nano.c:1689
 msgid "Cannot move top win"
 msgstr "Kann oberes Fenster nicht verschieben"
 
-#: nano.c:1686
+#: nano.c:1691
 msgid "Cannot resize edit win"
 msgstr "Kann Größe des Bearbeitungsfensters nicht verändern"
 
-#: nano.c:1688
+#: nano.c:1693
 msgid "Cannot move edit win"
 msgstr "Kann Bearbeitungsfenster nicht verschieben"
 
-#: nano.c:1690
+#: nano.c:1695
 msgid "Cannot resize bottom win"
 msgstr "Kann Größe des unteren Fensters nicht verändern"
 
-#: nano.c:1692
+#: nano.c:1697
 msgid "Cannot move bottom win"
 msgstr "Kann unteres Fenster nicht verschieben"
 
-#: nano.c:2001
+#: nano.c:2006
 msgid "Can now UnJustify!"
 msgstr "Kann Absatzausrichtung nicht rückgängig machen"
 
-#: nano.c:2099
+#: nano.c:2104
 #, c-format
 msgid "%s enable/disable"
 msgstr "%s aktivieren/deaktivieren"
 
-#: nano.c:2114
+#: nano.c:2119
 msgid "enabled"
 msgstr "aktiviert"
 
-#: nano.c:2115
+#: nano.c:2120
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: nano.c:2168
+#: nano.c:2173
 #, fuzzy
 msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 msgstr ""
 "NumLock Problem entdeckt. | Tastenblock funktioniert nicht, wenn NumLock "
 "ausgeschaltet ist"
 
-#: nano.c:2396
+#: nano.c:2405
 msgid "Main: set up windows\n"
 msgstr "Hauptprogramm: Fenster konfigurieren\n"
 
-#: nano.c:2403
+#: nano.c:2416
 msgid "Main: bottom win\n"
 msgstr "Hauptprogramm: unteres Fenster\n"
 
-#: nano.c:2409
+#: nano.c:2422
 msgid "Main: open file\n"
 msgstr "Hauptprogramm: Datei öffnen\n"
 
-#: nano.c:2464
+#: nano.c:2478
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "Erhielt Alt-0-%c! (%d)\n"
 
-#: nano.c:2491
+#: nano.c:2505
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "Erhielt Alt-[-1-%c! (%d)\n"
 
-#: nano.c:2524
+#: nano.c:2538
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "Erhielt Alt-[-2-%c! (%d)\n"
 
-#: nano.c:2566
+#: nano.c:2584
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Erhielt Alt-[-%c! (%d)\n"
 
-#: nano.c:2592
+#: nano.c:2610
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Erhielt Alt-%c! (%d)\n"
 
-#: search.c:117
+#: search.c:118
 #, c-format
 msgid "Case Sensitive Regexp Search%s%s"
 msgstr ""
 "Suche mit Unterscheidung von Groß- und Kleinschreibung nach regulärem "
 "Ausdruck%s%s"
 
-#: search.c:119
+#: search.c:120
 #, c-format
 msgid "Regexp Search%s%s"
 msgstr "Suche nach regulärem Ausdruck%s%s"
 
-#: search.c:121
+#: search.c:122
 #, c-format
 msgid "Case Sensitive Search%s%s"
 msgstr "Suche mit Unterscheidung von Groß- und Kleinschreibung%s%s"
 
-#: search.c:123
+#: search.c:124
 #, c-format
 msgid "Search%s%s"
 msgstr "Suche%s%s"
 
-#: search.c:126
+#: search.c:127
 msgid " (to replace)"
 msgstr " (zu ersetzen)"
 
-#: search.c:135 search.c:326
+#: search.c:136 search.c:327
 msgid "Search Cancelled"
 msgstr "Suche abgebrochen"
 
-#: search.c:199
+#: search.c:200
 #, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s...\" nicht gefunden"
 
-#: search.c:248
+#: search.c:249
 msgid "Search Wrapped"
 msgstr "Suche in neue Zeile umgebrochen"
 
-#: search.c:348
+#: search.c:349
 #, fuzzy, c-format
 msgid "Replaced %d occurrences"
 msgstr "%d Ersetzungen vorgenommen"
 
-#: search.c:350
+#: search.c:351
 #, fuzzy
 msgid "Replaced 1 occurrence"
 msgstr "1 Ersetzung vorgenommen"
 
-#: search.c:488 search.c:592 search.c:608
+#: search.c:489 search.c:599 search.c:615
 msgid "Replace Cancelled"
 msgstr "Ersetzung abgebrochen"
 
-#: search.c:538
+#: search.c:539
 msgid "Replace this instance?"
 msgstr "Fundstelle ersetzen?"
 
-#: search.c:550
+#: search.c:551
 msgid "Replace failed: unknown subexpression!"
 msgstr "Ersetzung gescheitert: unbekannter Unterausdruck"
 
-#: search.c:633
+#: search.c:640
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Ersetzen mit [%s]"
 
-#: search.c:637 search.c:641
+#: search.c:644 search.c:648
 msgid "Replace with"
 msgstr "Ersetzen mit"
 
-#. Ask for it
-#: search.c:676
+#: search.c:682
 msgid "Enter line number"
 msgstr "Zeilennummer eingeben"
 
-#: search.c:678
+#: search.c:684
 msgid "Aborted"
 msgstr "Abgebrochen"
 
-#: search.c:698
+#: search.c:693
 msgid "Come on, be reasonable"
 msgstr "Komm schon, sei vernünftig"
 
-#: search.c:703
-#, c-format
-msgid "Only %d lines available, skipping to last line"
-msgstr "Nur %d Zeilen vorhanden, springe zur letzten Zeile"
-
-#: winio.c:123
+#: winio.c:124
 #, c-format
 msgid "actual_x_from_start for xplus=%d returned %d\n"
 msgstr "actual_x_from_start für xplus=%d gab %d zurck\n"
 
-#: winio.c:279
+#: winio.c:288
 #, fuzzy, c-format
 msgid "Aha! '%c' (%d)\n"
 msgstr "Eingabe '%c' (%d)\n"
 
-#: winio.c:461
+#: winio.c:470
 #, c-format
 msgid "input '%c' (%d)\n"
 msgstr "Eingabe '%c' (%d)\n"
 
-#: winio.c:503
+#: winio.c:519
 msgid "New Buffer"
 msgstr "Neuer Puffer"
 
-#: winio.c:507
+#: winio.c:523
 #, fuzzy
 msgid "  File: ..."
 msgstr " |Datei: ..."
 
-#: winio.c:509
+#: winio.c:525
 #, fuzzy
 msgid "   DIR: ..."
 msgstr " || Verzeichnis: ..."
 
-#: winio.c:520
+#: winio.c:536
 msgid "Modified"
 msgstr "Verändert"
 
-#: winio.c:972
+#: winio.c:1078
 #, c-format
 msgid "Moved to (%d, %d) in edit buffer\n"
 msgstr "Nach (%d, %d) im Bearbeitungspuffer verschoben\n"
 
-#: winio.c:983
+#: winio.c:1089
 #, c-format
 msgid "current->data = \"%s\"\n"
 msgstr "current->data = \"%s\"\n"
 
-#: winio.c:1028
+#: winio.c:1146
 #, c-format
 msgid "I got \"%s\"\n"
 msgstr "Erhielt \"%s\"\n"
@@ -981,84 +975,87 @@ msgstr "Erhielt \"%s\"\n"
 #. Yes, no and all are strings of any length.  Each string consists of
 #. all characters accepted as a valid character for that value.
 #. The first value will be the one displayed in the shortcuts.
-#: winio.c:1057
+#: winio.c:1175
 msgid "Yy"
 msgstr "Jj"
 
-#: winio.c:1058
+#: winio.c:1176
 msgid "Nn"
 msgstr "Nn"
 
-#: winio.c:1059
+#: winio.c:1177
 msgid "Aa"
 msgstr "Aa"
 
-#: winio.c:1072
+#: winio.c:1191
 msgid "Yes"
 msgstr "Ja"
 
-#: winio.c:1076
+#: winio.c:1195
 msgid "All"
 msgstr "Alle"
 
-#: winio.c:1081
+#: winio.c:1200
 msgid "No"
 msgstr "Nein"
 
-#: winio.c:1257
+#: winio.c:1400
 #, c-format
 msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
-#: winio.c:1261
+#: winio.c:1404
 #, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "Zeile %d von %d (%.0f%%), Zeichen %d von %d (%.0f%%)"
 
-#: winio.c:1402
+#: winio.c:1545
 msgid "Dumping file buffer to stderr...\n"
 msgstr "Gebe Datei Puffer nach stderr aus...\n"
 
-#: winio.c:1404
+#: winio.c:1547
 msgid "Dumping cutbuffer to stderr...\n"
 msgstr "Gebe Inhalt der Zwischenablage nach stderr aus...\n"
 
-#: winio.c:1406
+#: winio.c:1549
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Gebe einen Puffer nach stderr aus...\n"
 
-#: winio.c:1481
+#: winio.c:1624
 msgid "The nano text editor"
 msgstr "Der nano Text-Editor"
 
-#: winio.c:1482
+#: winio.c:1625
 msgid "version "
 msgstr "Version "
 
-#: winio.c:1483
+#: winio.c:1626
 msgid "Brought to you by:"
 msgstr "Entwickelt von:"
 
-#: winio.c:1484
+#: winio.c:1627
 msgid "Special thanks to:"
 msgstr "Speziellen Dank an:"
 
-#: winio.c:1485
+#: winio.c:1628
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: winio.c:1486
+#: winio.c:1629
 msgid "Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurses"
 msgstr "Pavel Curtis, Zeyd Ben-Halim und Eric S. Raymond für ncurses"
 
-#: winio.c:1487
+#: winio.c:1630
 msgid "and anyone else we forgot..."
 msgstr "und alle Nichtgenannten..."
 
-#: winio.c:1488
+#: winio.c:1631
 msgid "Thank you for using nano!\n"
 msgstr "Danke für die Benutzung von nano!\n"
 
+#~ msgid "Only %d lines available, skipping to last line"
+#~ msgstr "Nur %d Zeilen vorhanden, springe zur letzten Zeile"
+
 #~ msgid "Could not open file: Path length exceeded."
 #~ msgstr "Konnte Datei nicht öffnen: Pfad zu lang."
 
diff --git a/po/es.po b/po/es.po
index 8193ab0a..e3a50238 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2001-04-18 18:10-0400\n"
+"POT-Creation-Date: 2001-04-30 09:44-0400\n"
 "PO-Revision-Date: 2001-03-21 23:46+0100\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -15,429 +15,429 @@ msgstr ""
 "Content-Type: text/plain; charset=iso8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cut.c:44
+#: cut.c:45
 #, c-format
 msgid "add_to_cutbuffer called with inptr->data = %s\n"
 msgstr "add_to_cutbuffer llamado con inptr->data = %s\n"
 
-#: cut.c:150
+#: cut.c:151
 msgid "Blew away cutbuffer =)\n"
 msgstr "Nos hemos cargado el cutbuffer =)\n"
 
-#: files.c:123
+#: files.c:124
 msgid "read_line: not on first line and prev is NULL"
 msgstr "read_line: no estamos en la primera línea y la anterior es NULL"
 
-#: files.c:185 files.c:203
+#: files.c:186 files.c:204
 #, c-format
 msgid "Read %d lines"
 msgstr "%d líneas leídas"
 
-#: files.c:221 search.c:193
+#: files.c:222 search.c:194
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" no encontrado"
 
 #. We have a new file
-#: files.c:225
+#: files.c:226
 msgid "New File"
 msgstr "Nuevo Fichero"
 
-#: files.c:238
+#: files.c:239
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr "Fichero \"%s\" es un directorio"
 
 #. Don't open character or block files.  Sorry, /dev/sndstat!
-#: files.c:241
+#: files.c:242
 #, c-format
 msgid "File \"%s\" is a device file"
 msgstr "El fichero \"%s\" es un dispositivo"
 
-#: files.c:248
+#: files.c:249
 msgid "Reading File"
 msgstr "Leyendo Fichero"
 
-#: files.c:264
+#: files.c:265
 msgid "File to insert [from ./] "
 msgstr "Fichero a insertar [desde ./] "
 
-#: files.c:313 files.c:338 files.c:574 nano.c:1515
+#: files.c:314 files.c:339 files.c:575 nano.c:1520
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: files.c:384 files.c:400 files.c:414 files.c:431 files.c:437
+#: files.c:385 files.c:401 files.c:415 files.c:432 files.c:438
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "No pude abrir el fichero para escribir: %s"
 
-#: files.c:419
+#: files.c:420
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Escribí >%s\n"
 
-#: files.c:446
+#: files.c:447
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "No pude cerrar %s: %s"
 
 #. Try a rename??
-#: files.c:469 files.c:478 files.c:483
+#: files.c:470 files.c:479 files.c:484
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "No pude abrir %s para escribir: %s"
 
-#: files.c:490
+#: files.c:491
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "No pude establecer permisos %o en %s: %s"
 
-#: files.c:495
+#: files.c:496
 #, c-format
 msgid "Wrote %d lines"
 msgstr "%d líneas escritas"
 
-#: files.c:530
+#: files.c:531
 msgid "File Name to write"
 msgstr "Nombre de Fichero a escribir"
 
-#: files.c:549
+#: files.c:550
 #, c-format
 msgid "filename is %s"
 msgstr "filename es %s"
 
-#: files.c:563
+#: files.c:564
 msgid "File exists, OVERWRITE ?"
 msgstr "El fichero existe, ¿ SOBREESCRIBIR ?"
 
-#: files.c:985
+#: files.c:986
 msgid "(more)"
 msgstr "(más)"
 
-#: files.c:1256
+#: files.c:1257
 msgid "Can't move up a directory"
 msgstr "No puedo ascender de directorio"
 
 # y, c-format
 #. We can't open this dir for some reason.  Complain
-#: files.c:1266 files.c:1314
+#: files.c:1267 files.c:1315
 #, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "No se puede abrir \"%s\": %s"
 
-#: files.c:1294 global.c:227
+#: files.c:1295 global.c:232
 #, fuzzy
 msgid "Goto Directory"
 msgstr "Ir a Línea"
 
-#: files.c:1299
+#: files.c:1300
 #, fuzzy
 msgid "Goto Cancelled"
 msgstr "Cancelado"
 
-#: global.c:139
+#: global.c:144
 msgid "Constant cursor position"
 msgstr "Posición del cursor constante"
 
-#: global.c:140
+#: global.c:145
 msgid "Auto indent"
 msgstr "Auto indentar"
 
-#: global.c:141
+#: global.c:146
 msgid "Suspend"
 msgstr "Suspender"
 
-#: global.c:142
+#: global.c:147
 msgid "Help mode"
 msgstr "Modo ayuda"
 
-#: global.c:143
+#: global.c:148
 msgid "Pico mode"
 msgstr "Modo Pico"
 
-#: global.c:144
+#: global.c:149
 msgid "Mouse support"
 msgstr "Soporte para ratón"
 
-#: global.c:145
+#: global.c:150
 msgid "Cut to end"
 msgstr "Cortar hasta el final de línea"
 
-#: global.c:147
+#: global.c:152
 msgid "Regular expressions"
 msgstr "Expresiones regulares"
 
-#: global.c:149
+#: global.c:154
 msgid "Auto wrap"
 msgstr "Auto wrapear"
 
-#: global.c:194
+#: global.c:199
 msgid "Invoke the help menu"
 msgstr "Invocar el menú de ayuda"
 
-#: global.c:195
+#: global.c:200
 msgid "Write the current file to disk"
 msgstr "Escribir el fichero actual a disco"
 
-#: global.c:196
+#: global.c:201
 msgid "Exit from nano"
 msgstr "Salir de nano"
 
-#: global.c:197
+#: global.c:202
 msgid "Goto a specific line number"
 msgstr "Ir a un número de línea en concreto"
 
-#: global.c:198
+#: global.c:203
 msgid "Justify the current paragraph"
 msgstr "Justificar el párrafo actual"
 
-#: global.c:199
+#: global.c:204
 msgid "Unjustify after a justify"
 msgstr "Desjustificar después de un justificar"
 
-#: global.c:200
+#: global.c:205
 msgid "Replace text within the editor"
 msgstr "Reemplazar texto en el editor"
 
-#: global.c:201
+#: global.c:206
 msgid "Insert another file into the current one"
 msgstr "Insertar otro fichero en el actual"
 
-#: global.c:202
+#: global.c:207
 msgid "Search for text within the editor"
 msgstr "Buscar un texto en el editor"
 
-#: global.c:203
+#: global.c:208
 msgid "Move to the previous screen"
 msgstr "Moverse a la página anterior"
 
-#: global.c:204
+#: global.c:209
 msgid "Move to the next screen"
 msgstr "Moverse a la página siguiente"
 
-#: global.c:205
+#: global.c:210
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Cortar la línea actual y guardarla en el cutbuffer"
 
-#: global.c:206
+#: global.c:211
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Pegar el cutbuffer en la línea actual"
 
-#: global.c:207
+#: global.c:212
 msgid "Show the posititon of the cursor"
 msgstr "Mostrar la posición del cursor"
 
-#: global.c:208
+#: global.c:213
 msgid "Invoke the spell checker (if available)"
 msgstr "Invocar el corrector ortográfico (si está disponible)"
 
-#: global.c:209
+#: global.c:214
 msgid "Move up one line"
 msgstr "Moverse una línea hacia arriba"
 
-#: global.c:210
+#: global.c:215
 msgid "Move down one line"
 msgstr "Moverse una línea hacia abajo"
 
-#: global.c:211
+#: global.c:216
 msgid "Move forward one character"
 msgstr "Moverse hacia adelante un carácter"
 
-#: global.c:212
+#: global.c:217
 msgid "Move back one character"
 msgstr "Moverse hacia atrás un carácter"
 
-#: global.c:213
+#: global.c:218
 msgid "Move to the beginning of the current line"
 msgstr "Moverse al principio de la línea actual"
 
-#: global.c:214
+#: global.c:219
 msgid "Move to the end of the current line"
 msgstr "Moverse al final de la línea actual"
 
-#: global.c:215
+#: global.c:220
 msgid "Go to the first line of the file"
 msgstr "Ir a la primera línea del fichero"
 
-#: global.c:216
+#: global.c:221
 msgid "Go to the last line of the file"
 msgstr "Ir a la última línea del fichero"
 
-#: global.c:217
+#: global.c:222
 msgid "Refresh (redraw) the current screen"
 msgstr "Redibujar la pantalla actual"
 
-#: global.c:218
+#: global.c:223
 msgid "Mark text at the current cursor location"
 msgstr "Marcar texto en la posición actual del cursor"
 
-#: global.c:219
+#: global.c:224
 msgid "Delete the character under the cursor"
 msgstr "Borrar el carácter bajo el cursor"
 
-#: global.c:221
+#: global.c:226
 msgid "Delete the character to the left of the cursor"
 msgstr "Borrar el carácter a la izquierda del cursor"
 
-#: global.c:222
+#: global.c:227
 msgid "Insert a tab character"
 msgstr "Insertar un carácter tab"
 
-#: global.c:223
+#: global.c:228
 msgid "Insert a carriage return at the cursor position"
 msgstr "Insertar un retorno de carro en la posición del cursor"
 
-#: global.c:225
+#: global.c:230
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Hacer que la búsqueda actual sea sensible a mayúsculas"
 
-#: global.c:226
+#: global.c:231
 msgid "Go to file browser"
 msgstr "Ir al navegador de ficheros"
 
-#: global.c:228
+#: global.c:233
 msgid "Cancel the current function"
 msgstr "Cancelar la función actual"
 
-#: global.c:231
+#: global.c:236
 msgid "Get Help"
 msgstr "Ver Ayuda"
 
-#: global.c:234 global.c:415 global.c:442
+#: global.c:239 global.c:420 global.c:447
 msgid "Exit"
 msgstr "Salir"
 
-#: global.c:237
+#: global.c:242
 msgid "WriteOut"
 msgstr "Guardar"
 
-#: global.c:242 global.c:331
+#: global.c:247 global.c:336
 msgid "Justify"
 msgstr "Justificar"
 
-#: global.c:246 global.c:252
+#: global.c:251 global.c:257
 msgid "Read File"
 msgstr "L Fichero"
 
-#: global.c:256 global.c:327 global.c:355
+#: global.c:261 global.c:332 global.c:360
 msgid "Replace"
 msgstr "Reemplazar"
 
-#: global.c:260
+#: global.c:265
 msgid "Where Is"
 msgstr "Buscar"
 
-#: global.c:264 global.c:407 global.c:431
+#: global.c:269 global.c:412 global.c:436
 msgid "Prev Page"
 msgstr "Pág Ant"
 
-#: global.c:268 global.c:411 global.c:435
+#: global.c:273 global.c:416 global.c:440
 msgid "Next Page"
 msgstr "Pág Sig"
 
-#: global.c:272
+#: global.c:277
 msgid "Cut Text"
 msgstr "CortarTxt"
 
-#: global.c:276
+#: global.c:281
 msgid "UnJustify"
 msgstr "Desjustificar"
 
-#: global.c:279
+#: global.c:284
 msgid "UnCut Txt"
 msgstr "PegarTxt"
 
-#: global.c:283
+#: global.c:288
 msgid "Cur Pos"
 msgstr "Pos Act"
 
-#: global.c:287
+#: global.c:292
 msgid "To Spell"
 msgstr "Ortografía"
 
-#: global.c:291
+#: global.c:296
 msgid "Up"
 msgstr "Arriba"
 
-#: global.c:294
+#: global.c:299
 msgid "Down"
 msgstr "Abajo"
 
-#: global.c:297
+#: global.c:302
 msgid "Forward"
 msgstr "Adelante"
 
-#: global.c:300
+#: global.c:305
 msgid "Back"
 msgstr "Atrás"
 
-#: global.c:303
+#: global.c:308
 msgid "Home"
 msgstr "Inicio"
 
-#: global.c:306
+#: global.c:311
 msgid "End"
 msgstr "Fin"
 
-#: global.c:309
+#: global.c:314
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: global.c:312
+#: global.c:317
 msgid "Mark Text"
 msgstr "MarcarTxt"
 
-#: global.c:315
+#: global.c:320
 msgid "Delete"
 msgstr "Suprimir"
 
-#: global.c:319
+#: global.c:324
 msgid "Backspace"
 msgstr "Borrar"
 
-#: global.c:323
+#: global.c:328
 msgid "Tab"
 msgstr "Tab"
 
-#: global.c:335
+#: global.c:340
 msgid "Enter"
 msgstr "Enter"
 
-#: global.c:339 global.c:359 global.c:379
+#: global.c:344 global.c:364 global.c:384
 msgid "Goto Line"
 msgstr "Ir a Línea"
 
-#: global.c:345 global.c:366 global.c:387 global.c:397
+#: global.c:350 global.c:371 global.c:392 global.c:402
 msgid "First Line"
 msgstr "Primera Línea"
 
-#: global.c:348 global.c:369 global.c:390 global.c:400
+#: global.c:353 global.c:374 global.c:395 global.c:405
 msgid "Last Line"
 msgstr "Última Línea"
 
-#: global.c:351 global.c:372
+#: global.c:356 global.c:377
 msgid "Case Sens"
 msgstr "May/Min"
 
-#: global.c:362 global.c:382 global.c:393 global.c:403 global.c:424
-#: global.c:427 global.c:445 winio.c:1083
+#: global.c:367 global.c:387 global.c:398 global.c:408 global.c:429
+#: global.c:432 global.c:450 winio.c:1202
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: global.c:375
+#: global.c:380
 msgid "No Replace"
 msgstr "No Reemplazar"
 
-#: global.c:420
+#: global.c:425
 msgid "To Files"
 msgstr "A Ficheros"
 
-#: global.c:439
+#: global.c:444
 #, fuzzy
 msgid "Goto"
 msgstr "Ir a Línea"
 
-#: nano.c:136
+#: nano.c:137
 #, c-format
 msgid ""
 "\n"
@@ -446,7 +446,7 @@ msgstr ""
 "\n"
 "Buffer escrito en %s\n"
 
-#: nano.c:138
+#: nano.c:139
 #, c-format
 msgid ""
 "\n"
@@ -455,15 +455,15 @@ msgstr ""
 "\n"
 "No se ha escrito %s (¿existe el fichero?)\n"
 
-#: nano.c:147
+#: nano.c:148
 msgid "Window size is too small for Nano..."
 msgstr "El tamaño de la terminal es demasiado pequeña para Nano..."
 
-#: nano.c:155
+#: nano.c:156
 msgid "Key illegal in VIEW mode"
 msgstr "Tecla ilegal en modo VISUALIZACIÓN"
 
-#: nano.c:199
+#: nano.c:200
 msgid ""
 " nano help text\n"
 "\n"
@@ -476,9 +476,9 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
-"key sequences are notated with the Meta (M) symbol and can be entered using "
-"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
+"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
+"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
@@ -502,15 +502,15 @@ msgstr ""
 "teclas opcionales están representadas entre paréntesis:\n"
 "\n"
 
-#: nano.c:293
+#: nano.c:294
 msgid "delete_node(): free'd a node, YAY!\n"
 msgstr "delete_node(): liberado un nodo, ¡YEAH!\n"
 
-#: nano.c:298
+#: nano.c:299
 msgid "delete_node(): free'd last node.\n"
 msgstr "delete_node(): liberado el último nodo.\n"
 
-#: nano.c:353
+#: nano.c:354
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
@@ -518,84 +518,84 @@ msgstr ""
 "Uso: nano [opción larga GNU] [opción] +LÍNEA <fichero>\n"
 "\n"
 
-#: nano.c:354
+#: nano.c:355
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Opción\t\tOpción larga\t\tSignificado\n"
 
-#: nano.c:356
+#: nano.c:357
 msgid " -T [num]\t--tabsize=[num]\t\tSet width of a tab to num\n"
 msgstr " -T [num]\t--tabsize=[num]\t\tFijar el ancho de tab en num\n"
 
-#: nano.c:359
+#: nano.c:360
 msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
 msgstr " -R\t\t--regexp\t\tUsar expresiones regulares para las búsquedas\n"
 
-#: nano.c:363
+#: nano.c:364
 msgid " -V \t\t--version\t\tPrint version information and exit\n"
 msgstr " -V \t\t--version\t\tImprimir versión y salir\n"
 
-#: nano.c:365
+#: nano.c:366
 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
 msgstr " -c \t\t--const\t\t\tMostrar constantemente la posición del cursor\n"
 
-#: nano.c:367
+#: nano.c:368
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr " -h \t\t--help\t\t\tMostrar este mensaje\n"
 
-#: nano.c:369
+#: nano.c:370
 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
 msgstr " -i \t\t--autoindent\t\tIndentar automáticamente nuevas líneas\n"
 
-#: nano.c:372
+#: nano.c:373
 msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
 msgstr " -k \t\t--cut\t\t\t^K corta desde el cursor al final de línea\n"
 
-#: nano.c:375
+#: nano.c:376
 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite\n"
 msgstr " -l \t\t--nofollow\t\tNo seguir enlaces simbólicos, sobreescribirlos\n"
 
-#: nano.c:378
+#: nano.c:379
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr " -m \t\t--mouse\t\t\tHabilitar ratón\n"
 
-#: nano.c:382
+#: nano.c:383
 msgid " -p\t \t--pico\t\t\tEmulate Pico as closely as possible\n"
 msgstr " -p\t \t--pico\t\t\tEmular a Pico lo máximo posible\n"
 
-#: nano.c:385
+#: nano.c:386
 msgid ""
 " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
 msgstr " -r [#cols] \t--fill=[#cols]\t\tRellenar columnas (wrapear en) #cols\n"
 
-#: nano.c:388
+#: nano.c:389
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr " -s [prog] \t--speller=[prog]\tHabilitar corrector alternativo\n"
 
-#: nano.c:391
+#: nano.c:392
 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\t--tempfile\t\tAutosalvar al salir, sin preguntar\n"
 
-#: nano.c:393
+#: nano.c:394
 msgid " -v \t\t--view\t\t\tView (read only) mode\n"
 msgstr " -v \t\t--view\t\t\tModo visualización (sólo lectura)\n"
 
-#: nano.c:396
+#: nano.c:397
 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
 msgstr " -w \t\t--nowrap\t\tNo wrapear líneas largas\n"
 
-#: nano.c:399
+#: nano.c:400
 msgid " -x \t\t--nohelp\t\tDon't show help window\n"
 msgstr " -x \t\t--nohelp\t\tNo mostrar la ventana de ayuda\n"
 
-#: nano.c:401
+#: nano.c:402
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr " -z \t\t--suspend\t\tHabilitar suspensión\n"
 
-#: nano.c:403
+#: nano.c:404
 msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
 msgstr " +LINE\t\t\t\t\tComenzar en la línea número LÍNEA\n"
 
-#: nano.c:405
+#: nano.c:406
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
@@ -603,92 +603,92 @@ msgstr ""
 "Uso: nano [opción] +LÍNEA <fichero>\n"
 "\n"
 
-#: nano.c:406
+#: nano.c:407
 msgid "Option\t\tMeaning\n"
 msgstr "Opción\t\tSignificado\n"
 
-#: nano.c:407
+#: nano.c:408
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr " -T [num]\tFijar el ancho de tab a num\n"
 
-#: nano.c:408
+#: nano.c:409
 msgid " -R\t\tUse regular expressions for search\n"
 msgstr " -R\t\tUsar expresiones regulares para las búsquedas\n"
 
-#: nano.c:409
+#: nano.c:410
 msgid " -V \t\tPrint version information and exit\n"
 msgstr " -V \t\tImprimir información sobre la versión y salir\n"
 
-#: nano.c:410
+#: nano.c:411
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr " -c \t\tMostrar constantemente la posición del cursor\n"
 
-#: nano.c:411
+#: nano.c:412
 msgid " -h \t\tShow this message\n"
 msgstr " -h \t\tMostrar este mensaje\n"
 
-#: nano.c:412
+#: nano.c:413
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr " -v \t\tIndentar automáticamente nuevas líneas\n"
 
-#: nano.c:414
+#: nano.c:415
 msgid " -k \t\tLet ^K cut from cursor to end of line\n"
 msgstr " -k \t\t^K corta desde el cursor al final de línea\n"
 
-#: nano.c:417
+#: nano.c:418
 msgid " -l \t\tDon't follow symbolic links, overwrite\n"
 msgstr " -l \t\tNo seguir enlaces simbólicos, sobreescribirlos\n"
 
-#: nano.c:420
+#: nano.c:421
 msgid " -m \t\tEnable mouse\n"
 msgstr " -m \t\tHabilitar ratón\n"
 
-#: nano.c:423
+#: nano.c:424
 msgid " -p \t\tEmulate Pico as closely as possible\n"
 msgstr " -p \t\tEmular a Pico lo máximo posible\n"
 
-#: nano.c:425
+#: nano.c:426
 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
 msgstr " -r [#cols] \tRellenar columnas (wrapear líneas en) #cols\n"
 
-#: nano.c:427
+#: nano.c:428
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr " -s [prog] \tHabilitar corrector alternativo\n"
 
-#: nano.c:429
+#: nano.c:430
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\tAutosalvar al salir, no preguntar\n"
 
-#: nano.c:430
+#: nano.c:431
 msgid " -v \t\tView (read only) mode\n"
 msgstr " -v \t\tModo visualización (sólo lectura)\n"
 
-#: nano.c:432
+#: nano.c:433
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr " -w \t\tNo wrapear líneas largas\n"
 
-#: nano.c:434
+#: nano.c:435
 msgid " -x \t\tDon't show help window\n"
 msgstr " -x \t\tNo mostrar la ventana de ayuda\n"
 
-#: nano.c:435
+#: nano.c:436
 msgid " -z \t\tEnable suspend\n"
 msgstr " -z \t\tHabilitar suspensión\n"
 
-#: nano.c:436
+#: nano.c:437
 msgid " +LINE\t\tStart at line number LINE\n"
 msgstr " +LÍNEA\t\tComenzar en la línea número LÍNEA\n"
 
-#: nano.c:443
+#: nano.c:444
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano versión %s (compilado %s, %s)\n"
 
-#: nano.c:446
+#: nano.c:447
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 msgstr " Correo-e: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 
-#: nano.c:447
+#: nano.c:448
 msgid ""
 "\n"
 " Compiled options:"
@@ -696,270 +696,264 @@ msgstr ""
 "\n"
 " Opciones compiladas:"
 
-#: nano.c:522
+#: nano.c:526
 msgid "Mark Set"
 msgstr "Marca Establecida"
 
-#: nano.c:527
+#: nano.c:531
 msgid "Mark UNset"
 msgstr "Marca Borrada"
 
-#: nano.c:1029
+#: nano.c:1033
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap llamada con inptr->data=\"%s\"\n"
 
-#: nano.c:1081
+#: nano.c:1085
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data ahora = \"%d\"\n"
 
-#: nano.c:1133
+#: nano.c:1137
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Después, data = \"%s\"\n"
 
-#: nano.c:1234
+#: nano.c:1238
 msgid "Edit a replacement"
 msgstr "Editar un reemplazo"
 
-#: nano.c:1463
+#: nano.c:1468
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "No pude crear un fichero temporal: %s"
 
-#: nano.c:1469
+#: nano.c:1474
 msgid "Spell checking failed: unable to write temp file!"
 msgstr ""
 "Comprobación de ortografía fallida: ¡no se pudo escribir fichero temporal!"
 
-#: nano.c:1481
+#: nano.c:1486
 msgid "Finished checking spelling"
 msgstr "Revisión de ortografía finalizada"
 
-#: nano.c:1483
+#: nano.c:1488
 msgid "Spell checking failed"
 msgstr "Comprobación de ortografía fallida"
 
-#: nano.c:1502
+#: nano.c:1507
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "¿ Salvar el buffer modificado (RESPONDER \"No\" DESTRUIRÁ LOS CAMBIOS) ?"
 
-#: nano.c:1619
+#: nano.c:1624
 msgid "Received SIGHUP"
 msgstr "SIGHUP recibido"
 
-#: nano.c:1682
+#: nano.c:1687
 msgid "Cannot resize top win"
 msgstr "No se puede cambiar el tamaño de la ventana superior"
 
-#: nano.c:1684
+#: nano.c:1689
 msgid "Cannot move top win"
 msgstr "No se puede mover la ventana superior"
 
-#: nano.c:1686
+#: nano.c:1691
 msgid "Cannot resize edit win"
 msgstr "No se puede cambiar el tamaño de la ventana de edición"
 
-#: nano.c:1688
+#: nano.c:1693
 msgid "Cannot move edit win"
 msgstr "No se puede mover la ventana de edición"
 
-#: nano.c:1690
+#: nano.c:1695
 msgid "Cannot resize bottom win"
 msgstr "No se puede cambiar el tamaño de la ventana inferior"
 
-#: nano.c:1692
+#: nano.c:1697
 msgid "Cannot move bottom win"
 msgstr "No se puede mover la ventana inferior"
 
-#: nano.c:2001
+#: nano.c:2006
 msgid "Can now UnJustify!"
 msgstr "¡Ahora puedes desjustificar!"
 
-#: nano.c:2099
+#: nano.c:2104
 #, c-format
 msgid "%s enable/disable"
 msgstr "%s habilitar/deshabilitar"
 
-#: nano.c:2114
+#: nano.c:2119
 msgid "enabled"
 msgstr "habilitado"
 
-#: nano.c:2115
+#: nano.c:2120
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: nano.c:2168
+#: nano.c:2173
 msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 msgstr ""
 "Detectado NumLock roto.  El tecl. numérico funcionará con NumLock activado"
 
-#: nano.c:2396
+#: nano.c:2405
 msgid "Main: set up windows\n"
 msgstr "Main: configurar las ventanas\n"
 
-#: nano.c:2403
+#: nano.c:2416
 msgid "Main: bottom win\n"
 msgstr "Main: ventana inferior\n"
 
-#: nano.c:2409
+#: nano.c:2422
 msgid "Main: open file\n"
 msgstr "Main: abrir fichero\n"
 
-#: nano.c:2464
+#: nano.c:2478
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "¡Pillé Alt-O-%c! (%d)\n"
 
-#: nano.c:2491
+#: nano.c:2505
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "¡Pillé Alt-[-1-%c! (%d)\n"
 
-#: nano.c:2524
+#: nano.c:2538
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "¡Pillé Alt-[-2-%c! (%d)\n"
 
-#: nano.c:2566
+#: nano.c:2584
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "¡Pillé Alt-[-%c! (%d)\n"
 
-#: nano.c:2592
+#: nano.c:2610
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "¡Pillé Alt-%c! (%d)\n"
 
-#: search.c:117
+#: search.c:118
 #, c-format
 msgid "Case Sensitive Regexp Search%s%s"
 msgstr "Búsqueda con Regexp y Mayúsculas/Minúsculas%s%s"
 
-#: search.c:119
+#: search.c:120
 #, c-format
 msgid "Regexp Search%s%s"
 msgstr "Busqueda con Regexp%s%s"
 
-#: search.c:121
+#: search.c:122
 #, c-format
 msgid "Case Sensitive Search%s%s"
 msgstr "Búsqueda con Mayúsculas/Minúsculas%s%s"
 
-#: search.c:123
+#: search.c:124
 #, c-format
 msgid "Search%s%s"
 msgstr "Buscar%s%s"
 
-#: search.c:126
+#: search.c:127
 msgid " (to replace)"
 msgstr " (a reemplazar)"
 
-#: search.c:135 search.c:326
+#: search.c:136 search.c:327
 msgid "Search Cancelled"
 msgstr "Búsqueda Cancelada"
 
-#: search.c:199
+#: search.c:200
 #, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s...\" no encontrado"
 
-#: search.c:248
+#: search.c:249
 msgid "Search Wrapped"
 msgstr "Búsqueda Recomenzada"
 
-#: search.c:348
+#: search.c:349
 #, c-format
 msgid "Replaced %d occurrences"
 msgstr "%d ocurrencias reemplazadas"
 
-#: search.c:350
+#: search.c:351
 msgid "Replaced 1 occurrence"
 msgstr "1 ocurrencia reemplazada"
 
-#: search.c:488 search.c:592 search.c:608
+#: search.c:489 search.c:599 search.c:615
 msgid "Replace Cancelled"
 msgstr "Reemplazar Cancelado"
 
-#: search.c:538
+#: search.c:539
 msgid "Replace this instance?"
 msgstr "¿Reemplazar esta instancia?"
 
-#: search.c:550
+#: search.c:551
 msgid "Replace failed: unknown subexpression!"
 msgstr "Fallo en reemplazar: ¡subexpresión desconocida!"
 
-#: search.c:633
+#: search.c:640
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Reemplazar con [%s]"
 
-#: search.c:637 search.c:641
+#: search.c:644 search.c:648
 msgid "Replace with"
 msgstr "Reemplazar con"
 
-#. Ask for it
-#: search.c:676
+#: search.c:682
 msgid "Enter line number"
 msgstr "Introduce número de línea"
 
-#: search.c:678
+#: search.c:684
 msgid "Aborted"
 msgstr "Abortado"
 
-#: search.c:698
+#: search.c:693
 msgid "Come on, be reasonable"
 msgstr "Venga ya, se razonable"
 
-#: search.c:703
-#, c-format
-msgid "Only %d lines available, skipping to last line"
-msgstr "Sólo hay %d líneas, saltando hasta la última"
-
-#: winio.c:123
+#: winio.c:124
 #, c-format
 msgid "actual_x_from_start for xplus=%d returned %d\n"
 msgstr "actual_x_from_start para xplus=%d devolvió %d\n"
 
-#: winio.c:279
+#: winio.c:288
 #, fuzzy, c-format
 msgid "Aha! '%c' (%d)\n"
 msgstr "entrada '%c' (%d)\n"
 
-#: winio.c:461
+#: winio.c:470
 #, c-format
 msgid "input '%c' (%d)\n"
 msgstr "entrada '%c' (%d)\n"
 
-#: winio.c:503
+#: winio.c:519
 msgid "New Buffer"
 msgstr "Nuevo Buffer"
 
-#: winio.c:507
+#: winio.c:523
 msgid "  File: ..."
 msgstr "Fichero: ..."
 
-#: winio.c:509
+#: winio.c:525
 msgid "   DIR: ..."
 msgstr "   DIR: ..."
 
-#: winio.c:520
+#: winio.c:536
 msgid "Modified"
 msgstr "Modificado"
 
-#: winio.c:972
+#: winio.c:1078
 #, c-format
 msgid "Moved to (%d, %d) in edit buffer\n"
 msgstr "Moviendo a (%d, %d) en buffer de edición\n"
 
-#: winio.c:983
+#: winio.c:1089
 #, c-format
 msgid "current->data = \"%s\"\n"
 msgstr "current->data = \"%s\"\n"
 
-#: winio.c:1028
+#: winio.c:1146
 #, c-format
 msgid "I got \"%s\"\n"
 msgstr "Pillé \"%s\"\n"
@@ -967,80 +961,83 @@ msgstr "Pill
 #. Yes, no and all are strings of any length.  Each string consists of
 #. all characters accepted as a valid character for that value.
 #. The first value will be the one displayed in the shortcuts.
-#: winio.c:1057
+#: winio.c:1175
 msgid "Yy"
 msgstr "Ss"
 
-#: winio.c:1058
+#: winio.c:1176
 msgid "Nn"
 msgstr "Nn"
 
-#: winio.c:1059
+#: winio.c:1177
 msgid "Aa"
 msgstr "Tt"
 
-#: winio.c:1072
+#: winio.c:1191
 msgid "Yes"
 msgstr "Sí"
 
-#: winio.c:1076
+#: winio.c:1195
 msgid "All"
 msgstr "Todas"
 
-#: winio.c:1081
+#: winio.c:1200
 msgid "No"
 msgstr "No"
 
-#: winio.c:1257
+#: winio.c:1400
 #, c-format
 msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
-#: winio.c:1261
+#: winio.c:1404
 #, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "línea %d de %d (%.0f%%), carácter %d de %d (%.0f%%)"
 
-#: winio.c:1402
+#: winio.c:1545
 msgid "Dumping file buffer to stderr...\n"
 msgstr "Volcando buffer de fichero a stderr...\n"
 
-#: winio.c:1404
+#: winio.c:1547
 msgid "Dumping cutbuffer to stderr...\n"
 msgstr "Volcando el cutbuffer a stderr...\n"
 
-#: winio.c:1406
+#: winio.c:1549
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Volcando un buffer a stderr...\n"
 
-#: winio.c:1481
+#: winio.c:1624
 msgid "The nano text editor"
 msgstr "El editor de textos GNU nano"
 
-#: winio.c:1482
+#: winio.c:1625
 msgid "version "
 msgstr "versión "
 
-#: winio.c:1483
+#: winio.c:1626
 msgid "Brought to you by:"
 msgstr "Por cortesía de:"
 
-#: winio.c:1484
+#: winio.c:1627
 msgid "Special thanks to:"
 msgstr "Agradecimientos especiales para:"
 
-#: winio.c:1485
+#: winio.c:1628
 msgid "The Free Software Foundation"
 msgstr "La Free Software Foundation"
 
-#: winio.c:1486
+#: winio.c:1629
 msgid "Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurses"
 msgstr "Pavel Curtis, Zeyd Ben-Halim y Eric S. Raymond por ncurses"
 
-#: winio.c:1487
+#: winio.c:1630
 msgid "and anyone else we forgot..."
 msgstr "y cualquiera del que nos hayamos olvidado..."
 
-#: winio.c:1488
+#: winio.c:1631
 msgid "Thank you for using nano!\n"
 msgstr "¡Gracias por usar nano!\n"
+
+#~ msgid "Only %d lines available, skipping to last line"
+#~ msgstr "Sólo hay %d líneas, saltando hasta la última"
diff --git a/po/fi.po b/po/fi.po
index 0dd25502..d8be11f3 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 0.9.18\n"
-"POT-Creation-Date: 2001-04-18 18:10-0400\n"
+"POT-Creation-Date: 2001-04-30 09:44-0400\n"
 "PO-Revision-Date: 2001-01-12 17:21+02:00\n"
 "Last-Translator: Pauli Virtanen <pauli.virtanen@saunalahti.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -13,428 +13,428 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cut.c:44
+#: cut.c:45
 #, c-format
 msgid "add_to_cutbuffer called with inptr->data = %s\n"
 msgstr "add_to_cutbuffer funktion parametri inptr->data = %s\n"
 
-#: cut.c:150
+#: cut.c:151
 msgid "Blew away cutbuffer =)\n"
 msgstr "Leiketila katosi =)\n"
 
-#: files.c:123
+#: files.c:124
 msgid "read_line: not on first line and prev is NULL"
 msgstr "read_line: ei ensimmäisellä rivillä ja prev on NULL"
 
-#: files.c:185 files.c:203
+#: files.c:186 files.c:204
 #, c-format
 msgid "Read %d lines"
 msgstr "%d riviä luettu"
 
-#: files.c:221 search.c:193
+#: files.c:222 search.c:194
 #, c-format
 msgid "\"%s\" not found"
 msgstr "Ei löytynyt: \"%s\""
 
 #. We have a new file
-#: files.c:225
+#: files.c:226
 msgid "New File"
 msgstr "Uusi tiedosto"
 
-#: files.c:238
+#: files.c:239
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr "\"%s\" on hakemisto"
 
 #. Don't open character or block files.  Sorry, /dev/sndstat!
-#: files.c:241
+#: files.c:242
 #, c-format
 msgid "File \"%s\" is a device file"
 msgstr "\"%s\" on laitetiedosto"
 
-#: files.c:248
+#: files.c:249
 msgid "Reading File"
 msgstr "Lukee tiedostoa"
 
-#: files.c:264
+#: files.c:265
 msgid "File to insert [from ./] "
 msgstr "Lisättävä tiedosto [hakemistossa ./]"
 
-#: files.c:313 files.c:338 files.c:574 nano.c:1515
+#: files.c:314 files.c:339 files.c:575 nano.c:1520
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#: files.c:384 files.c:400 files.c:414 files.c:431 files.c:437
+#: files.c:385 files.c:401 files.c:415 files.c:432 files.c:438
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Tiedostoa ei voitu avata luettavaksi: %s"
 
-#: files.c:419
+#: files.c:420
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Kirjoitettu: >%s\n"
 
-#: files.c:446
+#: files.c:447
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Tiedostoa %s ei voitu sulkea: %s"
 
 #. Try a rename??
-#: files.c:469 files.c:478 files.c:483
+#: files.c:470 files.c:479 files.c:484
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Tiedostoa %s ei voitu avata kirjoittamista varten: %s"
 
-#: files.c:490
+#: files.c:491
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Oikeuksia %o ei voitu asettaa tiedostolle %s: %s"
 
-#: files.c:495
+#: files.c:496
 #, c-format
 msgid "Wrote %d lines"
 msgstr "%d riviä kirjoitettu"
 
-#: files.c:530
+#: files.c:531
 msgid "File Name to write"
 msgstr "Kirjoitettavan tiedoston nimi"
 
-#: files.c:549
+#: files.c:550
 #, c-format
 msgid "filename is %s"
 msgstr "tiedoston nimi on %s"
 
-#: files.c:563
+#: files.c:564
 msgid "File exists, OVERWRITE ?"
 msgstr "Tiedosto on jo olemassa, korvataanko?"
 
-#: files.c:985
+#: files.c:986
 msgid "(more)"
 msgstr "(lisää)"
 
-#: files.c:1256
+#: files.c:1257
 msgid "Can't move up a directory"
 msgstr "Ei voi siirtyä ylähakemistoon"
 
 #. We can't open this dir for some reason.  Complain
-#: files.c:1266 files.c:1314
+#: files.c:1267 files.c:1315
 #, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "Hakemistoa \"%s\" ei voi avata: %s"
 
-#: files.c:1294 global.c:227
+#: files.c:1295 global.c:232
 #, fuzzy
 msgid "Goto Directory"
 msgstr "Siirry"
 
-#: files.c:1299
+#: files.c:1300
 #, fuzzy
 msgid "Goto Cancelled"
 msgstr "Peruttu"
 
-#: global.c:139
+#: global.c:144
 msgid "Constant cursor position"
 msgstr "Näytä kohdistimen sijainti aina"
 
-#: global.c:140
+#: global.c:145
 msgid "Auto indent"
 msgstr "Automaattinen sisennys"
 
-#: global.c:141
+#: global.c:146
 msgid "Suspend"
 msgstr "Keskeytä"
 
-#: global.c:142
+#: global.c:147
 msgid "Help mode"
 msgstr "Ohjetila"
 
-#: global.c:143
+#: global.c:148
 msgid "Pico mode"
 msgstr "Pico-tila"
 
-#: global.c:144
+#: global.c:149
 msgid "Mouse support"
 msgstr "Hiirituki"
 
-#: global.c:145
+#: global.c:150
 msgid "Cut to end"
 msgstr "Leikkaa loppuun saakka"
 
-#: global.c:147
+#: global.c:152
 msgid "Regular expressions"
 msgstr "Säännölliset lausekkeet"
 
-#: global.c:149
+#: global.c:154
 msgid "Auto wrap"
 msgstr "Automaattinen rivitys"
 
-#: global.c:194
+#: global.c:199
 msgid "Invoke the help menu"
 msgstr "Avaa ohjevalikko"
 
-#: global.c:195
+#: global.c:200
 msgid "Write the current file to disk"
 msgstr "Kirjoita nykyinen tiedosto levylle"
 
-#: global.c:196
+#: global.c:201
 msgid "Exit from nano"
 msgstr "Poistu Nanosta"
 
-#: global.c:197
+#: global.c:202
 msgid "Goto a specific line number"
 msgstr "Siirry tietylle riville"
 
-#: global.c:198
+#: global.c:203
 msgid "Justify the current paragraph"
 msgstr "Tasaa nykyinen kappale"
 
-#: global.c:199
+#: global.c:204
 msgid "Unjustify after a justify"
 msgstr "Poista tasaus tasauksen jälkeen"
 
-#: global.c:200
+#: global.c:205
 msgid "Replace text within the editor"
 msgstr "Etsi ja korvaa tekstiä"
 
-#: global.c:201
+#: global.c:206
 msgid "Insert another file into the current one"
 msgstr "Lisää toinen tiedosto nykyiseen tiedostoon"
 
-#: global.c:202
+#: global.c:207
 msgid "Search for text within the editor"
 msgstr "Etsi tekstiä"
 
-#: global.c:203
+#: global.c:208
 msgid "Move to the previous screen"
 msgstr "Siirry edelliseen ruutuun"
 
-#: global.c:204
+#: global.c:209
 msgid "Move to the next screen"
 msgstr "Siirry seuraavaan ruutuun"
 
-#: global.c:205
+#: global.c:210
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Leikkaa nykyinen rivi leiketilaan"
 
-#: global.c:206
+#: global.c:211
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Kopioi rivi leiketilasta nykyiselle riville"
 
-#: global.c:207
+#: global.c:212
 msgid "Show the posititon of the cursor"
 msgstr "Näytä kohdistimen sijainti"
 
-#: global.c:208
+#: global.c:213
 msgid "Invoke the spell checker (if available)"
 msgstr "Käynnistä oikoluin (jos saatavilla)"
 
-#: global.c:209
+#: global.c:214
 msgid "Move up one line"
 msgstr "Siirry yksi rivi ylöspäin"
 
-#: global.c:210
+#: global.c:215
 msgid "Move down one line"
 msgstr "Siirry yksi rivi alaspäin"
 
-#: global.c:211
+#: global.c:216
 msgid "Move forward one character"
 msgstr "Siirry yksi merkki eteenpäin"
 
-#: global.c:212
+#: global.c:217
 msgid "Move back one character"
 msgstr "Siirry yksi merkki taaksepäin"
 
-#: global.c:213
+#: global.c:218
 msgid "Move to the beginning of the current line"
 msgstr "Siirry nykyisen rivin alkuun"
 
-#: global.c:214
+#: global.c:219
 msgid "Move to the end of the current line"
 msgstr "Siirry nykyisen rivin loppuun"
 
-#: global.c:215
+#: global.c:220
 msgid "Go to the first line of the file"
 msgstr "Siirry tiedoston ensimmäiselle riville"
 
-#: global.c:216
+#: global.c:221
 msgid "Go to the last line of the file"
 msgstr "Siirry tiedoston viimeiselle riville"
 
-#: global.c:217
+#: global.c:222
 msgid "Refresh (redraw) the current screen"
 msgstr "Piirrä ruutu uudestaan"
 
-#: global.c:218
+#: global.c:223
 msgid "Mark text at the current cursor location"
 msgstr "Merkitse kohdistimen kohdalla oleva teksti"
 
-#: global.c:219
+#: global.c:224
 msgid "Delete the character under the cursor"
 msgstr "Poista kohdistimen kohdalla oleva merkki"
 
-#: global.c:221
+#: global.c:226
 msgid "Delete the character to the left of the cursor"
 msgstr "Poista kohdistimesta vasemmalle oleva merkki"
 
-#: global.c:222
+#: global.c:227
 msgid "Insert a tab character"
 msgstr "Lisää sarkainmerkki"
 
-#: global.c:223
+#: global.c:228
 msgid "Insert a carriage return at the cursor position"
 msgstr "Lisää rivinvaihto kohdistimen kohdalle"
 
-#: global.c:225
+#: global.c:230
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Muuta etsintä- tai korvaustoiminnon kirjainkoosta piittaamista."
 
-#: global.c:226
+#: global.c:231
 msgid "Go to file browser"
 msgstr "Siirry tiedostoselaimeen"
 
-#: global.c:228
+#: global.c:233
 msgid "Cancel the current function"
 msgstr "Peru nykyinen toiminto."
 
-#: global.c:231
+#: global.c:236
 msgid "Get Help"
 msgstr "Ohjeita"
 
-#: global.c:234 global.c:415 global.c:442
+#: global.c:239 global.c:420 global.c:447
 msgid "Exit"
 msgstr "Lopeta"
 
-#: global.c:237
+#: global.c:242
 msgid "WriteOut"
 msgstr "Kirjoita"
 
-#: global.c:242 global.c:331
+#: global.c:247 global.c:336
 msgid "Justify"
 msgstr "Tasaa"
 
-#: global.c:246 global.c:252
+#: global.c:251 global.c:257
 msgid "Read File"
 msgstr "Lue tied."
 
-#: global.c:256 global.c:327 global.c:355
+#: global.c:261 global.c:332 global.c:360
 msgid "Replace"
 msgstr "Korvaa"
 
-#: global.c:260
+#: global.c:265
 msgid "Where Is"
 msgstr "Etsi"
 
-#: global.c:264 global.c:407 global.c:431
+#: global.c:269 global.c:412 global.c:436
 msgid "Prev Page"
 msgstr "Ed. sivu"
 
-#: global.c:268 global.c:411 global.c:435
+#: global.c:273 global.c:416 global.c:440
 msgid "Next Page"
 msgstr "Seur. sivu"
 
-#: global.c:272
+#: global.c:277
 msgid "Cut Text"
 msgstr "Leikkaa"
 
-#: global.c:276
+#: global.c:281
 msgid "UnJustify"
 msgstr "Poista tasaus"
 
-#: global.c:279
+#: global.c:284
 msgid "UnCut Txt"
 msgstr "Liitä"
 
-#: global.c:283
+#: global.c:288
 msgid "Cur Pos"
 msgstr "Sijainti"
 
-#: global.c:287
+#: global.c:292
 msgid "To Spell"
 msgstr "Oikolue"
 
-#: global.c:291
+#: global.c:296
 msgid "Up"
 msgstr "Ylös"
 
-#: global.c:294
+#: global.c:299
 msgid "Down"
 msgstr "Alas"
 
-#: global.c:297
+#: global.c:302
 msgid "Forward"
 msgstr "Eteenpäin"
 
-#: global.c:300
+#: global.c:305
 msgid "Back"
 msgstr "Takaisin"
 
-#: global.c:303
+#: global.c:308
 msgid "Home"
 msgstr "Home"
 
-#: global.c:306
+#: global.c:311
 msgid "End"
 msgstr "End"
 
-#: global.c:309
+#: global.c:314
 msgid "Refresh"
 msgstr "Piirrä uudelleen"
 
-#: global.c:312
+#: global.c:317
 msgid "Mark Text"
 msgstr "Merkitse tekstiä"
 
-#: global.c:315
+#: global.c:320
 msgid "Delete"
 msgstr "Poista"
 
-#: global.c:319
+#: global.c:324
 msgid "Backspace"
 msgstr "Askelpalautin"
 
-#: global.c:323
+#: global.c:328
 msgid "Tab"
 msgstr "Sarkain"
 
-#: global.c:335
+#: global.c:340
 msgid "Enter"
 msgstr "Enter"
 
-#: global.c:339 global.c:359 global.c:379
+#: global.c:344 global.c:364 global.c:384
 msgid "Goto Line"
 msgstr "Siirry"
 
-#: global.c:345 global.c:366 global.c:387 global.c:397
+#: global.c:350 global.c:371 global.c:392 global.c:402
 msgid "First Line"
 msgstr "1. rivi"
 
-#: global.c:348 global.c:369 global.c:390 global.c:400
+#: global.c:353 global.c:374 global.c:395 global.c:405
 msgid "Last Line"
 msgstr "Viim. rivi"
 
-#: global.c:351 global.c:372
+#: global.c:356 global.c:377
 msgid "Case Sens"
 msgstr "Kirj. koko"
 
-#: global.c:362 global.c:382 global.c:393 global.c:403 global.c:424
-#: global.c:427 global.c:445 winio.c:1083
+#: global.c:367 global.c:387 global.c:398 global.c:408 global.c:429
+#: global.c:432 global.c:450 winio.c:1202
 msgid "Cancel"
 msgstr "Peru"
 
-#: global.c:375
+#: global.c:380
 msgid "No Replace"
 msgstr "Älä korvaa"
 
-#: global.c:420
+#: global.c:425
 msgid "To Files"
 msgstr "Tiedosto"
 
-#: global.c:439
+#: global.c:444
 #, fuzzy
 msgid "Goto"
 msgstr "Siirry"
 
-#: nano.c:136
+#: nano.c:137
 #, c-format
 msgid ""
 "\n"
@@ -443,7 +443,7 @@ msgstr ""
 "\n"
 "Teksti kirjoitettu tiedostoon \"%s\"\n"
 
-#: nano.c:138
+#: nano.c:139
 #, c-format
 msgid ""
 "\n"
@@ -452,15 +452,15 @@ msgstr ""
 "\n"
 "Tiedostoa %s ei saatu kirjoitettua (onko se jo olemassa?)\n"
 
-#: nano.c:147
+#: nano.c:148
 msgid "Window size is too small for Nano..."
 msgstr "Ikkuna on liian pieni Nanolle..."
 
-#: nano.c:155
+#: nano.c:156
 msgid "Key illegal in VIEW mode"
 msgstr "Virheellinen näppäin katselutilassa"
 
-#: nano.c:199
+#: nano.c:200
 msgid ""
 " nano help text\n"
 "\n"
@@ -473,9 +473,9 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
-"key sequences are notated with the Meta (M) symbol and can be entered using "
-"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
+"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
+"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
@@ -496,102 +496,102 @@ msgstr ""
 "sulkeissa:\n"
 "\n"
 
-#: nano.c:293
+#: nano.c:294
 msgid "delete_node(): free'd a node, YAY!\n"
 msgstr "delete_node(): solmu vapautettu, YAY!\n"
 
-#: nano.c:298
+#: nano.c:299
 msgid "delete_node(): free'd last node.\n"
 msgstr "delete_node(): viimeinen solmu vapautettu.\n"
 
-#: nano.c:353
+#: nano.c:354
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
 msgstr "Käyttö: nano [GNU pitkät valitsimet] [valitsimet] +RIVI <tiedosto>\n"
 
-#: nano.c:354
+#: nano.c:355
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Valitsin\tPitkä valitsin\t\tMerkitys\n"
 
-#: nano.c:356
+#: nano.c:357
 msgid " -T [num]\t--tabsize=[num]\t\tSet width of a tab to num\n"
 msgstr " -T [luku]\t--tabsize=[luku]\tAseta sarkaimen leveys\n"
 
-#: nano.c:359
+#: nano.c:360
 msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
 msgstr " -R\t\t--regexp\t\tEtsi säännöllisillä lausekkeilla\n"
 
-#: nano.c:363
+#: nano.c:364
 msgid " -V \t\t--version\t\tPrint version information and exit\n"
 msgstr " -V \t\t--version\t\tTulosta versiotiedot ja lopeta\n"
 
-#: nano.c:365
+#: nano.c:366
 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
 msgstr " -c \t\t--const\t\t\tNäytä kohdistimen sijainti jatkuvasti\n"
 
-#: nano.c:367
+#: nano.c:368
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr " -h \t\t--help\t\t\tNäytä tämä ohje\n"
 
-#: nano.c:369
+#: nano.c:370
 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
 msgstr " -i \t\t--autoindent\t\tSisennä uudet rivit automaattisesti\n"
 
-#: nano.c:372
+#: nano.c:373
 msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
 msgstr " -k \t\t--cut\t\t\t^K leikkaa rivin loppuun saakka\n"
 
-#: nano.c:375
+#: nano.c:376
 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite\n"
 msgstr ""
 " -l \t\t--nofollow\t\tÄlä seuraa symbolisia linkkejä, vaan\n"
 "\t\t\t\t\tkorvaa ne tiedostoilla.\n"
 
-#: nano.c:378
+#: nano.c:379
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr " -m \t\t--mouse\t\t\tKäytä hiirtä\n"
 
-#: nano.c:382
+#: nano.c:383
 msgid " -p\t \t--pico\t\t\tEmulate Pico as closely as possible\n"
 msgstr " -p\t \t--pico\t\t\tJäljittele Picoa tarkasti\n"
 
-#: nano.c:385
+#: nano.c:386
 msgid ""
 " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
 msgstr " -r [#lkm] \t--fill=[#lkm]\t\tRivitä annettua pidemmät rivit\n"
 
-#: nano.c:388
+#: nano.c:389
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr " -s [ohjelma] \t--speller=[ohjelma]\tKäytä annettua oikolukuohjelmaa\n"
 
-#: nano.c:391
+#: nano.c:392
 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
 msgstr ""
 " -t \t\t--tempfile\t\tTallenna tiedosto kysymättä\n"
 "\t\t\t\t\tpoistuttaessa \n"
 
-#: nano.c:393
+#: nano.c:394
 msgid " -v \t\t--view\t\t\tView (read only) mode\n"
 msgstr " -v \t\t--view\t\t\tKatselutila (vain luku)\n"
 
-#: nano.c:396
+#: nano.c:397
 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
 msgstr " -w \t\t--nowrap\t\tÄlä rivitä pitkiä rivejä\n"
 
-#: nano.c:399
+#: nano.c:400
 msgid " -x \t\t--nohelp\t\tDon't show help window\n"
 msgstr " -x \t\t--nohelp\t\tÄlä näytä ohjeikkunaa\n"
 
-#: nano.c:401
+#: nano.c:402
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr " -z \t\t--suspend\t\tMahdollista keskeyttäminen\n"
 
-#: nano.c:403
+#: nano.c:404
 msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
 msgstr " +RIVI\t\t\t\t\tSiirry riville RIVI\n"
 
-#: nano.c:405
+#: nano.c:406
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
@@ -599,93 +599,93 @@ msgstr ""
 "Käyttö: nano [asetukset] +RIVI <tiedosto>\n"
 "\n"
 
-#: nano.c:406
+#: nano.c:407
 msgid "Option\t\tMeaning\n"
 msgstr "Asetus\t\tMerkitys\n"
 
-#: nano.c:407
+#: nano.c:408
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr " -T [leveys]\tAseta sarkaimen leveys\n"
 
-#: nano.c:408
+#: nano.c:409
 msgid " -R\t\tUse regular expressions for search\n"
 msgstr " -R\t\tEtsi säännöllisillä lausekkeilla\n"
 
-#: nano.c:409
+#: nano.c:410
 msgid " -V \t\tPrint version information and exit\n"
 msgstr " -V \t\tTulosta versiotiedot ja lopeta\n"
 
-#: nano.c:410
+#: nano.c:411
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr " -c \t\tNäytä kohdistimen sijainti jatkuvasti\n"
 
-#: nano.c:411
+#: nano.c:412
 msgid " -h \t\tShow this message\n"
 msgstr " -h \t\tNäytä tämä ohje\n"
 
-#: nano.c:412
+#: nano.c:413
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr " -i \t\tSisennä uudet rivit automaattisesti\n"
 
-#: nano.c:414
+#: nano.c:415
 msgid " -k \t\tLet ^K cut from cursor to end of line\n"
 msgstr " -k \t\t^K leikkaa rivin loppuun saakka\n"
 
-#: nano.c:417
+#: nano.c:418
 msgid " -l \t\tDon't follow symbolic links, overwrite\n"
 msgstr " -l \t\tÄlä seuraa symbolisia linkkejä, vaan korvaa ne tiedostoilla.\n"
 
-#: nano.c:420
+#: nano.c:421
 msgid " -m \t\tEnable mouse\n"
 msgstr " -m \t\tKäytä hiirtä\n"
 
-#: nano.c:423
+#: nano.c:424
 msgid " -p \t\tEmulate Pico as closely as possible\n"
 msgstr " -p \t\tJäljittele Picoa mahdollisimman tarkasti\n"
 
-#: nano.c:425
+#: nano.c:426
 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
 msgstr " -r [#lkm] \tRivitä annettua pidemmät rivit\n"
 
-#: nano.c:427
+#: nano.c:428
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr " -s [ohjelma]  \tKäytä annettua oikolukuohjelmaa\n"
 
-#: nano.c:429
+#: nano.c:430
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\tTallenna tiedosto kysymättä poistuttaessa\n"
 
-#: nano.c:430
+#: nano.c:431
 msgid " -v \t\tView (read only) mode\n"
 msgstr " -v \t\tKatselutila (vain luku)\n"
 
-#: nano.c:432
+#: nano.c:433
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr " -w \t\tÄlä rivitä pitkiä rivejä\n"
 
-#: nano.c:434
+#: nano.c:435
 msgid " -x \t\tDon't show help window\n"
 msgstr " -x \t\tÄlä näytä ohjeikkunaa\n"
 
-#: nano.c:435
+#: nano.c:436
 msgid " -z \t\tEnable suspend\n"
 msgstr " -z \t\tMahdollista keskeyttäminen\n"
 
-#: nano.c:436
+#: nano.c:437
 msgid " +LINE\t\tStart at line number LINE\n"
 msgstr " +RIVI\t\tSiirry riville RIVI\n"
 
-#: nano.c:443
+#: nano.c:444
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU Nano, versio %s. (käännetty %s, %s)\n"
 
-#: nano.c:446
+#: nano.c:447
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 msgstr ""
 " Sähköposti: nano@nano-editor.org\tInternet: http://www.nano-editor.org"
 
-#: nano.c:447
+#: nano.c:448
 msgid ""
 "\n"
 " Compiled options:"
@@ -693,269 +693,263 @@ msgstr ""
 "\n"
 " Mukaan käännetyt valitsimet:"
 
-#: nano.c:522
+#: nano.c:526
 msgid "Mark Set"
 msgstr "Merkintä alkoi"
 
-#: nano.c:527
+#: nano.c:531
 msgid "Mark UNset"
 msgstr "Merkintä loppui"
 
-#: nano.c:1029
+#: nano.c:1033
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap -funktion parametri inptr->data=\"%s\"\n"
 
-#: nano.c:1081
+#: nano.c:1085
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data nyt = \"%s\"\n"
 
-#: nano.c:1133
+#: nano.c:1137
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Jälkeenpäin, data = \"%s\"\n"
 
-#: nano.c:1234
+#: nano.c:1238
 msgid "Edit a replacement"
 msgstr "Muokkaa korvausta"
 
-#: nano.c:1463
+#: nano.c:1468
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Väliaikaista tiedostonnimeä ei voitu luoda: %s"
 
-#: nano.c:1469
+#: nano.c:1474
 msgid "Spell checking failed: unable to write temp file!"
 msgstr "Oikaisuluku epäonnistui: väliaikaistiedostoa ei voitu kirjoittaa"
 
-#: nano.c:1481
+#: nano.c:1486
 msgid "Finished checking spelling"
 msgstr "Oikoluku on valmis"
 
-#: nano.c:1483
+#: nano.c:1488
 msgid "Spell checking failed"
 msgstr "Oikaisuluku epäonnistui"
 
-#: nano.c:1502
+#: nano.c:1507
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Tallenna muutettu teksti (Muutokset häviävät, jos vastaat \"ei\") ? "
 
-#: nano.c:1619
+#: nano.c:1624
 msgid "Received SIGHUP"
 msgstr "Vastaanotettiin SIGHUP"
 
-#: nano.c:1682
+#: nano.c:1687
 msgid "Cannot resize top win"
 msgstr "Yläikkunan kokoa ei voi muuttaa"
 
-#: nano.c:1684
+#: nano.c:1689
 msgid "Cannot move top win"
 msgstr "Yläikkunaa ei voi siirtää"
 
-#: nano.c:1686
+#: nano.c:1691
 msgid "Cannot resize edit win"
 msgstr "Muokkausikkunan kokoa ei voi muuttaa"
 
-#: nano.c:1688
+#: nano.c:1693
 msgid "Cannot move edit win"
 msgstr "Muokkausikkunaa ei voi siirtää"
 
-#: nano.c:1690
+#: nano.c:1695
 msgid "Cannot resize bottom win"
 msgstr "Alaikkunan kokoa ei voi muuttaa"
 
-#: nano.c:1692
+#: nano.c:1697
 msgid "Cannot move bottom win"
 msgstr "Alaikkunaa ei voi siirtää"
 
-#: nano.c:2001
+#: nano.c:2006
 msgid "Can now UnJustify!"
 msgstr "Tasaamisen voi perua nyt."
 
-#: nano.c:2099
+#: nano.c:2104
 #, c-format
 msgid "%s enable/disable"
 msgstr "%s käytössä/ei käytössä"
 
-#: nano.c:2114
+#: nano.c:2119
 msgid "enabled"
 msgstr "käytössä"
 
-#: nano.c:2115
+#: nano.c:2120
 msgid "disabled"
 msgstr "ei käytössä"
 
-#: nano.c:2168
+#: nano.c:2173
 msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 msgstr ""
 "NumLock-ongelma: Numeronäppäimistö toimii väärin, kun NumLock ei ole päällä."
 
-#: nano.c:2396
+#: nano.c:2405
 msgid "Main: set up windows\n"
 msgstr "Päätila: ikkunoiden asettelu\n"
 
-#: nano.c:2403
+#: nano.c:2416
 msgid "Main: bottom win\n"
 msgstr "Päätila: alaikkuna\n"
 
-#: nano.c:2409
+#: nano.c:2422
 msgid "Main: open file\n"
 msgstr "Päätila: avaa tiedosto\n"
 
-#: nano.c:2464
+#: nano.c:2478
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "Vastaanotettu Alt-O-%c! (%d)\n"
 
-#: nano.c:2491
+#: nano.c:2505
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "Vastaanotettu Alt-[-1-%c! (%d)\n"
 
-#: nano.c:2524
+#: nano.c:2538
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "Vastaanotettu Alt-[-2-%c! (%d)\n"
 
-#: nano.c:2566
+#: nano.c:2584
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Vastaanotettu Alt-[-%c! (%d)\n"
 
-#: nano.c:2592
+#: nano.c:2610
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Vastaanotettu Alt-%c! (%d)\n"
 
-#: search.c:117
+#: search.c:118
 #, c-format
 msgid "Case Sensitive Regexp Search%s%s"
 msgstr "Etsi kirjainkokotarkka säänn. lauseke%s%s"
 
-#: search.c:119
+#: search.c:120
 #, c-format
 msgid "Regexp Search%s%s"
 msgstr "Etsi säänn. lauseke%s%s"
 
-#: search.c:121
+#: search.c:122
 #, c-format
 msgid "Case Sensitive Search%s%s"
 msgstr "Kirjainkokotarkka etsintä%s%s"
 
-#: search.c:123
+#: search.c:124
 #, c-format
 msgid "Search%s%s"
 msgstr "Etsintä%s%s"
 
-#: search.c:126
+#: search.c:127
 msgid " (to replace)"
 msgstr " (korvattava)"
 
-#: search.c:135 search.c:326
+#: search.c:136 search.c:327
 msgid "Search Cancelled"
 msgstr "Etsintä peruttu"
 
-#: search.c:199
+#: search.c:200
 #, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s...\" ei löytynyt"
 
-#: search.c:248
+#: search.c:249
 msgid "Search Wrapped"
 msgstr "Etsintä jatkuu"
 
-#: search.c:348
+#: search.c:349
 #, fuzzy, c-format
 msgid "Replaced %d occurrences"
 msgstr "%d kohtaa korvattu"
 
-#: search.c:350
+#: search.c:351
 #, fuzzy
 msgid "Replaced 1 occurrence"
 msgstr "1 kohta korvattu"
 
-#: search.c:488 search.c:592 search.c:608
+#: search.c:489 search.c:599 search.c:615
 msgid "Replace Cancelled"
 msgstr "Korvaus peruttu"
 
-#: search.c:538
+#: search.c:539
 msgid "Replace this instance?"
 msgstr "Korvataanko tämä kohta?"
 
-#: search.c:550
+#: search.c:551
 msgid "Replace failed: unknown subexpression!"
 msgstr "Korvaus epäonnistui: tuntematon alilauseke!"
 
-#: search.c:633
+#: search.c:640
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Korvaa merkkijonolla [%s]"
 
-#: search.c:637 search.c:641
+#: search.c:644 search.c:648
 msgid "Replace with"
 msgstr "Korvaa merkkijonolla"
 
-#. Ask for it
-#: search.c:676
+#: search.c:682
 msgid "Enter line number"
 msgstr "Kirjoita rivin numero"
 
-#: search.c:678
+#: search.c:684
 msgid "Aborted"
 msgstr "Keskeytetty"
 
-#: search.c:698
+#: search.c:693
 msgid "Come on, be reasonable"
 msgstr "Jotakin järkevää, kiitos?"
 
-#: search.c:703
-#, c-format
-msgid "Only %d lines available, skipping to last line"
-msgstr "Vain %d riviä olemassa: siirtyy viimeiselle riville"
-
-#: winio.c:123
+#: winio.c:124
 #, c-format
 msgid "actual_x_from_start for xplus=%d returned %d\n"
 msgstr "actual_x_from_start parametrilla xplus=%d palautti %d\n"
 
-#: winio.c:279
+#: winio.c:288
 #, fuzzy, c-format
 msgid "Aha! '%c' (%d)\n"
 msgstr "syöte '%c' (%d)\n"
 
-#: winio.c:461
+#: winio.c:470
 #, c-format
 msgid "input '%c' (%d)\n"
 msgstr "syöte '%c' (%d)\n"
 
-#: winio.c:503
+#: winio.c:519
 msgid "New Buffer"
 msgstr "Uusi teksti"
 
-#: winio.c:507
+#: winio.c:523
 msgid "  File: ..."
 msgstr "  Tiedosto: ..."
 
-#: winio.c:509
+#: winio.c:525
 msgid "   DIR: ..."
 msgstr "   HAKEMISTO: ..."
 
-#: winio.c:520
+#: winio.c:536
 msgid "Modified"
 msgstr "Muokattu"
 
-#: winio.c:972
+#: winio.c:1078
 #, c-format
 msgid "Moved to (%d, %d) in edit buffer\n"
 msgstr "Kohtaan (%d,%d) siirrytty muokkausruudussa\n"
 
-#: winio.c:983
+#: winio.c:1089
 #, c-format
 msgid "current->data = \"%s\"\n"
 msgstr "current->data = \"%s\"\n"
 
-#: winio.c:1028
+#: winio.c:1146
 #, c-format
 msgid "I got \"%s\"\n"
 msgstr "Saatiin \"%s\"\n"
@@ -963,80 +957,83 @@ msgstr "Saatiin \"%s\"\n"
 #. Yes, no and all are strings of any length.  Each string consists of
 #. all characters accepted as a valid character for that value.
 #. The first value will be the one displayed in the shortcuts.
-#: winio.c:1057
+#: winio.c:1175
 msgid "Yy"
 msgstr "Kk"
 
-#: winio.c:1058
+#: winio.c:1176
 msgid "Nn"
 msgstr "Ee"
 
-#: winio.c:1059
+#: winio.c:1177
 msgid "Aa"
 msgstr "aA"
 
-#: winio.c:1072
+#: winio.c:1191
 msgid "Yes"
 msgstr "Kyllä"
 
-#: winio.c:1076
+#: winio.c:1195
 msgid "All"
 msgstr "Kaikki"
 
-#: winio.c:1081
+#: winio.c:1200
 msgid "No"
 msgstr "Ei"
 
-#: winio.c:1257
+#: winio.c:1400
 #, c-format
 msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
-#: winio.c:1261
+#: winio.c:1404
 #, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "rivi %d/%d (%.0f%%), merkki %d/%d (%.0f%%)"
 
-#: winio.c:1402
+#: winio.c:1545
 msgid "Dumping file buffer to stderr...\n"
 msgstr "Syöttää tiedoston stderriin...\n"
 
-#: winio.c:1404
+#: winio.c:1547
 msgid "Dumping cutbuffer to stderr...\n"
 msgstr "Syöttää leiketilan stderriin...\n"
 
-#: winio.c:1406
+#: winio.c:1549
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Syöttää tekstin stderriin...\n"
 
-#: winio.c:1481
+#: winio.c:1624
 msgid "The nano text editor"
 msgstr "Nano-editori"
 
-#: winio.c:1482
+#: winio.c:1625
 msgid "version "
 msgstr "versio "
 
-#: winio.c:1483
+#: winio.c:1626
 msgid "Brought to you by:"
 msgstr "Tehneet:"
 
-#: winio.c:1484
+#: winio.c:1627
 msgid "Special thanks to:"
 msgstr "Erikoiskiitokset:"
 
-#: winio.c:1485
+#: winio.c:1628
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation"
 
-#: winio.c:1486
+#: winio.c:1629
 msgid "Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurses"
 msgstr "Pavel Curtis, Zeyd Ben-Halim ja Eric S. Raymond ncursesista"
 
-#: winio.c:1487
+#: winio.c:1630
 msgid "and anyone else we forgot..."
 msgstr "ja kaikille muille, jotka unohdimme..."
 
-#: winio.c:1488
+#: winio.c:1631
 msgid "Thank you for using nano!\n"
 msgstr "Kiitos Nanon käyttämisestä!\n"
+
+#~ msgid "Only %d lines available, skipping to last line"
+#~ msgstr "Vain %d riviä olemassa: siirtyy viimeiselle riville"
diff --git a/po/fr.po b/po/fr.po
index b43344f1..ae5e1799 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.8.9\n"
-"POT-Creation-Date: 2001-04-18 18:10-0400\n"
+"POT-Creation-Date: 2001-04-30 09:44-0400\n"
 "PO-Revision-Date: 2000-07-09 01:32+0100\n"
 "Last-Translator: Clement Laforet <sheep.killer@free.fr>\n"
 "Language-Team: French <LL@li.org>\n"
@@ -15,440 +15,440 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: cut.c:44
+#: cut.c:45
 #, c-format
 msgid "add_to_cutbuffer called with inptr->data = %s\n"
 msgstr "add_to_cutbuffer appelé avec inptr->data = %s\n"
 
-#: cut.c:150
+#: cut.c:151
 msgid "Blew away cutbuffer =)\n"
 msgstr "cutbuffer annihilé -)\n"
 
-#: files.c:123
+#: files.c:124
 msgid "read_line: not on first line and prev is NULL"
 msgstr ""
 "read_line: la position actuelle n'est pas la première ligne et la précédente "
 "est NULL"
 
-#: files.c:185 files.c:203
+#: files.c:186 files.c:204
 #, c-format
 msgid "Read %d lines"
 msgstr "%d lignes lues"
 
-#: files.c:221 search.c:193
+#: files.c:222 search.c:194
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" non trouvé"
 
 #. We have a new file
-#: files.c:225
+#: files.c:226
 msgid "New File"
 msgstr "Nouveau fichier"
 
-#: files.c:238
+#: files.c:239
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr "Le fichier \"%s\" est un répertoire"
 
 #. Don't open character or block files.  Sorry, /dev/sndstat!
-#: files.c:241
+#: files.c:242
 #, fuzzy, c-format
 msgid "File \"%s\" is a device file"
 msgstr "Le fichier \"%s\" est un répertoire"
 
-#: files.c:248
+#: files.c:249
 msgid "Reading File"
 msgstr "Lecture du fichier"
 
-#: files.c:264
+#: files.c:265
 msgid "File to insert [from ./] "
 msgstr "Fichier à insérer [depuis ./] "
 
-#: files.c:313 files.c:338 files.c:574 nano.c:1515
+#: files.c:314 files.c:339 files.c:575 nano.c:1520
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: files.c:384 files.c:400 files.c:414 files.c:431 files.c:437
+#: files.c:385 files.c:401 files.c:415 files.c:432 files.c:438
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Impossible d'ouvrir le fichier en écriture: %s"
 
-#: files.c:419
+#: files.c:420
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Écrit >%s\n"
 
-#: files.c:446
+#: files.c:447
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Impossible de fermer %s: %s"
 
 #. Try a rename??
-#: files.c:469 files.c:478 files.c:483
+#: files.c:470 files.c:479 files.c:484
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Impossible d'ouvrir %s en écriture: %s"
 
-#: files.c:490
+#: files.c:491
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Impossible de donner les permissions %o à %s: %s"
 
-#: files.c:495
+#: files.c:496
 #, c-format
 msgid "Wrote %d lines"
 msgstr "%d lignes écrites"
 
-#: files.c:530
+#: files.c:531
 msgid "File Name to write"
 msgstr "Nom du fichier dans lequel écrire"
 
-#: files.c:549
+#: files.c:550
 #, c-format
 msgid "filename is %s"
 msgstr "Le nom du fichier est %s"
 
-#: files.c:563
+#: files.c:564
 msgid "File exists, OVERWRITE ?"
 msgstr "Fichier existant, écrire par-dessus ?"
 
-#: files.c:985
+#: files.c:986
 msgid "(more)"
 msgstr ""
 
-#: files.c:1256
+#: files.c:1257
 msgid "Can't move up a directory"
 msgstr ""
 
 #. We can't open this dir for some reason.  Complain
-#: files.c:1266 files.c:1314
+#: files.c:1267 files.c:1315
 #, fuzzy, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "Impossible de fermer %s: %s"
 
-#: files.c:1294 global.c:227
+#: files.c:1295 global.c:232
 #, fuzzy
 msgid "Goto Directory"
 msgstr "-> ligne"
 
-#: files.c:1299
+#: files.c:1300
 #, fuzzy
 msgid "Goto Cancelled"
 msgstr "Annulé"
 
-#: global.c:139
+#: global.c:144
 #, fuzzy
 msgid "Constant cursor position"
 msgstr " -c \t\tAfficher constamment la position du curseur\n"
 
-#: global.c:140
+#: global.c:145
 #, fuzzy
 msgid "Auto indent"
 msgstr "-> ligne"
 
-#: global.c:141
+#: global.c:146
 msgid "Suspend"
 msgstr ""
 
-#: global.c:142
+#: global.c:147
 msgid "Help mode"
 msgstr ""
 
-#: global.c:143
+#: global.c:148
 msgid "Pico mode"
 msgstr ""
 
-#: global.c:144
+#: global.c:149
 msgid "Mouse support"
 msgstr ""
 
-#: global.c:145
+#: global.c:150
 msgid "Cut to end"
 msgstr ""
 
-#: global.c:147
+#: global.c:152
 #, fuzzy
 msgid "Regular expressions"
 msgstr "-R\t\tUtilisation des expressions régulières pour la recherche\n"
 
-#: global.c:149
+#: global.c:154
 msgid "Auto wrap"
 msgstr ""
 
-#: global.c:194
+#: global.c:199
 msgid "Invoke the help menu"
 msgstr "Appelle le menu d'aide"
 
-#: global.c:195
+#: global.c:200
 msgid "Write the current file to disk"
 msgstr "Ecrit le fichier en cours sur le disque"
 
-#: global.c:196
+#: global.c:201
 msgid "Exit from nano"
 msgstr "Quitte Nano"
 
-#: global.c:197
+#: global.c:202
 #, fuzzy
 msgid "Goto a specific line number"
 msgstr "Entrer le numéro de ligne"
 
-#: global.c:198
+#: global.c:203
 msgid "Justify the current paragraph"
 msgstr "Justifie le paragraphe courant"
 
-#: global.c:199
+#: global.c:204
 msgid "Unjustify after a justify"
 msgstr ""
 
-#: global.c:200
+#: global.c:205
 msgid "Replace text within the editor"
 msgstr "Remplace le texte dans l'éditeur"
 
-#: global.c:201
+#: global.c:206
 msgid "Insert another file into the current one"
 msgstr "Insère un autre fichier dans le fichier courant"
 
-#: global.c:202
+#: global.c:207
 msgid "Search for text within the editor"
 msgstr "Recherche d'une chaîne dans l'éditeur"
 
-#: global.c:203
+#: global.c:208
 msgid "Move to the previous screen"
 msgstr "Retourne a l'écran précèdent"
 
-#: global.c:204
+#: global.c:209
 msgid "Move to the next screen"
 msgstr "Aller au prochain écran"
 
-#: global.c:205
+#: global.c:210
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Supprime la ligne courante et la stocke en mémoire"
 
-#: global.c:206
+#: global.c:211
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Copie la chaîne en mémoire vers la ligne courante"
 
-#: global.c:207
+#: global.c:212
 msgid "Show the posititon of the cursor"
 msgstr "Affiche la position du curseur"
 
-#: global.c:208
+#: global.c:213
 msgid "Invoke the spell checker (if available)"
 msgstr "Appel du correcteur orthographique (s'il est disponible)"
 
-#: global.c:209
+#: global.c:214
 msgid "Move up one line"
 msgstr "Déplace d'une ligne vers le haut"
 
-#: global.c:210
+#: global.c:215
 msgid "Move down one line"
 msgstr "Déplace d'une ligne vers le bas"
 
-#: global.c:211
+#: global.c:216
 msgid "Move forward one character"
 msgstr "Déplace d'un caractère en avant"
 
-#: global.c:212
+#: global.c:217
 msgid "Move back one character"
 msgstr "Déplace d'un caractère en arriere"
 
-#: global.c:213
+#: global.c:218
 msgid "Move to the beginning of the current line"
 msgstr "Déplace vers le début de la ligne courante"
 
-#: global.c:214
+#: global.c:219
 msgid "Move to the end of the current line"
 msgstr "Déplace vers la fin de la ligne courante"
 
-#: global.c:215
+#: global.c:220
 msgid "Go to the first line of the file"
 msgstr "Va à la première ligne du fichier"
 
-#: global.c:216
+#: global.c:221
 msgid "Go to the last line of the file"
 msgstr "Va à la dernière ligne du fichier"
 
-#: global.c:217
+#: global.c:222
 msgid "Refresh (redraw) the current screen"
 msgstr "Rafraichit (redessine) l'ecran courant"
 
-#: global.c:218
+#: global.c:223
 msgid "Mark text at the current cursor location"
 msgstr "Marquer le texte à la position actuelle du curseur"
 
-#: global.c:219
+#: global.c:224
 msgid "Delete the character under the cursor"
 msgstr "Supprime le caractère où se trouve le curseur"
 
-#: global.c:221
+#: global.c:226
 msgid "Delete the character to the left of the cursor"
 msgstr "Supprime le caractère à la gauche du curseur"
 
-#: global.c:222
+#: global.c:227
 msgid "Insert a tab character"
 msgstr "Insère une tabulation"
 
-#: global.c:223
+#: global.c:228
 msgid "Insert a carriage return at the cursor position"
 msgstr "Insère un retour-chariot à la position du curseur"
 
-#: global.c:225
+#: global.c:230
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Exécuter rechercher/remplacer avec/sans rspect de la casse"
 
-#: global.c:226
+#: global.c:231
 msgid "Go to file browser"
 msgstr ""
 
-#: global.c:228
+#: global.c:233
 msgid "Cancel the current function"
 msgstr "Annule la fonction courante"
 
-#: global.c:231
+#: global.c:236
 msgid "Get Help"
 msgstr "Appelle l'aide"
 
-#: global.c:234 global.c:415 global.c:442
+#: global.c:239 global.c:420 global.c:447
 msgid "Exit"
 msgstr "Quitte"
 
-#: global.c:237
+#: global.c:242
 msgid "WriteOut"
 msgstr "Sauvegarde"
 
-#: global.c:242 global.c:331
+#: global.c:247 global.c:336
 msgid "Justify"
 msgstr "Justifier"
 
-#: global.c:246 global.c:252
+#: global.c:251 global.c:257
 #, fuzzy
 msgid "Read File"
 msgstr "Lect. fichier"
 
-#: global.c:256 global.c:327 global.c:355
+#: global.c:261 global.c:332 global.c:360
 #, fuzzy
 msgid "Replace"
 msgstr "Remplacer par"
 
-#: global.c:260
+#: global.c:265
 msgid "Where Is"
 msgstr "Recherche"
 
-#: global.c:264 global.c:407 global.c:431
+#: global.c:269 global.c:412 global.c:436
 msgid "Prev Page"
 msgstr "Page préc."
 
-#: global.c:268 global.c:411 global.c:435
+#: global.c:273 global.c:416 global.c:440
 msgid "Next Page"
 msgstr "Page suiv."
 
-#: global.c:272
+#: global.c:277
 msgid "Cut Text"
 msgstr "Couper"
 
-#: global.c:276
+#: global.c:281
 #, fuzzy
 msgid "UnJustify"
 msgstr "Justifier"
 
-#: global.c:279
+#: global.c:284
 msgid "UnCut Txt"
 msgstr "Annul. Coup"
 
-#: global.c:283
+#: global.c:288
 msgid "Cur Pos"
 msgstr "Pos. curseur"
 
-#: global.c:287
+#: global.c:292
 msgid "To Spell"
 msgstr "Corriger"
 
-#: global.c:291
+#: global.c:296
 msgid "Up"
 msgstr "Haut"
 
-#: global.c:294
+#: global.c:299
 msgid "Down"
 msgstr "Bas"
 
-#: global.c:297
+#: global.c:302
 msgid "Forward"
 msgstr "En avant"
 
-#: global.c:300
+#: global.c:305
 msgid "Back"
 msgstr "En arrière"
 
-#: global.c:303
+#: global.c:308
 msgid "Home"
 msgstr "Debut Doc."
 
-#: global.c:306
+#: global.c:311
 msgid "End"
 msgstr "Fin Doc0"
 
-#: global.c:309
+#: global.c:314
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: global.c:312
+#: global.c:317
 #, fuzzy
 msgid "Mark Text"
 msgstr "Marque enregistrée"
 
-#: global.c:315
+#: global.c:320
 msgid "Delete"
 msgstr "Supprimer"
 
-#: global.c:319
+#: global.c:324
 msgid "Backspace"
 msgstr "Backspace"
 
 # No translation...
-#: global.c:323
+#: global.c:328
 msgid "Tab"
 msgstr "Tabulation"
 
-#: global.c:335
+#: global.c:340
 msgid "Enter"
 msgstr "Entrée"
 
-#: global.c:339 global.c:359 global.c:379
+#: global.c:344 global.c:364 global.c:384
 msgid "Goto Line"
 msgstr "-> ligne"
 
-#: global.c:345 global.c:366 global.c:387 global.c:397
+#: global.c:350 global.c:371 global.c:392 global.c:402
 msgid "First Line"
 msgstr "Première ligne"
 
-#: global.c:348 global.c:369 global.c:390 global.c:400
+#: global.c:353 global.c:374 global.c:395 global.c:405
 msgid "Last Line"
 msgstr "Dernière Ligne"
 
-#: global.c:351 global.c:372
+#: global.c:356 global.c:377
 msgid "Case Sens"
 msgstr "Casse respectée"
 
-#: global.c:362 global.c:382 global.c:393 global.c:403 global.c:424
-#: global.c:427 global.c:445 winio.c:1083
+#: global.c:367 global.c:387 global.c:398 global.c:408 global.c:429
+#: global.c:432 global.c:450 winio.c:1202
 msgid "Cancel"
 msgstr "Annuler"
 
-#: global.c:375
+#: global.c:380
 msgid "No Replace"
 msgstr "Pas de remplacement"
 
-#: global.c:420
+#: global.c:425
 #, fuzzy
 msgid "To Files"
 msgstr "Nouveau fichier"
 
-#: global.c:439
+#: global.c:444
 #, fuzzy
 msgid "Goto"
 msgstr "-> ligne"
 
-#: nano.c:136
+#: nano.c:137
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -457,22 +457,22 @@ msgstr ""
 "\n"
 "Buffer écrit dans 'nano.save'\n"
 
-#: nano.c:138
+#: nano.c:139
 #, c-format
 msgid ""
 "\n"
 "No %s written (file exists?)\n"
 msgstr ""
 
-#: nano.c:147
+#: nano.c:148
 msgid "Window size is too small for Nano..."
 msgstr ""
 
-#: nano.c:155
+#: nano.c:156
 msgid "Key illegal in VIEW mode"
 msgstr "Touche illégale en mode VISUALISATION"
 
-#: nano.c:199
+#: nano.c:200
 #, fuzzy
 msgid ""
 " nano help text\n"
@@ -486,17 +486,17 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
-"key sequences are notated with the Meta (M) symbol and can be entered using "
-"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
+"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
+"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
 msgstr ""
 "Message d'aide de Nano\n"
-"L'éditeur Nano est conçu pour émuler les fonctions et la facilité d'utili-"
-"sation de l'éditeur PICO. Il y a quatre sections principales dans cet "
-"éditeur : la ligne du haut affiche la version du programme, le "
+"L'éditeur Nano est conçu pour émuler les fonctions et la facilité "
+"d'utili-sation de l'éditeur PICO. Il y a quatre sections principales dans "
+"cet éditeur : la ligne du haut affiche la version du programme, le "
 "fichieractuellement édité, et s'il a été modifié ou non. Ensuite il y a "
 "lafenêtre principale d'édition qui affiche le fichier en cours de "
 "modification.La ligne d'état est la troisième en partant du bas, elle "
@@ -509,17 +509,17 @@ msgstr ""
 "entre parenthèses :\n"
 "\n"
 
-#: nano.c:293
+#: nano.c:294
 #, fuzzy
 msgid "delete_node(): free'd a node, YAY!\n"
 msgstr "free_node(): libération d'un noeud, OUAIS!\n"
 
-#: nano.c:298
+#: nano.c:299
 #, fuzzy
 msgid "delete_node(): free'd last node.\n"
 msgstr "free_node(): libération du dernier noeud \n"
 
-#: nano.c:353
+#: nano.c:354
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
@@ -527,95 +527,95 @@ msgstr ""
 "Utilisation: nano [option longue GNU] [option] +LIGNE <fichier>\n"
 "\n"
 
-#: nano.c:354
+#: nano.c:355
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Option\t\tOption Longue\t\tSignification\n"
 
-#: nano.c:356
+#: nano.c:357
 #, fuzzy
 msgid " -T [num]\t--tabsize=[num]\t\tSet width of a tab to num\n"
 msgstr ""
 "-T \t\t--tabsize=[num]\t\tDefini la profondeur d'une tabulation à num\n"
 
-#: nano.c:359
+#: nano.c:360
 msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
 msgstr ""
 "-R\t\t--regexp\t\tUtilise les expressions regulières pour la recherche\n"
 
-#: nano.c:363
+#: nano.c:364
 msgid " -V \t\t--version\t\tPrint version information and exit\n"
 msgstr " -V \t\t--version\t\tAfficher les informations de version et sortir\n"
 
-#: nano.c:365
+#: nano.c:366
 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
 msgstr " -c \t\t--const\t\t\tAfficher constamment la position du curseur\n"
 
-#: nano.c:367
+#: nano.c:368
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr " -h \t\t--help\t\t\tAfficher ce message\n"
 
-#: nano.c:369
+#: nano.c:370
 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
 msgstr ""
 " -i \t\t--autoindent\t\tIndenter automatiquement les nouvelles lignes\n"
 
-#: nano.c:372
+#: nano.c:373
 msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
 msgstr ""
 
-#: nano.c:375
+#: nano.c:376
 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite\n"
 msgstr ""
 " -l \t\t--nofollow\t\tNe suit pas les liens symboliques. Outrepasse "
 "l'écriture\n"
 
-#: nano.c:378
+#: nano.c:379
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr " -m \t\t--mouse\t\t\tActiver le support souris\n"
 
-#: nano.c:382
+#: nano.c:383
 msgid " -p\t \t--pico\t\t\tEmulate Pico as closely as possible\n"
 msgstr ""
 
-#: nano.c:385
+#: nano.c:386
 msgid ""
 " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
 msgstr ""
 " -r [#cols] \t--fill=[#cols]\t\tMettre la colonne de fin de ligne à (couper "
 "les lignes à) #cols\n"
 
-#: nano.c:388
+#: nano.c:389
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr ""
 " -s [prog] \t--speller=[prog]\tActiver un vérificateur orthographique "
 "alternatif\n"
 
-#: nano.c:391
+#: nano.c:392
 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
 msgstr ""
 " -t \t\t--tempfile\t\tSauver automatiquement à la sortie, sans demander\n"
 
-#: nano.c:393
+#: nano.c:394
 msgid " -v \t\t--view\t\t\tView (read only) mode\n"
 msgstr " -v \t\t--view\t\t\tMode Visualisation (lecture seule)\n"
 
-#: nano.c:396
+#: nano.c:397
 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
 msgstr " -w \t\t--nowrap\t\tNe pas couper les lignes trop longues\n"
 
-#: nano.c:399
+#: nano.c:400
 msgid " -x \t\t--nohelp\t\tDon't show help window\n"
 msgstr " -x \t\t--nohelp\t\tNe pas afficher la fenêtre d'aide\n"
 
-#: nano.c:401
+#: nano.c:402
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr " -z \t\t--suspend\t\tAutoriser la suspension\n"
 
-#: nano.c:403
+#: nano.c:404
 msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
 msgstr " +LIGNE\t\t\t\t\tCommencer à la ligne LIGNE\n"
 
-#: nano.c:405
+#: nano.c:406
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
@@ -623,364 +623,358 @@ msgstr ""
 "Utilisation: nano [option] +LIGNE <fichier>\n"
 "\n"
 
-#: nano.c:406
+#: nano.c:407
 msgid "Option\t\tMeaning\n"
 msgstr "Option\t\tSignification\n"
 
-#: nano.c:407
+#: nano.c:408
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr "-T [num]\tDéfini la pronfondeur de tabulation à num\n"
 
-#: nano.c:408
+#: nano.c:409
 msgid " -R\t\tUse regular expressions for search\n"
 msgstr "-R\t\tUtilisation des expressions régulières pour la recherche\n"
 
-#: nano.c:409
+#: nano.c:410
 msgid " -V \t\tPrint version information and exit\n"
 msgstr " -V \t\tAfficher les informations de version et sortir\n"
 
-#: nano.c:410
+#: nano.c:411
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr " -c \t\tAfficher constamment la position du curseur\n"
 
-#: nano.c:411
+#: nano.c:412
 msgid " -h \t\tShow this message\n"
 msgstr " -h \t\tAfficher ce message\n"
 
-#: nano.c:412
+#: nano.c:413
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr " -i \t\tIndenter automatiquement les nouvelles lignes\n"
 
-#: nano.c:414
+#: nano.c:415
 msgid " -k \t\tLet ^K cut from cursor to end of line\n"
 msgstr ""
 
-#: nano.c:417
+#: nano.c:418
 msgid " -l \t\tDon't follow symbolic links, overwrite\n"
 msgstr "-l \t\tNe pas suivre les liens symboliques. Outrepasse à l'écriture\n"
 
-#: nano.c:420
+#: nano.c:421
 msgid " -m \t\tEnable mouse\n"
 msgstr " -m \t\tActiver la souris\n"
 
-#: nano.c:423
+#: nano.c:424
 msgid " -p \t\tEmulate Pico as closely as possible\n"
 msgstr ""
 
-#: nano.c:425
+#: nano.c:426
 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
 msgstr ""
 " -r [#cols] \tMettre la colonne de fin de ligne à (couper les lignes à) "
 "#cols\n"
 
-#: nano.c:427
+#: nano.c:428
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr " -s [prog]  \tActiver un vérificateur orthographique alternatif\n"
 
-#: nano.c:429
+#: nano.c:430
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\tSauver automatiquement à la sortie, sans demander\n"
 
-#: nano.c:430
+#: nano.c:431
 msgid " -v \t\tView (read only) mode\n"
 msgstr " -v \t\tMode Visualisation seule (lecture seule)\n"
 
-#: nano.c:432
+#: nano.c:433
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr " -w \t\tNe pas couper les lignes longues\n"
 
-#: nano.c:434
+#: nano.c:435
 msgid " -x \t\tDon't show help window\n"
 msgstr " -x \t\tNe pas afficher la fenêtre d'aide\n"
 
-#: nano.c:435
+#: nano.c:436
 msgid " -z \t\tEnable suspend\n"
 msgstr " -z \t\tAutoriser la suspension\n"
 
-#: nano.c:436
+#: nano.c:437
 msgid " +LINE\t\tStart at line number LINE\n"
 msgstr " +LIGNE\t\tDémarrer à la ligne LIGNE\n"
 
-#: nano.c:443
+#: nano.c:444
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano version %s (compilée %s, %s)\n"
 
-#: nano.c:446
+#: nano.c:447
 #, fuzzy
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 msgstr " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n"
 
-#: nano.c:447
+#: nano.c:448
 msgid ""
 "\n"
 " Compiled options:"
 msgstr ""
 
-#: nano.c:522
+#: nano.c:526
 msgid "Mark Set"
 msgstr "Marque enregistrée"
 
-#: nano.c:527
+#: nano.c:531
 msgid "Mark UNset"
 msgstr "Marque effacée"
 
-#: nano.c:1029
+#: nano.c:1033
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap appelée avec inptr->data=\"%s\"\n"
 
-#: nano.c:1081
+#: nano.c:1085
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data vaut maintenant \"%s\"\n"
 
-#: nano.c:1133
+#: nano.c:1137
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Après, data = \"%s\"\n"
 
-#: nano.c:1234
+#: nano.c:1238
 msgid "Edit a replacement"
 msgstr ""
 
-#: nano.c:1463
+#: nano.c:1468
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Impossible de créer un nom de fichier temporaire: %s"
 
-#: nano.c:1469
+#: nano.c:1474
 msgid "Spell checking failed: unable to write temp file!"
 msgstr ""
 
-#: nano.c:1481
+#: nano.c:1486
 msgid "Finished checking spelling"
 msgstr "Vérification orthographique terminée"
 
-#: nano.c:1483
+#: nano.c:1488
 msgid "Spell checking failed"
 msgstr ""
 
-#: nano.c:1502
+#: nano.c:1507
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Sauver le buffer modifié (RÉPONDRE \"No\" EFFACERA LES CHANGEMENTS"
 
-#: nano.c:1619
+#: nano.c:1624
 msgid "Received SIGHUP"
 msgstr ""
 
-#: nano.c:1682
+#: nano.c:1687
 msgid "Cannot resize top win"
 msgstr "Impossible de redimensionner la fenêtre du haut"
 
-#: nano.c:1684
+#: nano.c:1689
 msgid "Cannot move top win"
 msgstr "Impossible de bouger la fenêtre du haut"
 
-#: nano.c:1686
+#: nano.c:1691
 msgid "Cannot resize edit win"
 msgstr "Impossible de redimensionner la fenêtre d'édition"
 
-#: nano.c:1688
+#: nano.c:1693
 msgid "Cannot move edit win"
 msgstr "Impossible de bouger la fenêtre d'édition"
 
-#: nano.c:1690
+#: nano.c:1695
 msgid "Cannot resize bottom win"
 msgstr "Impossible de redimensionner la fenêtre du bas"
 
-#: nano.c:1692
+#: nano.c:1697
 msgid "Cannot move bottom win"
 msgstr "Impossible de bouger la fenêtre du bas"
 
-#: nano.c:2001
+#: nano.c:2006
 msgid "Can now UnJustify!"
 msgstr ""
 
-#: nano.c:2099
+#: nano.c:2104
 #, c-format
 msgid "%s enable/disable"
 msgstr ""
 
-#: nano.c:2114
+#: nano.c:2119
 msgid "enabled"
 msgstr ""
 
-#: nano.c:2115
+#: nano.c:2120
 msgid "disabled"
 msgstr ""
 
-#: nano.c:2168
+#: nano.c:2173
 msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 msgstr ""
 
-#: nano.c:2396
+#: nano.c:2405
 msgid "Main: set up windows\n"
 msgstr "Main: configuration des fenêtres\n"
 
-#: nano.c:2403
+#: nano.c:2416
 msgid "Main: bottom win\n"
 msgstr "Main: fenêtre du bas\n"
 
-#: nano.c:2409
+#: nano.c:2422
 msgid "Main: open file\n"
 msgstr "Main: ouvrir fichier\n"
 
-#: nano.c:2464
+#: nano.c:2478
 #, fuzzy, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "J'ai reçu Alt-[-%c! (%d)\n"
 
-#: nano.c:2491
+#: nano.c:2505
 #, fuzzy, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "J'ai reçu Alt-[-%c! (%d)\n"
 
-#: nano.c:2524
+#: nano.c:2538
 #, fuzzy, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "J'ai reçu Alt-[-%c! (%d)\n"
 
-#: nano.c:2566
+#: nano.c:2584
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "J'ai reçu Alt-[-%c! (%d)\n"
 
-#: nano.c:2592
+#: nano.c:2610
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "J'ai reçu Alt-%c! (%d)\n"
 
-#: search.c:117
+#: search.c:118
 #, fuzzy, c-format
 msgid "Case Sensitive Regexp Search%s%s"
 msgstr "Recherche sensible ) la casse%s%s"
 
-#: search.c:119
+#: search.c:120
 #, fuzzy, c-format
 msgid "Regexp Search%s%s"
 msgstr "Recherche Regexp%s%s"
 
-#: search.c:121
+#: search.c:122
 #, fuzzy, c-format
 msgid "Case Sensitive Search%s%s"
 msgstr "Recherche sensible ) la casse%s%s"
 
-#: search.c:123
+#: search.c:124
 #, fuzzy, c-format
 msgid "Search%s%s"
 msgstr "Recherche%s%s"
 
-#: search.c:126
+#: search.c:127
 #, fuzzy
 msgid " (to replace)"
 msgstr " (remplacer par)"
 
-#: search.c:135 search.c:326
+#: search.c:136 search.c:327
 msgid "Search Cancelled"
 msgstr "Recherche annulée"
 
-#: search.c:199
+#: search.c:200
 #, fuzzy, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s\" non trouvé"
 
-#: search.c:248
+#: search.c:249
 msgid "Search Wrapped"
 msgstr "La recherche a bouclé"
 
-#: search.c:348
+#: search.c:349
 #, fuzzy, c-format
 msgid "Replaced %d occurrences"
 msgstr "%d occurences remplacées"
 
-#: search.c:350
+#: search.c:351
 #, fuzzy
 msgid "Replaced 1 occurrence"
 msgstr "1 occurence remplacée"
 
-#: search.c:488 search.c:592 search.c:608
+#: search.c:489 search.c:599 search.c:615
 msgid "Replace Cancelled"
 msgstr "Remplacement annulé"
 
-#: search.c:538
+#: search.c:539
 msgid "Replace this instance?"
 msgstr "Remplacer cette occurence?"
 
-#: search.c:550
+#: search.c:551
 msgid "Replace failed: unknown subexpression!"
 msgstr ""
 
-#: search.c:633
+#: search.c:640
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Remplacer par [%s]"
 
-#: search.c:637 search.c:641
+#: search.c:644 search.c:648
 msgid "Replace with"
 msgstr "Rempacer par"
 
-#. Ask for it
-#: search.c:676
+#: search.c:682
 msgid "Enter line number"
 msgstr "Entrer le numéro de ligne"
 
-#: search.c:678
+#: search.c:684
 msgid "Aborted"
 msgstr "Annulé"
 
-#: search.c:698
+#: search.c:693
 msgid "Come on, be reasonable"
 msgstr "Allez, soyez raisonnable"
 
-#: search.c:703
-#, c-format
-msgid "Only %d lines available, skipping to last line"
-msgstr "Seulement %d lignes sont disponibles, saut jusqu'à la dernière ligne"
-
-#: winio.c:123
+#: winio.c:124
 #, fuzzy, c-format
 msgid "actual_x_from_start for xplus=%d returned %d\n"
 msgstr "actual_x renvoyé pour xplus=%d\n"
 
-#: winio.c:279
+#: winio.c:288
 #, fuzzy, c-format
 msgid "Aha! '%c' (%d)\n"
 msgstr "taper '%c' (%d)\n"
 
-#: winio.c:461
+#: winio.c:470
 #, c-format
 msgid "input '%c' (%d)\n"
 msgstr "taper '%c' (%d)\n"
 
-#: winio.c:503
+#: winio.c:519
 msgid "New Buffer"
 msgstr "Nouveau buffer"
 
-#: winio.c:507
+#: winio.c:523
 msgid "  File: ..."
 msgstr "  Fichier: ..."
 
-#: winio.c:509
+#: winio.c:525
 #, fuzzy
 msgid "   DIR: ..."
 msgstr "  Fichier: ..."
 
-#: winio.c:520
+#: winio.c:536
 msgid "Modified"
 msgstr "Modifié"
 
-#: winio.c:972
+#: winio.c:1078
 #, c-format
 msgid "Moved to (%d, %d) in edit buffer\n"
 msgstr "Déplacement jusqu'à (%d, %d) dans le buffer d'édition\n"
 
-#: winio.c:983
+#: winio.c:1089
 #, c-format
 msgid "current->data = \"%s\"\n"
 msgstr "current->data = \"%s\"\n"
 
-#: winio.c:1028
+#: winio.c:1146
 #, c-format
 msgid "I got \"%s\"\n"
 msgstr "J'ai reçu \"%s\"\n"
@@ -988,84 +982,88 @@ msgstr "J'ai re
 #. Yes, no and all are strings of any length.  Each string consists of
 #. all characters accepted as a valid character for that value.
 #. The first value will be the one displayed in the shortcuts.
-#: winio.c:1057
+#: winio.c:1175
 msgid "Yy"
 msgstr "Oo"
 
-#: winio.c:1058
+#: winio.c:1176
 msgid "Nn"
 msgstr "Nn"
 
-#: winio.c:1059
+#: winio.c:1177
 msgid "Aa"
 msgstr "Tt"
 
-#: winio.c:1072
+#: winio.c:1191
 msgid "Yes"
 msgstr "Oui"
 
-#: winio.c:1076
+#: winio.c:1195
 msgid "All"
 msgstr "Tous"
 
-#: winio.c:1081
+#: winio.c:1200
 msgid "No"
 msgstr "Non"
 
-#: winio.c:1257
+#: winio.c:1400
 #, c-format
 msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
-#: winio.c:1261
+#: winio.c:1404
 #, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "ligne %d sur %d (%.0f%%), caractère %d sur %d (%.0f%%)"
 
-#: winio.c:1402
+#: winio.c:1545
 msgid "Dumping file buffer to stderr...\n"
 msgstr "Envoi du buffer fichier sur stderr...\n"
 
-#: winio.c:1404
+#: winio.c:1547
 msgid "Dumping cutbuffer to stderr...\n"
 msgstr "Envoi du cutbuffer sur stderr...\n"
 
-#: winio.c:1406
+#: winio.c:1549
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Envoi d'un buffer sur stderr...\n"
 
-#: winio.c:1481
+#: winio.c:1624
 msgid "The nano text editor"
 msgstr ""
 
-#: winio.c:1482
+#: winio.c:1625
 msgid "version "
 msgstr ""
 
-#: winio.c:1483
+#: winio.c:1626
 msgid "Brought to you by:"
 msgstr ""
 
-#: winio.c:1484
+#: winio.c:1627
 msgid "Special thanks to:"
 msgstr ""
 
-#: winio.c:1485
+#: winio.c:1628
 msgid "The Free Software Foundation"
 msgstr ""
 
-#: winio.c:1486
+#: winio.c:1629
 msgid "Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurses"
 msgstr ""
 
-#: winio.c:1487
+#: winio.c:1630
 msgid "and anyone else we forgot..."
 msgstr ""
 
-#: winio.c:1488
+#: winio.c:1631
 msgid "Thank you for using nano!\n"
 msgstr ""
 
+#~ msgid "Only %d lines available, skipping to last line"
+#~ msgstr ""
+#~ "Seulement %d lignes sont disponibles, saut jusqu'à la dernière ligne"
+
 #~ msgid "Could not open file: Path length exceeded."
 #~ msgstr ""
 #~ "Impossible d'ouvrir le fichier: la longueur du chemin a été dépassée"
diff --git a/po/gl.po b/po/gl.po
index 598e532a..c7397981 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.1.0\n"
-"POT-Creation-Date: 2001-04-30 00:14+0200\n"
+"POT-Creation-Date: 2001-04-30 09:44-0400\n"
 "PO-Revision-Date: 2001-04-30 00:16+02:00\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -60,7 +60,7 @@ msgstr "Lendo o Ficheiro"
 msgid "File to insert [from ./] "
 msgstr "Ficheiro a inserir [dende ./]"
 
-#: files.c:314 files.c:339 files.c:575 nano.c:1517
+#: files.c:314 files.c:339 files.c:575 nano.c:1520
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -122,7 +122,7 @@ msgstr "Non se pode ascender por un directorio"
 msgid "Can't open \"%s\": %s"
 msgstr "Non se puido abrir \"%s\": %s"
 
-#: files.c:1295 global.c:228
+#: files.c:1295 global.c:232
 msgid "Goto Directory"
 msgstr "Ir a un Directorio"
 
@@ -130,304 +130,304 @@ msgstr "Ir a un Directorio"
 msgid "Goto Cancelled"
 msgstr "Ir-A Cancelado"
 
-#: global.c:140
+#: global.c:144
 msgid "Constant cursor position"
 msgstr "Posición do cursor constante"
 
-#: global.c:141
+#: global.c:145
 msgid "Auto indent"
 msgstr "Autosangrado"
 
-#: global.c:142
+#: global.c:146
 msgid "Suspend"
 msgstr "Suspender"
 
-#: global.c:143
+#: global.c:147
 msgid "Help mode"
 msgstr "Modo axuda"
 
-#: global.c:144
+#: global.c:148
 msgid "Pico mode"
 msgstr "Modo Pico"
 
-#: global.c:145
+#: global.c:149
 msgid "Mouse support"
 msgstr "Soporte de rato"
 
-#: global.c:146
+#: global.c:150
 msgid "Cut to end"
 msgstr "Cortar ata a fin"
 
-#: global.c:148
+#: global.c:152
 msgid "Regular expressions"
 msgstr "Expresións regulares"
 
-#: global.c:150
+#: global.c:154
 msgid "Auto wrap"
 msgstr "Corta-las liñas"
 
-#: global.c:195
+#: global.c:199
 msgid "Invoke the help menu"
 msgstr "Chamar ao menú de axuda"
 
-#: global.c:196
+#: global.c:200
 msgid "Write the current file to disk"
 msgstr "Grava-lo ficheiro actual no disco"
 
-#: global.c:197
+#: global.c:201
 msgid "Exit from nano"
 msgstr "Saír de nano"
 
-#: global.c:198
+#: global.c:202
 msgid "Goto a specific line number"
 msgstr "Ir a un determinado número de liña"
 
-#: global.c:199
+#: global.c:203
 msgid "Justify the current paragraph"
 msgstr "Xustifica-lo parágrafo actual"
 
-#: global.c:200
+#: global.c:204
 msgid "Unjustify after a justify"
 msgstr "Des-xustificar despois de xustificar"
 
-#: global.c:201
+#: global.c:205
 msgid "Replace text within the editor"
 msgstr "Substituír texto no editor"
 
-#: global.c:202
+#: global.c:206
 msgid "Insert another file into the current one"
 msgstr "Inserir outro ficheiro no actual"
 
-#: global.c:203
+#: global.c:207
 msgid "Search for text within the editor"
 msgstr "Buscar texto no editor"
 
-#: global.c:204
+#: global.c:208
 msgid "Move to the previous screen"
 msgstr "Pasar á pantalla anterior"
 
-#: global.c:205
+#: global.c:209
 msgid "Move to the next screen"
 msgstr "Pasar á seguinte pantalla"
 
-#: global.c:206
+#: global.c:210
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Corta-la liña actual e gardala no buffer de cortado"
 
-#: global.c:207
+#: global.c:211
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Pegar do buffer de cortado na liña actual"
 
-#: global.c:208
+#: global.c:212
 msgid "Show the posititon of the cursor"
 msgstr "Amosa-la posición do cursor"
 
-#: global.c:209
+#: global.c:213
 msgid "Invoke the spell checker (if available)"
 msgstr "Chamar ao corrector ortográfico (se hai un)"
 
-#: global.c:210
+#: global.c:214
 msgid "Move up one line"
 msgstr "Subir unha liña"
 
-#: global.c:211
+#: global.c:215
 msgid "Move down one line"
 msgstr "Baixar unha liña"
 
-#: global.c:212
+#: global.c:216
 msgid "Move forward one character"
 msgstr "Avanzar un carácter"
 
-#: global.c:213
+#: global.c:217
 msgid "Move back one character"
 msgstr "Recuar un carácter"
 
-#: global.c:214
+#: global.c:218
 msgid "Move to the beginning of the current line"
 msgstr "Ir ao principio da liña actual"
 
-#: global.c:215
+#: global.c:219
 msgid "Move to the end of the current line"
 msgstr "Ir á fin da liña actual"
 
-#: global.c:216
+#: global.c:220
 msgid "Go to the first line of the file"
 msgstr "Ir á primeira liña do ficheiro"
 
-#: global.c:217
+#: global.c:221
 msgid "Go to the last line of the file"
 msgstr "Ir á derradeira liña do ficheiro"
 
-#: global.c:218
+#: global.c:222
 msgid "Refresh (redraw) the current screen"
 msgstr "Actualiza-la pantalla actual"
 
-#: global.c:219
+#: global.c:223
 msgid "Mark text at the current cursor location"
 msgstr "Marca-lo texto da posición actual do cursor"
 
-#: global.c:220
+#: global.c:224
 msgid "Delete the character under the cursor"
 msgstr "Borra-lo carácter de embaixo do cursor"
 
-#: global.c:222
+#: global.c:226
 msgid "Delete the character to the left of the cursor"
 msgstr "Borra-lo carácter á esquerda do cursor"
 
-#: global.c:223
+#: global.c:227
 msgid "Insert a tab character"
 msgstr "Inserir unha tabulación"
 
-#: global.c:224
+#: global.c:228
 msgid "Insert a carriage return at the cursor position"
 msgstr "Inserir un retorno de carro na posición do cursor"
 
-#: global.c:226
+#: global.c:230
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Face-la busca ou substitución actual (in)sensible ás maiúsculas"
 
-#: global.c:227
+#: global.c:231
 msgid "Go to file browser"
 msgstr "Ir ao navegador de ficheiros"
 
-#: global.c:229
+#: global.c:233
 msgid "Cancel the current function"
 msgstr "Cancela-la función actual"
 
-#: global.c:232
+#: global.c:236
 msgid "Get Help"
 msgstr "Axuda"
 
-#: global.c:235 global.c:416 global.c:443
+#: global.c:239 global.c:420 global.c:447
 msgid "Exit"
 msgstr "Saír"
 
-#: global.c:238
+#: global.c:242
 msgid "WriteOut"
 msgstr "Gravar"
 
-#: global.c:243 global.c:332
+#: global.c:247 global.c:336
 msgid "Justify"
 msgstr "Xustif."
 
-#: global.c:247 global.c:253
+#: global.c:251 global.c:257
 msgid "Read File"
 msgstr "Ler Fich."
 
-#: global.c:257 global.c:328 global.c:356
+#: global.c:261 global.c:332 global.c:360
 msgid "Replace"
 msgstr "Substit."
 
-#: global.c:261
+#: global.c:265
 msgid "Where Is"
 msgstr "Buscar"
 
-#: global.c:265 global.c:408 global.c:432
+#: global.c:269 global.c:412 global.c:436
 msgid "Prev Page"
 msgstr "Páx. Seg."
 
-#: global.c:269 global.c:412 global.c:436
+#: global.c:273 global.c:416 global.c:440
 msgid "Next Page"
 msgstr "Páx. Ant."
 
-#: global.c:273
+#: global.c:277
 msgid "Cut Text"
 msgstr "Cortar"
 
-#: global.c:277
+#: global.c:281
 msgid "UnJustify"
 msgstr "Des-Xust."
 
-#: global.c:280
+#: global.c:284
 msgid "UnCut Txt"
 msgstr "Pegar"
 
-#: global.c:284
+#: global.c:288
 msgid "Cur Pos"
 msgstr "Pos. Act."
 
-#: global.c:288
+#: global.c:292
 msgid "To Spell"
 msgstr "Ortograf."
 
-#: global.c:292
+#: global.c:296
 msgid "Up"
 msgstr "Arriba"
 
-#: global.c:295
+#: global.c:299
 msgid "Down"
 msgstr "Abaixo"
 
-#: global.c:298
+#: global.c:302
 msgid "Forward"
 msgstr "Adiante"
 
-#: global.c:301
+#: global.c:305
 msgid "Back"
 msgstr "Atrás"
 
-#: global.c:304
+#: global.c:308
 msgid "Home"
 msgstr "Inicio"
 
-#: global.c:307
+#: global.c:311
 msgid "End"
 msgstr "Fin"
 
-#: global.c:310
+#: global.c:314
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: global.c:313
+#: global.c:317
 msgid "Mark Text"
 msgstr "Marcar"
 
-#: global.c:316
+#: global.c:320
 msgid "Delete"
 msgstr "Borrar"
 
-#: global.c:320
+#: global.c:324
 msgid "Backspace"
 msgstr "Retroceso"
 
-#: global.c:324
+#: global.c:328
 msgid "Tab"
 msgstr "Tabulador"
 
-#: global.c:336
+#: global.c:340
 msgid "Enter"
 msgstr "Enter"
 
-#: global.c:340 global.c:360 global.c:380
+#: global.c:344 global.c:364 global.c:384
 msgid "Goto Line"
 msgstr "Ir á Liña"
 
-#: global.c:346 global.c:367 global.c:388 global.c:398
+#: global.c:350 global.c:371 global.c:392 global.c:402
 msgid "First Line"
 msgstr "Pri. Liña"
 
-#: global.c:349 global.c:370 global.c:391 global.c:401
+#: global.c:353 global.c:374 global.c:395 global.c:405
 msgid "Last Line"
 msgstr "Der. Liña"
 
-#: global.c:352 global.c:373
+#: global.c:356 global.c:377
 msgid "Case Sens"
 msgstr "Maiú./Min."
 
-#: global.c:363 global.c:383 global.c:394 global.c:404 global.c:425
-#: global.c:428 global.c:446 winio.c:1084
+#: global.c:367 global.c:387 global.c:398 global.c:408 global.c:429
+#: global.c:432 global.c:450 winio.c:1202
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: global.c:376
+#: global.c:380
 msgid "No Replace"
 msgstr "Non Subst."
 
-#: global.c:421
+#: global.c:425
 msgid "To Files"
 msgstr "A Ficheiros"
 
-#: global.c:440
+#: global.c:444
 msgid "Goto"
 msgstr "Ir-A"
 
@@ -470,9 +470,9 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
-"key sequences are notated with the Meta (M) symbol and can be entered using "
-"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
+"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
+"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
@@ -689,138 +689,138 @@ msgstr ""
 "\n"
 "Opcións compiladas:"
 
-#: nano.c:523
+#: nano.c:526
 msgid "Mark Set"
 msgstr "Marca Posta"
 
-#: nano.c:528
+#: nano.c:531
 msgid "Mark UNset"
 msgstr "Marca Quitada"
 
-#: nano.c:1030
+#: nano.c:1033
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "chamouse a check_wrap con inptr->data=\"%s\"\n"
 
-#: nano.c:1082
+#: nano.c:1085
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data agora = \"%s\"\n"
 
-#: nano.c:1134
+#: nano.c:1137
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Despois, data = \"%s\"\n"
 
-#: nano.c:1235
+#: nano.c:1238
 msgid "Edit a replacement"
 msgstr "Editar unha substitución"
 
-#: nano.c:1465
+#: nano.c:1468
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Non se puido crear un ficheiro temporal: %s"
 
-#: nano.c:1471
+#: nano.c:1474
 msgid "Spell checking failed: unable to write temp file!"
 msgstr ""
 "Fallou a corrección ortográfica: non se puido grava-lo ficheiro temporal"
 
-#: nano.c:1483
+#: nano.c:1486
 msgid "Finished checking spelling"
 msgstr "Rematou a corrección ortográfica"
 
-#: nano.c:1485
+#: nano.c:1488
 msgid "Spell checking failed"
 msgstr "Fallou a corrección ortográfica"
 
-#: nano.c:1504
+#: nano.c:1507
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "¿Grava-lo buffer modificado (SE RESPOSTA \"Non\" HANSE PERDE-LOS CAMBIOS)? "
 
-#: nano.c:1621
+#: nano.c:1624
 msgid "Received SIGHUP"
 msgstr "Recibiuse SIGHUP"
 
-#: nano.c:1684
+#: nano.c:1687
 msgid "Cannot resize top win"
 msgstr "Non se pode cambia-lo tamaño da fiestra superior"
 
-#: nano.c:1686
+#: nano.c:1689
 msgid "Cannot move top win"
 msgstr "Non se pode move-la fiestra superior"
 
-#: nano.c:1688
+#: nano.c:1691
 msgid "Cannot resize edit win"
 msgstr "Non se pode cambia-lo tamaño da fiestra de edición"
 
-#: nano.c:1690
+#: nano.c:1693
 msgid "Cannot move edit win"
 msgstr "Non se pode move-la fiestra de edición"
 
-#: nano.c:1692
+#: nano.c:1695
 msgid "Cannot resize bottom win"
 msgstr "Non se pode cambia-lo tamaño da fiestra inferior"
 
-#: nano.c:1694
+#: nano.c:1697
 msgid "Cannot move bottom win"
 msgstr "Non se pode move-la fiestra inferior"
 
-#: nano.c:2003
+#: nano.c:2006
 msgid "Can now UnJustify!"
 msgstr "¡Agora pode Des-Xustificar!"
 
-#: nano.c:2101
+#: nano.c:2104
 #, c-format
 msgid "%s enable/disable"
 msgstr "Activar/desactivar %s"
 
-#: nano.c:2116
+#: nano.c:2119
 msgid "enabled"
 msgstr "activado"
 
-#: nano.c:2117
+#: nano.c:2120
 msgid "disabled"
 msgstr "desactivado"
 
-#: nano.c:2170
+#: nano.c:2173
 msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 msgstr "Detectouse un fallo en BloqNum. BloqNum ha estar activado sempre."
 
-#: nano.c:2402
+#: nano.c:2405
 msgid "Main: set up windows\n"
 msgstr "Main: configura-las fiestras\n"
 
-#: nano.c:2409
+#: nano.c:2416
 msgid "Main: bottom win\n"
 msgstr "Main: fiestra inferior\n"
 
-#: nano.c:2415
+#: nano.c:2422
 msgid "Main: open file\n"
 msgstr "Main: abrir ficheiro\n"
 
-#: nano.c:2471
+#: nano.c:2478
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "¡Recibiuse Alt-O-%c! (%d)\n"
 
-#: nano.c:2498
+#: nano.c:2505
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "¡Recibiuse Alt-[-1-%c! (%d)\n"
 
-#: nano.c:2531
+#: nano.c:2538
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "¡Recibiuse Alt-[-2-%c! (%d)\n"
 
-#: nano.c:2577
+#: nano.c:2584
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "¡Recibiuse Alt-[-%c! (%d)\n"
 
-#: nano.c:2603
+#: nano.c:2610
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "¡Recibiuse Alt-%c! (%d)\n"
@@ -909,43 +909,43 @@ msgstr "Vamos, sexa razonable"
 msgid "actual_x_from_start for xplus=%d returned %d\n"
 msgstr "actual_x_from_start para xplus=%d devolveu %d\n"
 
-#: winio.c:280
+#: winio.c:288
 #, c-format
 msgid "Aha! '%c' (%d)\n"
 msgstr "¡Aghá! '%c' (%d)\n"
 
-#: winio.c:462
+#: winio.c:470
 #, c-format
 msgid "input '%c' (%d)\n"
 msgstr "entrada '%c' (%d)\n"
 
-#: winio.c:504
+#: winio.c:519
 msgid "New Buffer"
 msgstr "Novo Buffer"
 
-#: winio.c:508
+#: winio.c:523
 msgid "  File: ..."
 msgstr "  Ficheiro: ..."
 
-#: winio.c:510
+#: winio.c:525
 msgid "   DIR: ..."
 msgstr "   DIR: ..."
 
-#: winio.c:521
+#: winio.c:536
 msgid "Modified"
 msgstr "Modificado"
 
-#: winio.c:973
+#: winio.c:1078
 #, c-format
 msgid "Moved to (%d, %d) in edit buffer\n"
 msgstr "Moveuse a (%d, %d) no buffer de edición\n"
 
-#: winio.c:984
+#: winio.c:1089
 #, c-format
 msgid "current->data = \"%s\"\n"
 msgstr "current->data = \"%s\"\n"
 
-#: winio.c:1029
+#: winio.c:1146
 #, c-format
 msgid "I got \"%s\"\n"
 msgstr "Recibiuse \"%s\"\n"
@@ -953,81 +953,81 @@ msgstr "Recibiuse \"%s\"\n"
 #. Yes, no and all are strings of any length.  Each string consists of
 #. all characters accepted as a valid character for that value.
 #. The first value will be the one displayed in the shortcuts.
-#: winio.c:1058
+#: winio.c:1175
 msgid "Yy"
 msgstr "Ss"
 
-#: winio.c:1059
+#: winio.c:1176
 msgid "Nn"
 msgstr "Nn"
 
-#: winio.c:1060
+#: winio.c:1177
 msgid "Aa"
 msgstr "Tt"
 
-#: winio.c:1073
+#: winio.c:1191
 msgid "Yes"
 msgstr "Si"
 
-#: winio.c:1077
+#: winio.c:1195
 msgid "All"
 msgstr "Todo"
 
-#: winio.c:1082
+#: winio.c:1200
 msgid "No"
 msgstr "Non"
 
-#: winio.c:1258
+#: winio.c:1400
 #, c-format
 msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
-#: winio.c:1262
+#: winio.c:1404
 #, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "liña %d de %d (%.0f%%), carácter %d de %d (%.0f%%)"
 
-#: winio.c:1403
+#: winio.c:1545
 msgid "Dumping file buffer to stderr...\n"
 msgstr "Envorcando o buffer de ficheiro a stderr...\n"
 
-#: winio.c:1405
+#: winio.c:1547
 msgid "Dumping cutbuffer to stderr...\n"
 msgstr "Envorcando o buffer de cortado a stderr...\n"
 
-#: winio.c:1407
+#: winio.c:1549
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Envorcando un buffer a stderr...\n"
 
-#: winio.c:1482
+#: winio.c:1624
 msgid "The nano text editor"
 msgstr "O editor de texto nano"
 
-#: winio.c:1483
+#: winio.c:1625
 msgid "version "
 msgstr "versión "
 
-#: winio.c:1484
+#: winio.c:1626
 msgid "Brought to you by:"
 msgstr "Por cortesía de:"
 
-#: winio.c:1485
+#: winio.c:1627
 msgid "Special thanks to:"
 msgstr "Gracias en especial a:"
 
-#: winio.c:1486
+#: winio.c:1628
 msgid "The Free Software Foundation"
 msgstr "A Free Software Foundation"
 
-#: winio.c:1487
+#: winio.c:1629
 msgid "Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurses"
 msgstr "Pavel Curtis, Zeyd Ben-Halim e Eric S. Raymond por ncurses"
 
-#: winio.c:1488
+#: winio.c:1630
 msgid "and anyone else we forgot..."
 msgstr "e a todos os que esquencemos..."
 
-#: winio.c:1489
+#: winio.c:1631
 msgid "Thank you for using nano!\n"
 msgstr "¡Gracias por usar nano!\n"
 
diff --git a/po/hu.po b/po/hu.po
index 837f2f4b..51a42bd2 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 0.9.99pre2\n"
-"POT-Creation-Date: 2001-04-18 18:10-0400\n"
+"POT-Creation-Date: 2001-04-30 09:44-0400\n"
 "PO-Revision-Date: 2001-02-03 07:47-0000\n"
 "Last-Translator: Szabolcs Horvath <horvaths@penguinpowered.com>\n"
 "Language-Team: Hungarian <magyar@lists.linux.hu>\n"
@@ -14,428 +14,428 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: cut.c:44
+#: cut.c:45
 #, c-format
 msgid "add_to_cutbuffer called with inptr->data = %s\n"
 msgstr "add_to_cutbuffer az inptr->data-val lett meghívva = %s\n"
 
-#: cut.c:150
+#: cut.c:151
 msgid "Blew away cutbuffer =)\n"
 msgstr "a cutbuffert elfújta a szél =)\n"
 
-#: files.c:123
+#: files.c:124
 msgid "read_line: not on first line and prev is NULL"
 msgstr "read_line: ez nem az elsõ sor és a prew értéke NULL"
 
-#: files.c:185 files.c:203
+#: files.c:186 files.c:204
 #, c-format
 msgid "Read %d lines"
 msgstr "%d sort beolvastam"
 
-#: files.c:221 search.c:193
+#: files.c:222 search.c:194
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" nem található"
 
 #. We have a new file
-#: files.c:225
+#: files.c:226
 msgid "New File"
 msgstr "Új fájl"
 
-#: files.c:238
+#: files.c:239
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr "A megadott fájl \"%s\" egy könyvtár"
 
 #. Don't open character or block files.  Sorry, /dev/sndstat!
-#: files.c:241
+#: files.c:242
 #, c-format
 msgid "File \"%s\" is a device file"
 msgstr "A fájl \"%s\" egy eszközfájl"
 
-#: files.c:248
+#: files.c:249
 msgid "Reading File"
 msgstr "Fájl beolvasása"
 
-#: files.c:264
+#: files.c:265
 msgid "File to insert [from ./] "
 msgstr "Fájl beszúrása [a ./-ból] "
 
-#: files.c:313 files.c:338 files.c:574 nano.c:1515
+#: files.c:314 files.c:339 files.c:575 nano.c:1520
 msgid "Cancelled"
 msgstr "Megszakítva"
 
-#: files.c:384 files.c:400 files.c:414 files.c:431 files.c:437
+#: files.c:385 files.c:401 files.c:415 files.c:432 files.c:438
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Nem tudom a fájlt írásra megnyitni: %s"
 
-#: files.c:419
+#: files.c:420
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Írtam >%s\n"
 
-#: files.c:446
+#: files.c:447
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Nem tudom lezárni %s: %s."
 
 #. Try a rename??
-#: files.c:469 files.c:478 files.c:483
+#: files.c:470 files.c:479 files.c:484
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Nem tudom %s-t megnyitni írásra: %s"
 
-#: files.c:490
+#: files.c:491
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Nem tudom a jogosultságokat beállítani %o on %s: %s"
 
-#: files.c:495
+#: files.c:496
 #, c-format
 msgid "Wrote %d lines"
 msgstr "%d sort elmentettem"
 
-#: files.c:530
+#: files.c:531
 msgid "File Name to write"
 msgstr "Mentés mint"
 
-#: files.c:549
+#: files.c:550
 #, c-format
 msgid "filename is %s"
 msgstr "a fájl neve %s"
 
-#: files.c:563
+#: files.c:564
 msgid "File exists, OVERWRITE ?"
 msgstr "A fájl már létezik, felülírjam?"
 
-#: files.c:985
+#: files.c:986
 msgid "(more)"
 msgstr "(tovább)"
 
-#: files.c:1256
+#: files.c:1257
 msgid "Can't move up a directory"
 msgstr "Nem tudok a könyvtárfán feljebb lépni"
 
 #. We can't open this dir for some reason.  Complain
-#: files.c:1266 files.c:1314
+#: files.c:1267 files.c:1315
 #, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "Nem tudom megnyitni \"%s\": %s"
 
-#: files.c:1294 global.c:227
+#: files.c:1295 global.c:232
 #, fuzzy
 msgid "Goto Directory"
 msgstr "Ugrás"
 
-#: files.c:1299
+#: files.c:1300
 #, fuzzy
 msgid "Goto Cancelled"
 msgstr "Megszakítva"
 
-#: global.c:139
+#: global.c:144
 msgid "Constant cursor position"
 msgstr "Állandóan mutatja a kurzor helyét"
 
-#: global.c:140
+#: global.c:145
 msgid "Auto indent"
 msgstr "Automatikus igazítás"
 
-#: global.c:141
+#: global.c:146
 msgid "Suspend"
 msgstr "Felfüggesztett"
 
-#: global.c:142
+#: global.c:147
 msgid "Help mode"
 msgstr "Súgó mód"
 
-#: global.c:143
+#: global.c:148
 msgid "Pico mode"
 msgstr "Pico-mód"
 
-#: global.c:144
+#: global.c:149
 msgid "Mouse support"
 msgstr "Egér támogatás"
 
-#: global.c:145
+#: global.c:150
 msgid "Cut to end"
 msgstr "Kivágás a végéig"
 
-#: global.c:147
+#: global.c:152
 msgid "Regular expressions"
 msgstr "Reguláris kifejezések"
 
-#: global.c:149
+#: global.c:154
 msgid "Auto wrap"
 msgstr "Automatikus sortörés"
 
-#: global.c:194
+#: global.c:199
 msgid "Invoke the help menu"
 msgstr "A súgó meghívása"
 
-#: global.c:195
+#: global.c:200
 msgid "Write the current file to disk"
 msgstr "Az aktuális fájl lemezre mentése"
 
-#: global.c:196
+#: global.c:201
 msgid "Exit from nano"
 msgstr "Kilépés a nanoból"
 
-#: global.c:197
+#: global.c:202
 msgid "Goto a specific line number"
 msgstr "Ugrás a megadott számú sorra"
 
-#: global.c:198
+#: global.c:203
 msgid "Justify the current paragraph"
 msgstr "Az adott bekezdés sorkizárt legyen"
 
-#: global.c:199
+#: global.c:204
 msgid "Unjustify after a justify"
 msgstr "A sorkizártság megszüntetése"
 
-#: global.c:200
+#: global.c:205
 msgid "Replace text within the editor"
 msgstr "Szöveg kicserélése"
 
-#: global.c:201
+#: global.c:206
 msgid "Insert another file into the current one"
 msgstr "Egy másik fájl beszúrása"
 
-#: global.c:202
+#: global.c:207
 msgid "Search for text within the editor"
 msgstr "Szöveg keresése"
 
-#: global.c:203
+#: global.c:208
 msgid "Move to the previous screen"
 msgstr "Ugrás az elõzõ oldalra"
 
-#: global.c:204
+#: global.c:209
 msgid "Move to the next screen"
 msgstr "Ugrás a következõ oldalra"
 
-#: global.c:205
+#: global.c:210
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Az aktuális sor kivágása a cutbufferbe"
 
-#: global.c:206
+#: global.c:211
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "A cutbufferben lévõ sor beillesztése az aktuális sorba"
 
-#: global.c:207
+#: global.c:212
 msgid "Show the posititon of the cursor"
 msgstr "A kurzor helyének mutatása"
 
-#: global.c:208
+#: global.c:213
 msgid "Invoke the spell checker (if available)"
 msgstr "A helyesírás-ellenõrzõ indítása (ha elérhetõ)"
 
-#: global.c:209
+#: global.c:214
 msgid "Move up one line"
 msgstr "Ugrás az elõzõ sorra"
 
-#: global.c:210
+#: global.c:215
 msgid "Move down one line"
 msgstr "Ugrás a következõ sorra"
 
-#: global.c:211
+#: global.c:216
 msgid "Move forward one character"
 msgstr "Ugrás a következõ karakterre"
 
-#: global.c:212
+#: global.c:217
 msgid "Move back one character"
 msgstr "Ugrás az elõzõ karakterre"
 
-#: global.c:213
+#: global.c:218
 msgid "Move to the beginning of the current line"
 msgstr "Ugrás a sor elejére"
 
-#: global.c:214
+#: global.c:219
 msgid "Move to the end of the current line"
 msgstr "Ugrás a sor végére"
 
-#: global.c:215
+#: global.c:220
 msgid "Go to the first line of the file"
 msgstr "Ugrás az elsõ sorra"
 
-#: global.c:216
+#: global.c:221
 msgid "Go to the last line of the file"
 msgstr "Ugrás a legutolsó sorra"
 
-#: global.c:217
+#: global.c:222
 msgid "Refresh (redraw) the current screen"
 msgstr "A képernyõ frissítése"
 
-#: global.c:218
+#: global.c:223
 msgid "Mark text at the current cursor location"
 msgstr "A szöveg megjelölése az aktuális kurzorpozícióban"
 
-#: global.c:219
+#: global.c:224
 msgid "Delete the character under the cursor"
 msgstr "A kurzor helyén lévõ karakter törlése"
 
-#: global.c:221
+#: global.c:226
 msgid "Delete the character to the left of the cursor"
 msgstr "A kurzor elõtt álló karakter törlése"
 
-#: global.c:222
+#: global.c:227
 msgid "Insert a tab character"
 msgstr "Tabulátor karakter beszúrása"
 
-#: global.c:223
+#: global.c:228
 msgid "Insert a carriage return at the cursor position"
 msgstr "\"Kocsivissza\" karakter beillesztése a kurzor helyére"
 
-#: global.c:225
+#: global.c:230
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Ebben a keresésben/cserében a kis/nagy betûk (nem )számítanak"
 
-#: global.c:226
+#: global.c:231
 msgid "Go to file browser"
 msgstr "Tallózás"
 
-#: global.c:228
+#: global.c:233
 msgid "Cancel the current function"
 msgstr "Az aktuális mûvelet megszakítása"
 
-#: global.c:231
+#: global.c:236
 msgid "Get Help"
 msgstr "Súgó"
 
-#: global.c:234 global.c:415 global.c:442
+#: global.c:239 global.c:420 global.c:447
 msgid "Exit"
 msgstr "Kilépés"
 
-#: global.c:237
+#: global.c:242
 msgid "WriteOut"
 msgstr "Mentés"
 
-#: global.c:242 global.c:331
+#: global.c:247 global.c:336
 msgid "Justify"
 msgstr "Sorkizár"
 
-#: global.c:246 global.c:252
+#: global.c:251 global.c:257
 msgid "Read File"
 msgstr "FájlBeolv"
 
-#: global.c:256 global.c:327 global.c:355
+#: global.c:261 global.c:332 global.c:360
 msgid "Replace"
 msgstr "Csere"
 
-#: global.c:260
+#: global.c:265
 msgid "Where Is"
 msgstr "Keresés"
 
-#: global.c:264 global.c:407 global.c:431
+#: global.c:269 global.c:412 global.c:436
 msgid "Prev Page"
 msgstr "ElõzõOldal"
 
-#: global.c:268 global.c:411 global.c:435
+#: global.c:273 global.c:416 global.c:440
 msgid "Next Page"
 msgstr "Következõ"
 
-#: global.c:272
+#: global.c:277
 msgid "Cut Text"
 msgstr "Kivágás"
 
-#: global.c:276
+#: global.c:281
 msgid "UnJustify"
 msgstr "NSorkizár"
 
-#: global.c:279
+#: global.c:284
 msgid "UnCut Txt"
 msgstr "Beilleszt"
 
-#: global.c:283
+#: global.c:288
 msgid "Cur Pos"
 msgstr "Pozíció"
 
-#: global.c:287
+#: global.c:292
 msgid "To Spell"
 msgstr "Helyes-e?"
 
-#: global.c:291
+#: global.c:296
 msgid "Up"
 msgstr "Fel"
 
-#: global.c:294
+#: global.c:299
 msgid "Down"
 msgstr "Le"
 
-#: global.c:297
+#: global.c:302
 msgid "Forward"
 msgstr "Elõre"
 
-#: global.c:300
+#: global.c:305
 msgid "Back"
 msgstr "Vissza"
 
-#: global.c:303
+#: global.c:308
 msgid "Home"
 msgstr "Eleje"
 
-#: global.c:306
+#: global.c:311
 msgid "End"
 msgstr "Vége"
 
-#: global.c:309
+#: global.c:314
 msgid "Refresh"
 msgstr "Frissít"
 
-#: global.c:312
+#: global.c:317
 msgid "Mark Text"
 msgstr "Megjelöl"
 
-#: global.c:315
+#: global.c:320
 msgid "Delete"
 msgstr "Töröl"
 
-#: global.c:319
+#: global.c:324
 msgid "Backspace"
 msgstr "Visszalép"
 
-#: global.c:323
+#: global.c:328
 msgid "Tab"
 msgstr "Tabulátor"
 
-#: global.c:335
+#: global.c:340
 msgid "Enter"
 msgstr "Enter"
 
-#: global.c:339 global.c:359 global.c:379
+#: global.c:344 global.c:364 global.c:384
 msgid "Goto Line"
 msgstr "Ugrás"
 
-#: global.c:345 global.c:366 global.c:387 global.c:397
+#: global.c:350 global.c:371 global.c:392 global.c:402
 msgid "First Line"
 msgstr "Elsõ sor"
 
-#: global.c:348 global.c:369 global.c:390 global.c:400
+#: global.c:353 global.c:374 global.c:395 global.c:405
 msgid "Last Line"
 msgstr "Utolsó sor"
 
-#: global.c:351 global.c:372
+#: global.c:356 global.c:377
 msgid "Case Sens"
 msgstr "kis/Nagy"
 
-#: global.c:362 global.c:382 global.c:393 global.c:403 global.c:424
-#: global.c:427 global.c:445 winio.c:1083
+#: global.c:367 global.c:387 global.c:398 global.c:408 global.c:429
+#: global.c:432 global.c:450 winio.c:1202
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: global.c:375
+#: global.c:380
 msgid "No Replace"
 msgstr "Nem cserél"
 
-#: global.c:420
+#: global.c:425
 msgid "To Files"
 msgstr "Tallózás"
 
-#: global.c:439
+#: global.c:444
 #, fuzzy
 msgid "Goto"
 msgstr "Ugrás"
 
-#: nano.c:136
+#: nano.c:137
 #, c-format
 msgid ""
 "\n"
@@ -444,7 +444,7 @@ msgstr ""
 "\n"
 "A buffer a %s fájlba lett írva\n"
 
-#: nano.c:138
+#: nano.c:139
 #, c-format
 msgid ""
 "\n"
@@ -453,15 +453,15 @@ msgstr ""
 "\n"
 "A %s nem lett írva (a fájl létezik?)\n"
 
-#: nano.c:147
+#: nano.c:148
 msgid "Window size is too small for Nano..."
 msgstr "Az ablak mérete túl kicsi a Nanonak..."
 
-#: nano.c:155
+#: nano.c:156
 msgid "Key illegal in VIEW mode"
 msgstr "Hibás billentyû a NÉZÕ módnál"
 
-#: nano.c:199
+#: nano.c:200
 msgid ""
 " nano help text\n"
 "\n"
@@ -474,9 +474,9 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
-"key sequences are notated with the Meta (M) symbol and can be entered using "
-"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
+"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
+"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
@@ -499,15 +499,15 @@ msgstr ""
 "(a választható kombinációkat zárójelben jelezzük):\n"
 "\n"
 
-#: nano.c:293
+#: nano.c:294
 msgid "delete_node(): free'd a node, YAY!\n"
 msgstr ""
 
-#: nano.c:298
+#: nano.c:299
 msgid "delete_node(): free'd last node.\n"
 msgstr ""
 
-#: nano.c:353
+#: nano.c:354
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
@@ -515,87 +515,87 @@ msgstr ""
 "Használat: nano [GNU hosszú opciók] [opciók] +SOR <fájl>\n"
 "\n"
 
-#: nano.c:354
+#: nano.c:355
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Opció\t\tHosszú opció\t\tJelentés\n"
 
-#: nano.c:356
+#: nano.c:357
 msgid " -T [num]\t--tabsize=[num]\t\tSet width of a tab to num\n"
 msgstr " -T [szám]\t--tabsize=[szám]\tA tabulátor méretének beállítása\n"
 
-#: nano.c:359
+#: nano.c:360
 msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
 msgstr " -R\t\t--regexp\t\tReguláris kifejezés használata keresésekben\n"
 
-#: nano.c:363
+#: nano.c:364
 msgid " -V \t\t--version\t\tPrint version information and exit\n"
 msgstr " -V \t\t--version\t\tVerziószám megjelenítése és kilépés\n"
 
-#: nano.c:365
+#: nano.c:366
 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
 msgstr " -c \t\t--const\t\t\tÁllandóan mutatja a kurzor pozícióját\n"
 
-#: nano.c:367
+#: nano.c:368
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr " -h \t\t--help\t\t\tKiírja ezt az üzenetet\n"
 
-#: nano.c:369
+#: nano.c:370
 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
 msgstr " -i \t\t--autoindent\t\tAutomatikusan igazítja az új sorokat\n"
 
-#: nano.c:372
+#: nano.c:373
 msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
 msgstr " -k \t\t--cut\t\t\tA ^K a kurzor pozíciójátõl a sor végéig vág\n"
 
-#: nano.c:375
+#: nano.c:376
 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite\n"
 msgstr ""
 " -t \t\t--nofollow\t\tNem követi a szimbolikus kötéseket, hanem felülír\n"
 
-#: nano.c:378
+#: nano.c:379
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr " -m \t\t--mouse\t\t\tEgér engedélyezése\n"
 
-#: nano.c:382
+#: nano.c:383
 msgid " -p\t \t--pico\t\t\tEmulate Pico as closely as possible\n"
 msgstr " -p\t \t--pico\t\t\tA Pico lehetõ legjobb emulálása\n"
 
-#: nano.c:385
+#: nano.c:386
 msgid ""
 " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
 msgstr ""
 " -r [#oszlopok] --fill=[#oszlopok]\tOszlopok feltöltése (sorok törése) az "
 "#oszlopok-ig\n"
 
-#: nano.c:388
+#: nano.c:389
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr " -s [prog] \t--speller=[prog]\tAlternatív helyesírás-ellenõrzõ\n"
 
-#: nano.c:391
+#: nano.c:392
 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\t--tempfile\t\tAutomatikus mentés kilépéskor\n"
 
-#: nano.c:393
+#: nano.c:394
 msgid " -v \t\t--view\t\t\tView (read only) mode\n"
 msgstr " -v \t\t--view\t\t\tCsak olvasható mód\n"
 
-#: nano.c:396
+#: nano.c:397
 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
 msgstr " -w \t\t--nowrap\t\tNem tördeli a sorokat\n"
 
-#: nano.c:399
+#: nano.c:400
 msgid " -x \t\t--nohelp\t\tDon't show help window\n"
 msgstr " -x \t\t--nohelp\t\tNem mutatja a súgót\n"
 
-#: nano.c:401
+#: nano.c:402
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr " -z \t\t--suspend\t\tFelfüggesztés engedélyezése\n"
 
-#: nano.c:403
+#: nano.c:404
 msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
 msgstr " +SOR\t\t\t\t\tA SOR. sornál kezd\n"
 
-#: nano.c:405
+#: nano.c:406
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
@@ -603,92 +603,92 @@ msgstr ""
 "Használat: nano [opciók] +SOR <fájl>\n"
 "\n"
 
-#: nano.c:406
+#: nano.c:407
 msgid "Option\t\tMeaning\n"
 msgstr "Opciók\t\tJelentés\n"
 
-#: nano.c:407
+#: nano.c:408
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr " -T [szám]\tBeállítja a tabulátor szélességét\n"
 
-#: nano.c:408
+#: nano.c:409
 msgid " -R\t\tUse regular expressions for search\n"
 msgstr " -R\t\tReguláris kifejezések használata kereséskor\n"
 
-#: nano.c:409
+#: nano.c:410
 msgid " -V \t\tPrint version information and exit\n"
 msgstr " -V \t\tKiírja a verziószámot és kilép\n"
 
-#: nano.c:410
+#: nano.c:411
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr " -c \t\tÁllandóan mutatja a kurzor pozícióját\n"
 
-#: nano.c:411
+#: nano.c:412
 msgid " -h \t\tShow this message\n"
 msgstr " -h \t\tEzt a súgót mutatja\n"
 
-#: nano.c:412
+#: nano.c:413
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr " -i \t\tAutomatikusan igazítja az új sorokat\n"
 
-#: nano.c:414
+#: nano.c:415
 msgid " -k \t\tLet ^K cut from cursor to end of line\n"
 msgstr " -k \t\tA ^K a kurzor helyétõl a sor végéig vág\n"
 
-#: nano.c:417
+#: nano.c:418
 msgid " -l \t\tDon't follow symbolic links, overwrite\n"
 msgstr " -l \t\tNem követi a szimbolikus kötéseket, helyette felülír\n"
 
-#: nano.c:420
+#: nano.c:421
 msgid " -m \t\tEnable mouse\n"
 msgstr " -m \t\tEgér engedélyezése\n"
 
-#: nano.c:423
+#: nano.c:424
 msgid " -p \t\tEmulate Pico as closely as possible\n"
 msgstr " -p \t\tA Pico lehetõ legjobb emulálása\n"
 
-#: nano.c:425
+#: nano.c:426
 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
 msgstr " -r [#oszlopok] \tOszlopok feltöltése az #oszlopok-ig\n"
 
-#: nano.c:427
+#: nano.c:428
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr " -s [prog]  \tAlternatív helyesírás-ellenõrzõ\n"
 
-#: nano.c:429
+#: nano.c:430
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\tAutomatikus mentés kilépéskor\n"
 
-#: nano.c:430
+#: nano.c:431
 msgid " -v \t\tView (read only) mode\n"
 msgstr " -v \t\tCsak olvasható mód\n"
 
-#: nano.c:432
+#: nano.c:433
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr " -w \t\tNem tördeli a hosszú sorokat\n"
 
-#: nano.c:434
+#: nano.c:435
 msgid " -x \t\tDon't show help window\n"
 msgstr " -x \t\tNem mutatja a súgó ablakot\n"
 
-#: nano.c:435
+#: nano.c:436
 msgid " -z \t\tEnable suspend\n"
 msgstr " -z \t\tFelfüggesztés engedélyezése\n"
 
-#: nano.c:436
+#: nano.c:437
 msgid " +LINE\t\tStart at line number LINE\n"
 msgstr " +SOR\t\tA SOR. számú sorban kezd\n"
 
-#: nano.c:443
+#: nano.c:444
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano - %s verzió. (fordítva %s, %s)\n"
 
-#: nano.c:446
+#: nano.c:447
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 msgstr ""
 
-#: nano.c:447
+#: nano.c:448
 msgid ""
 "\n"
 " Compiled options:"
@@ -696,272 +696,266 @@ msgstr ""
 "\n"
 " Fordítási paraméterek:"
 
-#: nano.c:522
+#: nano.c:526
 msgid "Mark Set"
 msgstr "Megjelölés kezdete"
 
-#: nano.c:527
+#: nano.c:531
 msgid "Mark UNset"
 msgstr "Megjelölés vége"
 
-#: nano.c:1029
+#: nano.c:1033
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap az inptr->data-ból lett meghívva (\"%s\")\n"
 
-#: nano.c:1081
+#: nano.c:1085
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data most = \"%s\"\n"
 
-#: nano.c:1133
+#: nano.c:1137
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Ezután az adat ez lett = \"%s\"\n"
 
-#: nano.c:1234
+#: nano.c:1238
 msgid "Edit a replacement"
 msgstr "A helyettesítõ érték módosítása"
 
-#: nano.c:1463
+#: nano.c:1468
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Az ideiglenes fájlt nem tudtam létrehozni: %s"
 
-#: nano.c:1469
+#: nano.c:1474
 msgid "Spell checking failed: unable to write temp file!"
 msgstr ""
 "A helyesírás-ellenõrzés nem sikerült: képtelen vagyok írni a temp fájlt!"
 
-#: nano.c:1481
+#: nano.c:1486
 msgid "Finished checking spelling"
 msgstr "A helyesírás-ellenõrzés befejezése"
 
-#: nano.c:1483
+#: nano.c:1488
 msgid "Spell checking failed"
 msgstr "Helyesírás-ellenõrzés nem sikerült"
 
-#: nano.c:1502
+#: nano.c:1507
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "A változásokat elmentsem (HA \"NEM\", AKKOR MINDEN MÓDOSÍTÁS ELVESZIK) ?"
 
-#: nano.c:1619
+#: nano.c:1624
 msgid "Received SIGHUP"
 msgstr "Kaptam egy SIGHUPot"
 
-#: nano.c:1682
+#: nano.c:1687
 msgid "Cannot resize top win"
 msgstr "A felsõ ablakot nem tudom átméretezni"
 
-#: nano.c:1684
+#: nano.c:1689
 msgid "Cannot move top win"
 msgstr "A felsõ ablakot nem tudom mozgatni"
 
-#: nano.c:1686
+#: nano.c:1691
 msgid "Cannot resize edit win"
 msgstr "A szerkesztõ ablakot nem tudom átméretezni"
 
-#: nano.c:1688
+#: nano.c:1693
 msgid "Cannot move edit win"
 msgstr "A szerkesztõ ablakot nem tudom mozgatni"
 
-#: nano.c:1690
+#: nano.c:1695
 msgid "Cannot resize bottom win"
 msgstr "Az alsó ablakot nem tudom átméretezni"
 
-#: nano.c:1692
+#: nano.c:1697
 msgid "Cannot move bottom win"
 msgstr "Az alsó ablakot nem tudom mozgatni"
 
-#: nano.c:2001
+#: nano.c:2006
 msgid "Can now UnJustify!"
 msgstr "A sorokat most már tudom nem sorkizárttá tenni"
 
-#: nano.c:2099
+#: nano.c:2104
 #, c-format
 msgid "%s enable/disable"
 msgstr "%s engedélyezés/kikapcsolás"
 
-#: nano.c:2114
+#: nano.c:2119
 msgid "enabled"
 msgstr "engedélyezve"
 
-#: nano.c:2115
+#: nano.c:2120
 msgid "disabled"
 msgstr "kikapcsolva"
 
-#: nano.c:2168
+#: nano.c:2173
 msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 msgstr ""
 "NumLock hibát fedeztem fel.  A Keypad rosszul mûködhet, ha a NumLock be van "
 "kapcsolva"
 
-#: nano.c:2396
+#: nano.c:2405
 msgid "Main: set up windows\n"
 msgstr "Fõprogram: az ablakok beállítása\n"
 
-#: nano.c:2403
+#: nano.c:2416
 msgid "Main: bottom win\n"
 msgstr "Fõprogram: alsó ablak\n"
 
-#: nano.c:2409
+#: nano.c:2422
 msgid "Main: open file\n"
 msgstr "Fõprogram: fájl megnyitása\n"
 
-#: nano.c:2464
+#: nano.c:2478
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "Az Alt-O-%c billentyûket lenyomtad! (%d)\n"
 
-#: nano.c:2491
+#: nano.c:2505
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "Az Alt-[-1-%c billentyûket lenyomtad! (%d)\n"
 
-#: nano.c:2524
+#: nano.c:2538
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "Az Alt-[-2-%c billentyûket lenyomtad! (%d)\n"
 
-#: nano.c:2566
+#: nano.c:2584
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Az Alt-[-%c billentyûket lenyomtad! (%d)\n"
 
-#: nano.c:2592
+#: nano.c:2610
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Az Alt-%c billentyûket lenyomtad! (%d)\n"
 
-#: search.c:117
+#: search.c:118
 #, c-format
 msgid "Case Sensitive Regexp Search%s%s"
 msgstr "Regexp keresés (kis/Nagy külön)%s%s"
 
-#: search.c:119
+#: search.c:120
 #, c-format
 msgid "Regexp Search%s%s"
 msgstr "Regexp keresés%s%s"
 
-#: search.c:121
+#: search.c:122
 #, c-format
 msgid "Case Sensitive Search%s%s"
 msgstr "Keresés (kis/Nagy külön)%s%s"
 
-#: search.c:123
+#: search.c:124
 #, c-format
 msgid "Search%s%s"
 msgstr "Keresés%s%s"
 
-#: search.c:126
+#: search.c:127
 msgid " (to replace)"
 msgstr " (cserére)"
 
-#: search.c:135 search.c:326
+#: search.c:136 search.c:327
 msgid "Search Cancelled"
 msgstr "Keresés megszakítva"
 
-#: search.c:199
+#: search.c:200
 #, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s...\" nem található"
 
-#: search.c:248
+#: search.c:249
 msgid "Search Wrapped"
 msgstr ""
 
-#: search.c:348
+#: search.c:349
 #, fuzzy, c-format
 msgid "Replaced %d occurrences"
 msgstr "%d alkalommal fordult elõ, kicseréltem azokat"
 
-#: search.c:350
+#: search.c:351
 #, fuzzy
 msgid "Replaced 1 occurrence"
 msgstr "Egyszer fordult elõ, kicseréltem"
 
-#: search.c:488 search.c:592 search.c:608
+#: search.c:489 search.c:599 search.c:615
 msgid "Replace Cancelled"
 msgstr "A csere megszakítva"
 
-#: search.c:538
+#: search.c:539
 msgid "Replace this instance?"
 msgstr ""
 
-#: search.c:550
+#: search.c:551
 msgid "Replace failed: unknown subexpression!"
 msgstr "Hiba a cserénél: ismeretlen alkifejezés!"
 
-#: search.c:633
+#: search.c:640
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Cserélés erre [%s]"
 
-#: search.c:637 search.c:641
+#: search.c:644 search.c:648
 msgid "Replace with"
 msgstr "Erre lesz cserélve"
 
-#. Ask for it
-#: search.c:676
+#: search.c:682
 msgid "Enter line number"
 msgstr "Kérem a sor számát"
 
-#: search.c:678
+#: search.c:684
 msgid "Aborted"
 msgstr "Megszakítva"
 
-#: search.c:698
+#: search.c:693
 msgid "Come on, be reasonable"
 msgstr "Gyerünk, adj meg egy hihetõbb értéket :-)"
 
-#: search.c:703
-#, c-format
-msgid "Only %d lines available, skipping to last line"
-msgstr "Csak %d sorból áll a szöveg, ezért az utolsóra ugrottam"
-
-#: winio.c:123
+#: winio.c:124
 #, c-format
 msgid "actual_x_from_start for xplus=%d returned %d\n"
 msgstr "actual_x_from_start az xplus=%d-hoz visszatért: %d\n"
 
-#: winio.c:279
+#: winio.c:288
 #, fuzzy, c-format
 msgid "Aha! '%c' (%d)\n"
 msgstr "bevitel '%c' (%d)\n"
 
-#: winio.c:461
+#: winio.c:470
 #, c-format
 msgid "input '%c' (%d)\n"
 msgstr "bevitel '%c' (%d)\n"
 
-#: winio.c:503
+#: winio.c:519
 msgid "New Buffer"
 msgstr "Új fájl"
 
-#: winio.c:507
+#: winio.c:523
 msgid "  File: ..."
 msgstr "  Fájl: ..."
 
-#: winio.c:509
+#: winio.c:525
 msgid "   DIR: ..."
 msgstr " Könyvtár: ..."
 
-#: winio.c:520
+#: winio.c:536
 msgid "Modified"
 msgstr "Módosítva"
 
-#: winio.c:972
+#: winio.c:1078
 #, c-format
 msgid "Moved to (%d, %d) in edit buffer\n"
 msgstr "Átmozgattam (%d, %d) a szerkesztõ-bufferben\n"
 
-#: winio.c:983
+#: winio.c:1089
 #, c-format
 msgid "current->data = \"%s\"\n"
 msgstr ""
 
-#: winio.c:1028
+#: winio.c:1146
 #, c-format
 msgid "I got \"%s\"\n"
 msgstr "A \"%s\" lenyomva van.\n"
@@ -969,80 +963,83 @@ msgstr "A \"%s\" lenyomva van.\n"
 #. Yes, no and all are strings of any length.  Each string consists of
 #. all characters accepted as a valid character for that value.
 #. The first value will be the one displayed in the shortcuts.
-#: winio.c:1057
+#: winio.c:1175
 msgid "Yy"
 msgstr "Ii"
 
-#: winio.c:1058
+#: winio.c:1176
 msgid "Nn"
 msgstr "Nn"
 
-#: winio.c:1059
+#: winio.c:1177
 msgid "Aa"
 msgstr "Mm"
 
-#: winio.c:1072
+#: winio.c:1191
 msgid "Yes"
 msgstr "Igen"
 
-#: winio.c:1076
+#: winio.c:1195
 msgid "All"
 msgstr "Mindet"
 
-#: winio.c:1081
+#: winio.c:1200
 msgid "No"
 msgstr "Nem"
 
-#: winio.c:1257
+#: winio.c:1400
 #, c-format
 msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr ""
 
-#: winio.c:1261
+#: winio.c:1404
 #, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "%d(/%d). sor (%.0f%%) és a(z) %d(/%d). karakter (%.0f%%)"
 
-#: winio.c:1402
+#: winio.c:1545
 msgid "Dumping file buffer to stderr...\n"
 msgstr "A fájlbuffer kiírása a standard hibakimenetre...\n"
 
-#: winio.c:1404
+#: winio.c:1547
 msgid "Dumping cutbuffer to stderr...\n"
 msgstr "A cutbuffer kiírása a standard hibakimenetre...\n"
 
-#: winio.c:1406
+#: winio.c:1549
 msgid "Dumping a buffer to stderr...\n"
 msgstr "A buffer kiírása a standard hibakimenetre...\n"
 
-#: winio.c:1481
+#: winio.c:1624
 msgid "The nano text editor"
 msgstr "A nano szövegszerkesztõ"
 
-#: winio.c:1482
+#: winio.c:1625
 msgid "version "
 msgstr "verzió "
 
-#: winio.c:1483
+#: winio.c:1626
 msgid "Brought to you by:"
 msgstr "A nano-t õk készítették el Neked:"
 
-#: winio.c:1484
+#: winio.c:1627
 msgid "Special thanks to:"
 msgstr "Külön köszönet:"
 
-#: winio.c:1485
+#: winio.c:1628
 msgid "The Free Software Foundation"
 msgstr "A Szabad Szoftver Alapítvány"
 
-#: winio.c:1486
+#: winio.c:1629
 msgid "Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurses"
 msgstr "Pavel Curtis, Zeyd Ben-Halim és Eric S. Raymond az ncurses-ért"
 
-#: winio.c:1487
+#: winio.c:1630
 msgid "and anyone else we forgot..."
 msgstr "és mindenkinek, akit kifelejtettünk volna..."
 
-#: winio.c:1488
+#: winio.c:1631
 msgid "Thank you for using nano!\n"
 msgstr "Köszönjük, hogy a nano-t választottad!\n"
+
+#~ msgid "Only %d lines available, skipping to last line"
+#~ msgstr "Csak %d sorból áll a szöveg, ezért az utolsóra ugrottam"
diff --git a/po/id.po b/po/id.po
index df51dcaa..c87abcd0 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano-1.0\n"
-"POT-Creation-Date: 2001-04-18 18:10-0400\n"
+"POT-Creation-Date: 2001-04-30 09:44-0400\n"
 "PO-Revision-Date: 2001-02-08 10:09+07:00\n"
 "Last-Translator: Tedi Heriyanto <tedi-h@usa.net>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -14,428 +14,428 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: cut.c:44
+#: cut.c:45
 #, c-format
 msgid "add_to_cutbuffer called with inptr->data = %s\n"
 msgstr "add_to_cutbuffer dipangil dgn inptr->data = %s\n"
 
-#: cut.c:150
+#: cut.c:151
 msgid "Blew away cutbuffer =)\n"
 msgstr "Hapus cutbuffer =>\n"
 
-#: files.c:123
+#: files.c:124
 msgid "read_line: not on first line and prev is NULL"
 msgstr "read_line: tidak di baris pertama dan sebelumnya adalah NULL"
 
-#: files.c:185 files.c:203
+#: files.c:186 files.c:204
 #, c-format
 msgid "Read %d lines"
 msgstr "Membaca %d baris"
 
-#: files.c:221 search.c:193
+#: files.c:222 search.c:194
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" tidak ditemukan"
 
 #. We have a new file
-#: files.c:225
+#: files.c:226
 msgid "New File"
 msgstr "File Baru"
 
-#: files.c:238
+#: files.c:239
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr "File \"%s\" adalah sebuah direktori"
 
 #. Don't open character or block files.  Sorry, /dev/sndstat!
-#: files.c:241
+#: files.c:242
 #, c-format
 msgid "File \"%s\" is a device file"
 msgstr "File \"%s\" adalah sebuah file device"
 
-#: files.c:248
+#: files.c:249
 msgid "Reading File"
 msgstr "Membaca File"
 
-#: files.c:264
+#: files.c:265
 msgid "File to insert [from ./] "
 msgstr "File untuk disisipkan [dari ./] "
 
-#: files.c:313 files.c:338 files.c:574 nano.c:1515
+#: files.c:314 files.c:339 files.c:575 nano.c:1520
 msgid "Cancelled"
 msgstr "Dibatalkan"
 
-#: files.c:384 files.c:400 files.c:414 files.c:431 files.c:437
+#: files.c:385 files.c:401 files.c:415 files.c:432 files.c:438
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Tidak dapat membuka file untuk menulis: %s"
 
-#: files.c:419
+#: files.c:420
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Tulis >%s\n"
 
-#: files.c:446
+#: files.c:447
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Tidak dapat menutup %s: %s"
 
 #. Try a rename??
-#: files.c:469 files.c:478 files.c:483
+#: files.c:470 files.c:479 files.c:484
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Tidak dapat membuka %s untuk menulis: %s"
 
-#: files.c:490
+#: files.c:491
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Tidak dapat menset permisi %o pada %s: %s"
 
-#: files.c:495
+#: files.c:496
 #, c-format
 msgid "Wrote %d lines"
 msgstr "Menulis %d baris"
 
-#: files.c:530
+#: files.c:531
 msgid "File Name to write"
 msgstr "Nama file untuk ditulis"
 
-#: files.c:549
+#: files.c:550
 #, c-format
 msgid "filename is %s"
 msgstr "Namafile adalah %s"
 
-#: files.c:563
+#: files.c:564
 msgid "File exists, OVERWRITE ?"
 msgstr "File ada, DITIMPA ?"
 
-#: files.c:985
+#: files.c:986
 msgid "(more)"
 msgstr "(lagi)"
 
-#: files.c:1256
+#: files.c:1257
 msgid "Can't move up a directory"
 msgstr "Tidak dapat memindahkan direktori"
 
 #. We can't open this dir for some reason.  Complain
-#: files.c:1266 files.c:1314
+#: files.c:1267 files.c:1315
 #, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "Tidak dapat membuka \"%s\": %s"
 
-#: files.c:1294 global.c:227
+#: files.c:1295 global.c:232
 #, fuzzy
 msgid "Goto Directory"
 msgstr "Ke baris"
 
-#: files.c:1299
+#: files.c:1300
 #, fuzzy
 msgid "Goto Cancelled"
 msgstr "Dibatalkan"
 
-#: global.c:139
+#: global.c:144
 msgid "Constant cursor position"
 msgstr "Posisi kursor konstan"
 
-#: global.c:140
+#: global.c:145
 msgid "Auto indent"
 msgstr "Indent otomatis"
 
-#: global.c:141
+#: global.c:146
 msgid "Suspend"
 msgstr "Tunda"
 
-#: global.c:142
+#: global.c:147
 msgid "Help mode"
 msgstr "Mode bantuan"
 
-#: global.c:143
+#: global.c:148
 msgid "Pico mode"
 msgstr "Mode Pico"
 
-#: global.c:144
+#: global.c:149
 msgid "Mouse support"
 msgstr "Dukungan mouse"
 
-#: global.c:145
+#: global.c:150
 msgid "Cut to end"
 msgstr "Cut hingga akhir"
 
-#: global.c:147
+#: global.c:152
 msgid "Regular expressions"
 msgstr "Regular expressions"
 
-#: global.c:149
+#: global.c:154
 msgid "Auto wrap"
 msgstr "Wrap otomatis"
 
-#: global.c:194
+#: global.c:199
 msgid "Invoke the help menu"
 msgstr "Panggil menu bantuan"
 
-#: global.c:195
+#: global.c:200
 msgid "Write the current file to disk"
 msgstr "Tulis file sekarang ke disk"
 
-#: global.c:196
+#: global.c:201
 msgid "Exit from nano"
 msgstr "Keluar dari nano"
 
-#: global.c:197
+#: global.c:202
 msgid "Goto a specific line number"
 msgstr "Ke nomor baris tertentu"
 
-#: global.c:198
+#: global.c:203
 msgid "Justify the current paragraph"
 msgstr "Justifikasi paragraf saat ini"
 
-#: global.c:199
+#: global.c:204
 msgid "Unjustify after a justify"
 msgstr "Unjustifikasi setelah justifikasi"
 
-#: global.c:200
+#: global.c:205
 msgid "Replace text within the editor"
 msgstr "Ganti teks dalam editor"
 
-#: global.c:201
+#: global.c:206
 msgid "Insert another file into the current one"
 msgstr "Sertakan file lain ke file saat ini"
 
-#: global.c:202
+#: global.c:207
 msgid "Search for text within the editor"
 msgstr "Cari teks dalam editor"
 
-#: global.c:203
+#: global.c:208
 msgid "Move to the previous screen"
 msgstr "Pindah ke layar sebelumnya"
 
-#: global.c:204
+#: global.c:209
 msgid "Move to the next screen"
 msgstr "Pindah ke layar berikutnya"
 
-#: global.c:205
+#: global.c:210
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Hapus baris saat ini dan taruh dalam cutbuffer"
 
-#: global.c:206
+#: global.c:211
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Kembalikan dari cutbuffer ke baris saat ini"
 
-#: global.c:207
+#: global.c:212
 msgid "Show the posititon of the cursor"
 msgstr "Tampilkan posisi kursor"
 
-#: global.c:208
+#: global.c:213
 msgid "Invoke the spell checker (if available)"
 msgstr "Panggil spell checker (jika ada)"
 
-#: global.c:209
+#: global.c:214
 msgid "Move up one line"
 msgstr "Naik satu baris"
 
-#: global.c:210
+#: global.c:215
 msgid "Move down one line"
 msgstr "Turun satu baris"
 
-#: global.c:211
+#: global.c:216
 msgid "Move forward one character"
 msgstr "Pindah satu karakter ke depan"
 
-#: global.c:212
+#: global.c:217
 msgid "Move back one character"
 msgstr "Pindah satu karakter ke belakang"
 
-#: global.c:213
+#: global.c:218
 msgid "Move to the beginning of the current line"
 msgstr "Pindah ke awal baris ini"
 
-#: global.c:214
+#: global.c:219
 msgid "Move to the end of the current line"
 msgstr "Pindah ke akhir baris ini"
 
-#: global.c:215
+#: global.c:220
 msgid "Go to the first line of the file"
 msgstr "Ke baris terawal file"
 
-#: global.c:216
+#: global.c:221
 msgid "Go to the last line of the file"
 msgstr "Ke baris terakhir file"
 
-#: global.c:217
+#: global.c:222
 msgid "Refresh (redraw) the current screen"
 msgstr "Refresh layar saat ini"
 
-#: global.c:218
+#: global.c:223
 msgid "Mark text at the current cursor location"
 msgstr "Tandai teks pada lokasi kursor saat ini"
 
-#: global.c:219
+#: global.c:224
 msgid "Delete the character under the cursor"
 msgstr "Hapus karakter pada kursor"
 
-#: global.c:221
+#: global.c:226
 msgid "Delete the character to the left of the cursor"
 msgstr "Hapus satu karakter di kiri kursor"
 
-#: global.c:222
+#: global.c:227
 msgid "Insert a tab character"
 msgstr "Masukkan karakter tab"
 
-#: global.c:223
+#: global.c:228
 msgid "Insert a carriage return at the cursor position"
 msgstr "Sertakan carriage return di posisi kursor"
 
-#: global.c:225
+#: global.c:230
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Jadikan pencarian/penggantian saat ini case (in)sensitive"
 
-#: global.c:226
+#: global.c:231
 msgid "Go to file browser"
 msgstr "Ke browser file"
 
-#: global.c:228
+#: global.c:233
 msgid "Cancel the current function"
 msgstr "Batalkan fungsi ini"
 
-#: global.c:231
+#: global.c:236
 msgid "Get Help"
 msgstr "Cari Bantuan"
 
-#: global.c:234 global.c:415 global.c:442
+#: global.c:239 global.c:420 global.c:447
 msgid "Exit"
 msgstr "Keluar"
 
-#: global.c:237
+#: global.c:242
 msgid "WriteOut"
 msgstr "Tulis"
 
-#: global.c:242 global.c:331
+#: global.c:247 global.c:336
 msgid "Justify"
 msgstr "Justifikasi"
 
-#: global.c:246 global.c:252
+#: global.c:251 global.c:257
 msgid "Read File"
 msgstr "Baca File"
 
-#: global.c:256 global.c:327 global.c:355
+#: global.c:261 global.c:332 global.c:360
 msgid "Replace"
 msgstr "Ganti"
 
-#: global.c:260
+#: global.c:265
 msgid "Where Is"
 msgstr "Di mana"
 
-#: global.c:264 global.c:407 global.c:431
+#: global.c:269 global.c:412 global.c:436
 msgid "Prev Page"
 msgstr "Halaman sebelumnya"
 
-#: global.c:268 global.c:411 global.c:435
+#: global.c:273 global.c:416 global.c:440
 msgid "Next Page"
 msgstr "Halaman berikutnya"
 
-#: global.c:272
+#: global.c:277
 msgid "Cut Text"
 msgstr "Potong Teks"
 
-#: global.c:276
+#: global.c:281
 msgid "UnJustify"
 msgstr "UnJustifikasi"
 
-#: global.c:279
+#: global.c:284
 msgid "UnCut Txt"
 msgstr "UnCut Teks"
 
-#: global.c:283
+#: global.c:288
 msgid "Cur Pos"
 msgstr "Pos Kursor"
 
-#: global.c:287
+#: global.c:292
 msgid "To Spell"
 msgstr "Mengeja"
 
-#: global.c:291
+#: global.c:296
 msgid "Up"
 msgstr "Naik"
 
-#: global.c:294
+#: global.c:299
 msgid "Down"
 msgstr "Turun"
 
-#: global.c:297
+#: global.c:302
 msgid "Forward"
 msgstr "Depan"
 
-#: global.c:300
+#: global.c:305
 msgid "Back"
 msgstr "Belakang"
 
-#: global.c:303
+#: global.c:308
 msgid "Home"
 msgstr "Awal"
 
-#: global.c:306
+#: global.c:311
 msgid "End"
 msgstr "Akhir"
 
-#: global.c:309
+#: global.c:314
 msgid "Refresh"
 msgstr "Refresh"
 
-#: global.c:312
+#: global.c:317
 msgid "Mark Text"
 msgstr "Tandai Teks"
 
-#: global.c:315
+#: global.c:320
 msgid "Delete"
 msgstr "Hapus"
 
-#: global.c:319
+#: global.c:324
 msgid "Backspace"
 msgstr "Backspace"
 
-#: global.c:323
+#: global.c:328
 msgid "Tab"
 msgstr "Tab"
 
-#: global.c:335
+#: global.c:340
 msgid "Enter"
 msgstr "Enter"
 
-#: global.c:339 global.c:359 global.c:379
+#: global.c:344 global.c:364 global.c:384
 msgid "Goto Line"
 msgstr "Ke baris"
 
-#: global.c:345 global.c:366 global.c:387 global.c:397
+#: global.c:350 global.c:371 global.c:392 global.c:402
 msgid "First Line"
 msgstr "Baris pertama"
 
-#: global.c:348 global.c:369 global.c:390 global.c:400
+#: global.c:353 global.c:374 global.c:395 global.c:405
 msgid "Last Line"
 msgstr "Baris terakhir"
 
-#: global.c:351 global.c:372
+#: global.c:356 global.c:377
 msgid "Case Sens"
 msgstr "Case Sens"
 
-#: global.c:362 global.c:382 global.c:393 global.c:403 global.c:424
-#: global.c:427 global.c:445 winio.c:1083
+#: global.c:367 global.c:387 global.c:398 global.c:408 global.c:429
+#: global.c:432 global.c:450 winio.c:1202
 msgid "Cancel"
 msgstr "Batal"
 
-#: global.c:375
+#: global.c:380
 msgid "No Replace"
 msgstr "No Replace"
 
-#: global.c:420
+#: global.c:425
 msgid "To Files"
 msgstr "Ke File"
 
-#: global.c:439
+#: global.c:444
 #, fuzzy
 msgid "Goto"
 msgstr "Ke baris"
 
-#: nano.c:136
+#: nano.c:137
 #, c-format
 msgid ""
 "\n"
@@ -444,7 +444,7 @@ msgstr ""
 "\n"
 "Buffer ditulis ke %s\n"
 
-#: nano.c:138
+#: nano.c:139
 #, c-format
 msgid ""
 "\n"
@@ -453,15 +453,15 @@ msgstr ""
 "\n"
 "%s tidak ditulis (file ada?)\n"
 
-#: nano.c:147
+#: nano.c:148
 msgid "Window size is too small for Nano..."
 msgstr "Ukuran window terlalu kecil bagi Nano..."
 
-#: nano.c:155
+#: nano.c:156
 msgid "Key illegal in VIEW mode"
 msgstr "Kunci ilegal dalam mode VIEW"
 
-#: nano.c:199
+#: nano.c:200
 msgid ""
 " nano help text\n"
 "\n"
@@ -474,9 +474,9 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
-"key sequences are notated with the Meta (M) symbol and can be entered using "
-"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
+"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
+"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
@@ -494,8 +494,8 @@ msgstr ""
 "\n"
 "Notasi untuk shortcut adalah sebagai berikut : urutan kunci Control "
 "dilambangkan\n"
-"dengan simbol caret (^) dan dimasukkan dengan menekan tombol Control "
-"(Ctrl). \n"
+"dengan simbol caret (^) dan dimasukkan dengan menekan tombol Control (Ctrl). "
+"\n"
 "Urutan kunci Escape dilambangkan dengan simbol Meta (M) dan dapat dimasukkan "
 "dengan \n"
 "menggunakan tombol Esc, Alt atau Meta tergantung pada setup keyboard anda. \n"
@@ -503,99 +503,99 @@ msgstr ""
 "Kunci-kunci opsional ditunjukkan dalam kurung:\n"
 "\n"
 
-#: nano.c:293
+#: nano.c:294
 msgid "delete_node(): free'd a node, YAY!\n"
 msgstr "delete_node(): bebaskan sebuah node, YAY!\n"
 
-#: nano.c:298
+#: nano.c:299
 msgid "delete_node(): free'd last node.\n"
 msgstr "delete_node(): bebaskan node terakhir.\n"
 
-#: nano.c:353
+#: nano.c:354
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
 msgstr "Pemakaian: nano [GNU long option] [option] +LINE <file>\n"
 
-#: nano.c:354
+#: nano.c:355
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Option: Long option     Arti\n"
 
-#: nano.c:356
+#: nano.c:357
 msgid " -T [num]\t--tabsize=[num]\t\tSet width of a tab to num\n"
 msgstr " -T [num]       --tabsize=[num]         Set lebar tabulasi ke num\n"
 
-#: nano.c:359
+#: nano.c:360
 msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
 msgstr "-R     --regexp        Gunakan regular expression untuk mencari\n"
 
-#: nano.c:363
+#: nano.c:364
 msgid " -V \t\t--version\t\tPrint version information and exit\n"
 msgstr "-V      --version       Tampilkan versi dan keluar\n"
 
-#: nano.c:365
+#: nano.c:366
 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
 msgstr "-c      --const         Menampilkan posisi kursor secara konstan\n"
 
-#: nano.c:367
+#: nano.c:368
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr "-h      --help          Tampilkan pesan ini\n"
 
-#: nano.c:369
+#: nano.c:370
 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
 msgstr "-i      --autoindent    Indentasi baris barus secara otomatis\n"
 
-#: nano.c:372
+#: nano.c:373
 msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
 msgstr "-k      --cut   ^K melakukan cut dari kursor ke akhir baris\n"
 
-#: nano.c:375
+#: nano.c:376
 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite\n"
 msgstr "-l      --nofollow      Jangan ikuti link simbolik, timpa\n"
 
-#: nano.c:378
+#: nano.c:379
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr "-m      --mouse         Aktifkan mouse\n"
 
-#: nano.c:382
+#: nano.c:383
 msgid " -p\t \t--pico\t\t\tEmulate Pico as closely as possible\n"
 msgstr "-p      --pico  Emulasikan Pico sebaik mungkin\n"
 
-#: nano.c:385
+#: nano.c:386
 msgid ""
 " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
 msgstr "-r [#cols]      --fill=[#cols]  Set fill col ke (wrap line di) #cols\n"
 
-#: nano.c:388
+#: nano.c:389
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr "-s [prog]       --speller=[prog]        Aktifkan speller alternatif\n"
 
-#: nano.c:391
+#: nano.c:392
 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
 msgstr ""
 "-t      --tempfile      Autosave saat keluar, jangan minta konfirmasi\n"
 
-#: nano.c:393
+#: nano.c:394
 msgid " -v \t\t--view\t\t\tView (read only) mode\n"
 msgstr "-v      --view  Mode Tampil (baca saja)\n"
 
-#: nano.c:396
+#: nano.c:397
 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
 msgstr "-w      --nowrap        Jangan wrap baris panjang\n"
 
-#: nano.c:399
+#: nano.c:400
 msgid " -x \t\t--nohelp\t\tDon't show help window\n"
 msgstr "-x      --nohelp        Jangan tampilkan jendela bantuan\n"
 
-#: nano.c:401
+#: nano.c:402
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr "-z      --suspend       Aktifkan suspend\n"
 
-#: nano.c:403
+#: nano.c:404
 msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
 msgstr "+LINE                   Mulai pada nomor baris LINE\n"
 
-#: nano.c:405
+#: nano.c:406
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
@@ -603,92 +603,92 @@ msgstr ""
 "Pemakaian: nano [option] +LINE <file>\n"
 "\n"
 
-#: nano.c:406
+#: nano.c:407
 msgid "Option\t\tMeaning\n"
 msgstr "Option          Arti\n"
 
-#: nano.c:407
+#: nano.c:408
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr " -T [num]\tGanti lebar tabulasi manjadi num\n"
 
-#: nano.c:408
+#: nano.c:409
 msgid " -R\t\tUse regular expressions for search\n"
 msgstr "-R      Gunakan regular expression untuk mencari\n"
 
-#: nano.c:409
+#: nano.c:410
 msgid " -V \t\tPrint version information and exit\n"
 msgstr "-V     Tampilkan informasi versi dan keluar\n"
 
-#: nano.c:410
+#: nano.c:411
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr "-c     Menampilkan posisi kursor secara konstan\n"
 
-#: nano.c:411
+#: nano.c:412
 msgid " -h \t\tShow this message\n"
 msgstr "-h     Tampilkan pesan ini\n"
 
-#: nano.c:412
+#: nano.c:413
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr "-i     Indent baris barus secara otomatis\n"
 
-#: nano.c:414
+#: nano.c:415
 msgid " -k \t\tLet ^K cut from cursor to end of line\n"
 msgstr "-k      ^K melakukan cut dari kursor ke akhir baris\n"
 
-#: nano.c:417
+#: nano.c:418
 msgid " -l \t\tDon't follow symbolic links, overwrite\n"
 msgstr "-l     Jangan ikuti link simbolik, timpa\n"
 
-#: nano.c:420
+#: nano.c:421
 msgid " -m \t\tEnable mouse\n"
 msgstr "-m     Aktifkan mouse\n"
 
-#: nano.c:423
+#: nano.c:424
 msgid " -p \t\tEmulate Pico as closely as possible\n"
 msgstr "-p      Emulasikan Pico sebaik mungkin\n"
 
-#: nano.c:425
+#: nano.c:426
 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
 msgstr "-r [#cols]   Set fill col ke (wrap line di) #cols\n"
 
-#: nano.c:427
+#: nano.c:428
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr "-s [prog]    Aktifkan speller alternatif\n"
 
-#: nano.c:429
+#: nano.c:430
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr "-t     Autosave saat keluar, jangan minta konfirmasi.\n"
 
-#: nano.c:430
+#: nano.c:431
 msgid " -v \t\tView (read only) mode\n"
 msgstr "-v     Mode Tampil (baca saja)\n"
 
-#: nano.c:432
+#: nano.c:433
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr "-w     Jangan wrap baris panjang\n"
 
-#: nano.c:434
+#: nano.c:435
 msgid " -x \t\tDon't show help window\n"
 msgstr "-x     Jangan tampilkan jendela bantuan\n"
 
-#: nano.c:435
+#: nano.c:436
 msgid " -z \t\tEnable suspend\n"
 msgstr "-z     Aktifkan suspend\n"
 
-#: nano.c:436
+#: nano.c:437
 msgid " +LINE\t\tStart at line number LINE\n"
 msgstr "+LINE    Mulai pada nomor baris LINE\n"
 
-#: nano.c:443
+#: nano.c:444
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr "GNU nano versi %s (compiled %s, %s)\n"
 
-#: nano.c:446
+#: nano.c:447
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 msgstr " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 
-#: nano.c:447
+#: nano.c:448
 msgid ""
 "\n"
 " Compiled options:"
@@ -696,270 +696,264 @@ msgstr ""
 "\n"
 "Option kompilasi:"
 
-#: nano.c:522
+#: nano.c:526
 msgid "Mark Set"
 msgstr "Set Tanda"
 
-#: nano.c:527
+#: nano.c:531
 msgid "Mark UNset"
 msgstr "Unset Tanda"
 
-#: nano.c:1029
+#: nano.c:1033
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap dipanggil dengan inptr->data=\"%s\"\n"
 
-#: nano.c:1081
+#: nano.c:1085
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data sekarang =\"%s\"\n"
 
-#: nano.c:1133
+#: nano.c:1137
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Setelah, data= \"%s\"\n"
 
-#: nano.c:1234
+#: nano.c:1238
 msgid "Edit a replacement"
 msgstr "Edit pengganti"
 
-#: nano.c:1463
+#: nano.c:1468
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Tidak dapat membuat nama file sementara: %s"
 
-#: nano.c:1469
+#: nano.c:1474
 msgid "Spell checking failed: unable to write temp file!"
 msgstr "Spell checking gagal: tidak dapat menulis file temp!"
 
-#: nano.c:1481
+#: nano.c:1486
 msgid "Finished checking spelling"
 msgstr "Selesai memeriksa ejaan"
 
-#: nano.c:1483
+#: nano.c:1488
 msgid "Spell checking failed"
 msgstr "Spell checking gagal"
 
-#: nano.c:1502
+#: nano.c:1507
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Simpan buffer termodifikasi (JAWAB \"No\" AKAN MENGHAPUS PERUBAHAN) ?"
 
-#: nano.c:1619
+#: nano.c:1624
 msgid "Received SIGHUP"
 msgstr "Menerima SIGHUP"
 
-#: nano.c:1682
+#: nano.c:1687
 msgid "Cannot resize top win"
 msgstr "Tidak dapat menganti ukuran jendela atas"
 
-#: nano.c:1684
+#: nano.c:1689
 msgid "Cannot move top win"
 msgstr "Tidak dapat memindahkan jendela atas"
 
-#: nano.c:1686
+#: nano.c:1691
 msgid "Cannot resize edit win"
 msgstr "Tidak dapat mengganti ukuran jendela edit"
 
-#: nano.c:1688
+#: nano.c:1693
 msgid "Cannot move edit win"
 msgstr "Tidak dapat memindah jendela edit"
 
-#: nano.c:1690
+#: nano.c:1695
 msgid "Cannot resize bottom win"
 msgstr "Tidak dapat mengganti ukuran jendela bawah"
 
-#: nano.c:1692
+#: nano.c:1697
 msgid "Cannot move bottom win"
 msgstr "Tidak dapat memindah jendela bawah"
 
-#: nano.c:2001
+#: nano.c:2006
 msgid "Can now UnJustify!"
 msgstr "Sekarang dapat melakukan UnJustify"
 
-#: nano.c:2099
+#: nano.c:2104
 #, c-format
 msgid "%s enable/disable"
 msgstr "%s enable/disable"
 
-#: nano.c:2114
+#: nano.c:2119
 msgid "enabled"
 msgstr "enabled"
 
-#: nano.c:2115
+#: nano.c:2120
 msgid "disabled"
 msgstr "disabled"
 
-#: nano.c:2168
+#: nano.c:2173
 msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 msgstr ""
 "Glitch pada NumLock terdeteksi. Keypad akan tidak berfungsi dg tombol "
 "NumLock off"
 
-#: nano.c:2396
+#: nano.c:2405
 msgid "Main: set up windows\n"
 msgstr "Main: menset jendela\n"
 
-#: nano.c:2403
+#: nano.c:2416
 msgid "Main: bottom win\n"
 msgstr "Main: jendela bawah\n"
 
-#: nano.c:2409
+#: nano.c:2422
 msgid "Main: open file\n"
 msgstr "Main: membuka file\n"
 
-#: nano.c:2464
+#: nano.c:2478
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "Saya mendapat Alt-O-%c! (%d)\n"
 
-#: nano.c:2491
+#: nano.c:2505
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "Saya mendapat Alt-[-1-%c! (%d)\n"
 
-#: nano.c:2524
+#: nano.c:2538
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "Saya mendapat Alt-[-2-%c! (%d)\n"
 
-#: nano.c:2566
+#: nano.c:2584
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Saya mendapat Alt-%c! (%d)\n"
 
-#: nano.c:2592
+#: nano.c:2610
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Saya mendapat Alt-%c! (%d)\n"
 
-#: search.c:117
+#: search.c:118
 #, c-format
 msgid "Case Sensitive Regexp Search%s%s"
 msgstr "Pencarian case sensitif Regexp %s%s"
 
-#: search.c:119
+#: search.c:120
 #, c-format
 msgid "Regexp Search%s%s"
 msgstr "Pencarian Regexp %s%s"
 
-#: search.c:121
+#: search.c:122
 #, c-format
 msgid "Case Sensitive Search%s%s"
 msgstr "Pencarian secara case sensitif%s%s"
 
-#: search.c:123
+#: search.c:124
 #, c-format
 msgid "Search%s%s"
 msgstr "Pencarian%s%s"
 
-#: search.c:126
+#: search.c:127
 msgid " (to replace)"
 msgstr " (ganti)"
 
-#: search.c:135 search.c:326
+#: search.c:136 search.c:327
 msgid "Search Cancelled"
 msgstr "Pencarian dibatalkan"
 
-#: search.c:199
+#: search.c:200
 #, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s...\" tidak ditemukan"
 
-#: search.c:248
+#: search.c:249
 msgid "Search Wrapped"
 msgstr "Pancarian diulangi dari awal"
 
-#: search.c:348
+#: search.c:349
 #, fuzzy, c-format
 msgid "Replaced %d occurrences"
 msgstr "%d tempat terganti"
 
-#: search.c:350
+#: search.c:351
 #, fuzzy
 msgid "Replaced 1 occurrence"
 msgstr "Terganti 1 tempat"
 
-#: search.c:488 search.c:592 search.c:608
+#: search.c:489 search.c:599 search.c:615
 msgid "Replace Cancelled"
 msgstr "Penggantian dibatalkan"
 
-#: search.c:538
+#: search.c:539
 msgid "Replace this instance?"
 msgstr "Ganti kata ini?"
 
-#: search.c:550
+#: search.c:551
 msgid "Replace failed: unknown subexpression!"
 msgstr "Replace gagal: subekspresi tidak dikenal!"
 
-#: search.c:633
+#: search.c:640
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Ganti dengan [%s]"
 
-#: search.c:637 search.c:641
+#: search.c:644 search.c:648
 msgid "Replace with"
 msgstr "Ganti dengan"
 
-#. Ask for it
-#: search.c:676
+#: search.c:682
 msgid "Enter line number"
 msgstr "Masukkan nomor baris"
 
-#: search.c:678
+#: search.c:684
 msgid "Aborted"
 msgstr "Dibatalkan"
 
-#: search.c:698
+#: search.c:693
 msgid "Come on, be reasonable"
 msgstr "Ayo, yang masuk akal"
 
-#: search.c:703
-#, c-format
-msgid "Only %d lines available, skipping to last line"
-msgstr "Hanya %d baris tersedia, melompat ke baris akhir"
-
-#: winio.c:123
+#: winio.c:124
 #, c-format
 msgid "actual_x_from_start for xplus=%d returned %d\n"
 msgstr "actual_x_from_start untuk xplus=%d mengembalikan %d\n"
 
-#: winio.c:279
+#: winio.c:288
 #, fuzzy, c-format
 msgid "Aha! '%c' (%d)\n"
 msgstr "input '%c' (%d)\n"
 
-#: winio.c:461
+#: winio.c:470
 #, c-format
 msgid "input '%c' (%d)\n"
 msgstr "input '%c' (%d)\n"
 
-#: winio.c:503
+#: winio.c:519
 msgid "New Buffer"
 msgstr "Buffer baru"
 
-#: winio.c:507
+#: winio.c:523
 msgid "  File: ..."
 msgstr " File: ..."
 
-#: winio.c:509
+#: winio.c:525
 msgid "   DIR: ..."
 msgstr " DIR: ..."
 
-#: winio.c:520
+#: winio.c:536
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: winio.c:972
+#: winio.c:1078
 #, c-format
 msgid "Moved to (%d, %d) in edit buffer\n"
 msgstr "Pindah ke (%d, %d) dalam buffer edit\n"
 
-#: winio.c:983
+#: winio.c:1089
 #, c-format
 msgid "current->data = \"%s\"\n"
 msgstr "current->data = \"%s\"\n"
 
-#: winio.c:1028
+#: winio.c:1146
 #, c-format
 msgid "I got \"%s\"\n"
 msgstr "Saya mendapat \"%s\"\n"
@@ -967,84 +961,87 @@ msgstr "Saya mendapat \"%s\"\n"
 #. Yes, no and all are strings of any length.  Each string consists of
 #. all characters accepted as a valid character for that value.
 #. The first value will be the one displayed in the shortcuts.
-#: winio.c:1057
+#: winio.c:1175
 msgid "Yy"
 msgstr "Yy"
 
-#: winio.c:1058
+#: winio.c:1176
 msgid "Nn"
 msgstr "Tt"
 
-#: winio.c:1059
+#: winio.c:1177
 msgid "Aa"
 msgstr "Ss"
 
-#: winio.c:1072
+#: winio.c:1191
 msgid "Yes"
 msgstr "Ya"
 
-#: winio.c:1076
+#: winio.c:1195
 msgid "All"
 msgstr "Semua"
 
-#: winio.c:1081
+#: winio.c:1200
 msgid "No"
 msgstr "Tidak"
 
-#: winio.c:1257
+#: winio.c:1400
 #, c-format
 msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
-#: winio.c:1261
+#: winio.c:1404
 #, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "baris %d dari %d (%f.0f%%), karakter %d dari %d (%.0f%%)"
 
-#: winio.c:1402
+#: winio.c:1545
 msgid "Dumping file buffer to stderr...\n"
 msgstr "Kirim buffer file ke stderr...\n"
 
-#: winio.c:1404
+#: winio.c:1547
 msgid "Dumping cutbuffer to stderr...\n"
 msgstr "Kirim cutbuffer ke stderr...\n"
 
-#: winio.c:1406
+#: winio.c:1549
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Kirim buffer ke stderr...\n"
 
-#: winio.c:1481
+#: winio.c:1624
 msgid "The nano text editor"
 msgstr "Nano teks editor"
 
-#: winio.c:1482
+#: winio.c:1625
 msgid "version "
 msgstr "versi "
 
-#: winio.c:1483
+#: winio.c:1626
 msgid "Brought to you by:"
 msgstr "Dibuat untuk anda oleh:"
 
-#: winio.c:1484
+#: winio.c:1627
 msgid "Special thanks to:"
 msgstr "Ucapan terima kasih khusus kepada:"
 
-#: winio.c:1485
+#: winio.c:1628
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: winio.c:1486
+#: winio.c:1629
 msgid "Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurses"
 msgstr "Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurse"
 
-#: winio.c:1487
+#: winio.c:1630
 msgid "and anyone else we forgot..."
 msgstr "dan orang lain yang kami lupa...."
 
-#: winio.c:1488
+#: winio.c:1631
 msgid "Thank you for using nano!\n"
 msgstr "Terima kasih telah menggunakan nano!\n"
 
+#~ msgid "Only %d lines available, skipping to last line"
+#~ msgstr "Hanya %d baris tersedia, melompat ke baris akhir"
+
 #~ msgid "Could not open file: Path length exceeded."
 #~ msgstr "Tidak dapat membuka file: panjang path terlampaui"
 
diff --git a/po/it.po b/po/it.po
index 954db0ef..f219aed9 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,440 +7,440 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.8.7\n"
-"POT-Creation-Date: 2001-04-18 18:10-0400\n"
+"POT-Creation-Date: 2001-04-30 09:44-0400\n"
 "PO-Revision-Date: 2000-03-03 04:57+0100\n"
 "Last-Translator: Daniele Medri <madrid@linux.it>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: cut.c:44
+#: cut.c:45
 #, c-format
 msgid "add_to_cutbuffer called with inptr->data = %s\n"
 msgstr "add_to_cutbuffer chiamato con inptr->data = %s\n"
 
-#: cut.c:150
+#: cut.c:151
 msgid "Blew away cutbuffer =)\n"
 msgstr ""
 
-#: files.c:123
+#: files.c:124
 msgid "read_line: not on first line and prev is NULL"
 msgstr "read_line: no estamos en la primera línea y la anterior es NULL"
 
-#: files.c:185 files.c:203
+#: files.c:186 files.c:204
 #, c-format
 msgid "Read %d lines"
 msgstr "Leggi %d linee"
 
-#: files.c:221 search.c:193
+#: files.c:222 search.c:194
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" non trovato"
 
 #. We have a new file
-#: files.c:225
+#: files.c:226
 msgid "New File"
 msgstr "Nuovo file"
 
-#: files.c:238
+#: files.c:239
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr "Il file \"%s\" è una directory"
 
 #. Don't open character or block files.  Sorry, /dev/sndstat!
-#: files.c:241
+#: files.c:242
 #, fuzzy, c-format
 msgid "File \"%s\" is a device file"
 msgstr "Il file \"%s\" è una directory"
 
-#: files.c:248
+#: files.c:249
 msgid "Reading File"
 msgstr "Lettura file"
 
-#: files.c:264
+#: files.c:265
 msgid "File to insert [from ./] "
 msgstr "File da inserire [da ./] "
 
-#: files.c:313 files.c:338 files.c:574 nano.c:1515
+#: files.c:314 files.c:339 files.c:575 nano.c:1520
 msgid "Cancelled"
 msgstr "Cancellato"
 
-#: files.c:384 files.c:400 files.c:414 files.c:431 files.c:437
+#: files.c:385 files.c:401 files.c:415 files.c:432 files.c:438
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Impossibile aprire il file in scrittura: %s"
 
-#: files.c:419
+#: files.c:420
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Scrivi >%s\n"
 
-#: files.c:446
+#: files.c:447
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Impossibile chiudere %s: %s"
 
 #. Try a rename??
-#: files.c:469 files.c:478 files.c:483
+#: files.c:470 files.c:479 files.c:484
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Impossibile aprire %s in scrittura: %s"
 
-#: files.c:490
+#: files.c:491
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Impossibile configurare i permessi di %o su %s: %s"
 
-#: files.c:495
+#: files.c:496
 #, c-format
 msgid "Wrote %d lines"
 msgstr "Scritte %d linee"
 
-#: files.c:530
+#: files.c:531
 msgid "File Name to write"
 msgstr "Salva con nome"
 
-#: files.c:549
+#: files.c:550
 #, c-format
 msgid "filename is %s"
 msgstr "Il nome file è %s"
 
-#: files.c:563
+#: files.c:564
 msgid "File exists, OVERWRITE ?"
 msgstr "File esistente, SOVRASCRIVERE?"
 
-#: files.c:985
+#: files.c:986
 msgid "(more)"
 msgstr ""
 
-#: files.c:1256
+#: files.c:1257
 msgid "Can't move up a directory"
 msgstr ""
 
 #. We can't open this dir for some reason.  Complain
-#: files.c:1266 files.c:1314
+#: files.c:1267 files.c:1315
 #, fuzzy, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "Impossibile chiudere %s: %s"
 
-#: files.c:1294 global.c:227
+#: files.c:1295 global.c:232
 #, fuzzy
 msgid "Goto Directory"
 msgstr "Vai alla linea"
 
-#: files.c:1299
+#: files.c:1300
 #, fuzzy
 msgid "Goto Cancelled"
 msgstr "Cancellato"
 
-#: global.c:139
+#: global.c:144
 #, fuzzy
 msgid "Constant cursor position"
 msgstr " -c \t\tMostra sempre la posizione del cursore\n"
 
-#: global.c:140
+#: global.c:145
 #, fuzzy
 msgid "Auto indent"
 msgstr "Vai alla linea"
 
-#: global.c:141
+#: global.c:146
 #, fuzzy
 msgid "Suspend"
 msgstr "Sospendi"
 
-#: global.c:142
+#: global.c:147
 msgid "Help mode"
 msgstr ""
 
-#: global.c:143
+#: global.c:148
 msgid "Pico mode"
 msgstr ""
 
-#: global.c:144
+#: global.c:149
 msgid "Mouse support"
 msgstr ""
 
-#: global.c:145
+#: global.c:150
 msgid "Cut to end"
 msgstr ""
 
-#: global.c:147
+#: global.c:152
 msgid "Regular expressions"
 msgstr ""
 
-#: global.c:149
+#: global.c:154
 msgid "Auto wrap"
 msgstr ""
 
-#: global.c:194
+#: global.c:199
 msgid "Invoke the help menu"
 msgstr "Invoca menu aiuti"
 
-#: global.c:195
+#: global.c:200
 msgid "Write the current file to disk"
 msgstr "Salva il file corrente sul disco"
 
-#: global.c:196
+#: global.c:201
 msgid "Exit from nano"
 msgstr "Esci da nano"
 
-#: global.c:197
+#: global.c:202
 msgid "Goto a specific line number"
 msgstr "Vai ad un numero linea specifico"
 
-#: global.c:198
+#: global.c:203
 msgid "Justify the current paragraph"
 msgstr "Giustifica il paragrafo corrente"
 
-#: global.c:199
+#: global.c:204
 msgid "Unjustify after a justify"
 msgstr ""
 
-#: global.c:200
+#: global.c:205
 msgid "Replace text within the editor"
 msgstr "Sostituisci testo senza editor"
 
-#: global.c:201
+#: global.c:206
 msgid "Insert another file into the current one"
 msgstr "Inserisci un file dentro il corrente"
 
-#: global.c:202
+#: global.c:207
 msgid "Search for text within the editor"
 msgstr "Cerca testo senza editor"
 
-#: global.c:203
+#: global.c:208
 msgid "Move to the previous screen"
 msgstr "Vai alla schermata precedente"
 
-#: global.c:204
+#: global.c:209
 msgid "Move to the next screen"
 msgstr "Vai alla schermata successiva"
 
-#: global.c:205
+#: global.c:210
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Taglia la linea corrente e memorizzala nel cutbuffer"
 
-#: global.c:206
+#: global.c:211
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Uncut dal cutbuffer dentro la linea corrente"
 
-#: global.c:207
+#: global.c:212
 msgid "Show the posititon of the cursor"
 msgstr "Mostra la posizione del cursore"
 
-#: global.c:208
+#: global.c:213
 msgid "Invoke the spell checker (if available)"
 msgstr "Invocar el corrector ortográfico (si está disponible)"
 
-#: global.c:209
+#: global.c:214
 msgid "Move up one line"
 msgstr "Sposta in alto una linea"
 
-#: global.c:210
+#: global.c:215
 msgid "Move down one line"
 msgstr "Sposta in basso una linea"
 
-#: global.c:211
+#: global.c:216
 msgid "Move forward one character"
 msgstr "Sposta avanti un carattere"
 
-#: global.c:212
+#: global.c:217
 msgid "Move back one character"
 msgstr "Sposta indietro un carattere"
 
-#: global.c:213
+#: global.c:218
 msgid "Move to the beginning of the current line"
 msgstr "Sposta all'inizio della linea corrente"
 
-#: global.c:214
+#: global.c:219
 msgid "Move to the end of the current line"
 msgstr "Sposta alla fine delle linea corrente"
 
-#: global.c:215
+#: global.c:220
 msgid "Go to the first line of the file"
 msgstr "Vai alla prima linea del file"
 
-#: global.c:216
+#: global.c:221
 msgid "Go to the last line of the file"
 msgstr "Vai all'ultima linea del file"
 
-#: global.c:217
+#: global.c:222
 msgid "Refresh (redraw) the current screen"
 msgstr "Aggiorna la schermata corrente"
 
-#: global.c:218
+#: global.c:223
 msgid "Mark text at the current cursor location"
 msgstr "Marca testo nella posizione corrente del cursore"
 
-#: global.c:219
+#: global.c:224
 msgid "Delete the character under the cursor"
 msgstr "Elimina i caratteri sotto il cursore"
 
-#: global.c:221
+#: global.c:226
 msgid "Delete the character to the left of the cursor"
 msgstr "Elimina i caratteri a sinistra del cursore"
 
-#: global.c:222
+#: global.c:227
 msgid "Insert a tab character"
 msgstr "Inserisci un carattere tab"
 
-#: global.c:223
+#: global.c:228
 msgid "Insert a carriage return at the cursor position"
 msgstr "Inserisci un ritorno a capo alla posizione del cursore"
 
-#: global.c:225
+#: global.c:230
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Ricerca/Sostituisci con case (in)sensitive"
 
-#: global.c:226
+#: global.c:231
 msgid "Go to file browser"
 msgstr ""
 
-#: global.c:228
+#: global.c:233
 msgid "Cancel the current function"
 msgstr "Cancella la funzione corrente"
 
-#: global.c:231
+#: global.c:236
 msgid "Get Help"
 msgstr "Aiuto"
 
-#: global.c:234 global.c:415 global.c:442
+#: global.c:239 global.c:420 global.c:447
 msgid "Exit"
 msgstr "Esci"
 
-#: global.c:237
+#: global.c:242
 msgid "WriteOut"
 msgstr "Sovrascrivi"
 
-#: global.c:242 global.c:331
+#: global.c:247 global.c:336
 msgid "Justify"
 msgstr "Giustifica"
 
-#: global.c:246 global.c:252
+#: global.c:251 global.c:257
 msgid "Read File"
 msgstr "Leggi file"
 
-#: global.c:256 global.c:327 global.c:355
+#: global.c:261 global.c:332 global.c:360
 msgid "Replace"
 msgstr "Sostituisci"
 
-#: global.c:260
+#: global.c:265
 msgid "Where Is"
 msgstr "Dov'è"
 
-#: global.c:264 global.c:407 global.c:431
+#: global.c:269 global.c:412 global.c:436
 msgid "Prev Page"
 msgstr "Pag Prec"
 
-#: global.c:268 global.c:411 global.c:435
+#: global.c:273 global.c:416 global.c:440
 msgid "Next Page"
 msgstr "Pag Seg"
 
-#: global.c:272
+#: global.c:277
 msgid "Cut Text"
 msgstr "Taglia"
 
-#: global.c:276
+#: global.c:281
 #, fuzzy
 msgid "UnJustify"
 msgstr "Giustifica"
 
-#: global.c:279
+#: global.c:284
 msgid "UnCut Txt"
 msgstr "UnCut Txt"
 
-#: global.c:283
+#: global.c:288
 msgid "Cur Pos"
 msgstr "Posizione"
 
-#: global.c:287
+#: global.c:292
 msgid "To Spell"
 msgstr "Ortografia"
 
-#: global.c:291
+#: global.c:296
 msgid "Up"
 msgstr "Alza"
 
-#: global.c:294
+#: global.c:299
 msgid "Down"
 msgstr "Abbassa"
 
-#: global.c:297
+#: global.c:302
 msgid "Forward"
 msgstr "Avanti"
 
-#: global.c:300
+#: global.c:305
 msgid "Back"
 msgstr "Indietro"
 
-#: global.c:303
+#: global.c:308
 msgid "Home"
 msgstr "Inizio"
 
-#: global.c:306
+#: global.c:311
 msgid "End"
 msgstr "Fine"
 
-#: global.c:309
+#: global.c:314
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: global.c:312
+#: global.c:317
 msgid "Mark Text"
 msgstr "Marca testo"
 
-#: global.c:315
+#: global.c:320
 msgid "Delete"
 msgstr "Elimina"
 
-#: global.c:319
+#: global.c:324
 msgid "Backspace"
 msgstr "Backspace"
 
-#: global.c:323
+#: global.c:328
 msgid "Tab"
 msgstr "Tab"
 
-#: global.c:335
+#: global.c:340
 msgid "Enter"
 msgstr "Invio"
 
-#: global.c:339 global.c:359 global.c:379
+#: global.c:344 global.c:364 global.c:384
 msgid "Goto Line"
 msgstr "Vai alla linea"
 
-#: global.c:345 global.c:366 global.c:387 global.c:397
+#: global.c:350 global.c:371 global.c:392 global.c:402
 msgid "First Line"
 msgstr "Prima linea"
 
-#: global.c:348 global.c:369 global.c:390 global.c:400
+#: global.c:353 global.c:374 global.c:395 global.c:405
 msgid "Last Line"
 msgstr "Ultima linea"
 
-#: global.c:351 global.c:372
+#: global.c:356 global.c:377
 msgid "Case Sens"
 msgstr "Case sens"
 
-#: global.c:362 global.c:382 global.c:393 global.c:403 global.c:424
-#: global.c:427 global.c:445 winio.c:1083
+#: global.c:367 global.c:387 global.c:398 global.c:408 global.c:429
+#: global.c:432 global.c:450 winio.c:1202
 msgid "Cancel"
 msgstr "Cancella"
 
-#: global.c:375
+#: global.c:380
 msgid "No Replace"
 msgstr ""
 
-#: global.c:420
+#: global.c:425
 #, fuzzy
 msgid "To Files"
 msgstr "Nuovo file"
 
-#: global.c:439
+#: global.c:444
 #, fuzzy
 msgid "Goto"
 msgstr "Vai alla linea"
 
-#: nano.c:136
+#: nano.c:137
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -449,22 +449,22 @@ msgstr ""
 "\n"
 "Buffer scritto su 'nano.save'\n"
 
-#: nano.c:138
+#: nano.c:139
 #, c-format
 msgid ""
 "\n"
 "No %s written (file exists?)\n"
 msgstr ""
 
-#: nano.c:147
+#: nano.c:148
 msgid "Window size is too small for Nano..."
 msgstr ""
 
-#: nano.c:155
+#: nano.c:156
 msgid "Key illegal in VIEW mode"
 msgstr "Chiave illegale nella modalità VISTA"
 
-#: nano.c:199
+#: nano.c:200
 msgid ""
 " nano help text\n"
 "\n"
@@ -477,25 +477,25 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
-"key sequences are notated with the Meta (M) symbol and can be entered using "
-"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
+"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
+"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
 msgstr ""
 
-#: nano.c:293
+#: nano.c:294
 #, fuzzy
 msgid "delete_node(): free'd a node, YAY!\n"
 msgstr "free_node(): liberado un nodo, YEAH!\n"
 
-#: nano.c:298
+#: nano.c:299
 #, fuzzy
 msgid "delete_node(): free'd last node.\n"
 msgstr "free_node(): liberado el último nodo.\n"
 
-#: nano.c:353
+#: nano.c:354
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
@@ -503,85 +503,85 @@ msgstr ""
 "Utilizzo: nano [GNU opzioni lunghe] [opzioni] +LINEA <file>\n"
 "\n"
 
-#: nano.c:354
+#: nano.c:355
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Opzioni\t\tLunghe opzioni\t\tSignificato\n"
 
-#: nano.c:356
+#: nano.c:357
 msgid " -T [num]\t--tabsize=[num]\t\tSet width of a tab to num\n"
 msgstr ""
 
-#: nano.c:359
+#: nano.c:360
 msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
 msgstr ""
 
-#: nano.c:363
+#: nano.c:364
 msgid " -V \t\t--version\t\tPrint version information and exit\n"
 msgstr " -V \t\t--versione\t\tStampa informazioni sulla versione ed esci\n"
 
-#: nano.c:365
+#: nano.c:366
 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
 msgstr " -c \t\t--const\t\t\tMostra sempre la posizione del cursore\n"
 
-#: nano.c:367
+#: nano.c:368
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr " -h \t\t--help\t\t\tMostra questo messaggio\n"
 
-#: nano.c:369
+#: nano.c:370
 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
 msgstr " -i \t\t--autoindent\t\tIndentar automáticamente nuevas líneas\n"
 
-#: nano.c:372
+#: nano.c:373
 msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
 msgstr ""
 
-#: nano.c:375
+#: nano.c:376
 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite\n"
 msgstr ""
 
-#: nano.c:378
+#: nano.c:379
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr " -m \t\t--mouse\t\t\tAttiva mouse\n"
 
-#: nano.c:382
+#: nano.c:383
 msgid " -p\t \t--pico\t\t\tEmulate Pico as closely as possible\n"
 msgstr ""
 
-#: nano.c:385
+#: nano.c:386
 msgid ""
 " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
 msgstr " -r [#cols] \t--fill=[#cols]\t\tConfigura riempimento colonne\n"
 
-#: nano.c:388
+#: nano.c:389
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr " -s [prog] \t--speller=[prog]\tAttiva correttore alternativo\n"
 
-#: nano.c:391
+#: nano.c:392
 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
 msgstr ""
 " -t \t\t--tempfile\t\tSalvataggio automatico in uscita senza richiesta\n"
 
-#: nano.c:393
+#: nano.c:394
 msgid " -v \t\t--view\t\t\tView (read only) mode\n"
 msgstr " -v \t\t--view\t\t\tVisualizzazione (sola lettura)\n"
 
-#: nano.c:396
+#: nano.c:397
 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
 msgstr " -w \t\t--nowrap\t\tNon interrompere linee lunghe\n"
 
-#: nano.c:399
+#: nano.c:400
 msgid " -x \t\t--nohelp\t\tDon't show help window\n"
 msgstr " -x \t\t--nohelp\t\tNon mostrare finestra aiuti\n"
 
-#: nano.c:401
+#: nano.c:402
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr " -z \t\t--suspend\t\tAbilita sospensione\n"
 
-#: nano.c:403
+#: nano.c:404
 msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
 msgstr " +LINE\t\t\t\t\tInizia alla linea numero\n"
 
-#: nano.c:405
+#: nano.c:406
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
@@ -589,364 +589,358 @@ msgstr ""
 "Uso: nano [opzioni] +LINEA <file>\n"
 "\n"
 
-#: nano.c:406
+#: nano.c:407
 msgid "Option\t\tMeaning\n"
 msgstr "Opzioni\t\tSignificato\n"
 
-#: nano.c:407
+#: nano.c:408
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr ""
 
-#: nano.c:408
+#: nano.c:409
 msgid " -R\t\tUse regular expressions for search\n"
 msgstr ""
 
-#: nano.c:409
+#: nano.c:410
 msgid " -V \t\tPrint version information and exit\n"
 msgstr " -V \t\tStampa informazioni sulla versione ed esci\n"
 
-#: nano.c:410
+#: nano.c:411
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr " -c \t\tMostra sempre la posizione del cursore\n"
 
-#: nano.c:411
+#: nano.c:412
 msgid " -h \t\tShow this message\n"
 msgstr " -h \t\tMostra questo messaggio\n"
 
-#: nano.c:412
+#: nano.c:413
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr " -v \t\tIndentazione automatica nuove linee\n"
 
-#: nano.c:414
+#: nano.c:415
 msgid " -k \t\tLet ^K cut from cursor to end of line\n"
 msgstr ""
 
-#: nano.c:417
+#: nano.c:418
 msgid " -l \t\tDon't follow symbolic links, overwrite\n"
 msgstr " -l \t\tNon seguire i link simbolici, sovrascrivi\n"
 
-#: nano.c:420
+#: nano.c:421
 msgid " -m \t\tEnable mouse\n"
 msgstr " -m \t\tAttiva mouse\n"
 
-#: nano.c:423
+#: nano.c:424
 msgid " -p \t\tEmulate Pico as closely as possible\n"
 msgstr ""
 
-#: nano.c:425
+#: nano.c:426
 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
 msgstr " -r [#cols] \tRiempimento colonne (interrompi linee a) #cols\n"
 
-#: nano.c:427
+#: nano.c:428
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr " -s [prog] \tAttiva correttore alternativo\n"
 
-#: nano.c:429
+#: nano.c:430
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\tSalvataggio automatico in uscita senza avviso\n"
 
-#: nano.c:430
+#: nano.c:431
 msgid " -v \t\tView (read only) mode\n"
 msgstr " -v \t\tVisualizza (sola lettura)\n"
 
-#: nano.c:432
+#: nano.c:433
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr " -w \t\tNon interrompere linee lunghe\n"
 
-#: nano.c:434
+#: nano.c:435
 msgid " -x \t\tDon't show help window\n"
 msgstr " -x \t\tNon mostrare la finestra Aiuti\n"
 
-#: nano.c:435
+#: nano.c:436
 msgid " -z \t\tEnable suspend\n"
 msgstr " -z \t\tAttiva sospensione\n"
 
-#: nano.c:436
+#: nano.c:437
 msgid " +LINE\t\tStart at line number LINE\n"
 msgstr " +LINEA\t\tInizia alla LINEA numero\n"
 
-#: nano.c:443
+#: nano.c:444
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano versione %s (compilato %s, %s\n"
 
-#: nano.c:446
+#: nano.c:447
 #, fuzzy
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 msgstr "Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org\n"
 
-#: nano.c:447
+#: nano.c:448
 msgid ""
 "\n"
 " Compiled options:"
 msgstr ""
 
-#: nano.c:522
+#: nano.c:526
 msgid "Mark Set"
 msgstr ""
 
-#: nano.c:527
+#: nano.c:531
 msgid "Mark UNset"
 msgstr ""
 
-#: nano.c:1029
+#: nano.c:1033
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap chiamata con inptr->data=\"%s\"\n"
 
-#: nano.c:1081
+#: nano.c:1085
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data ora = \"%d\"\n"
 
-#: nano.c:1133
+#: nano.c:1137
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Dopo, data = \"%s\"\n"
 
-#: nano.c:1234
+#: nano.c:1238
 msgid "Edit a replacement"
 msgstr ""
 
-#: nano.c:1463
+#: nano.c:1468
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Impossibile creare un nome file temporaneo: %s"
 
-#: nano.c:1469
+#: nano.c:1474
 msgid "Spell checking failed: unable to write temp file!"
 msgstr ""
 
-#: nano.c:1481
+#: nano.c:1486
 msgid "Finished checking spelling"
 msgstr "Controllo ortografico terminato"
 
-#: nano.c:1483
+#: nano.c:1488
 msgid "Spell checking failed"
 msgstr ""
 
-#: nano.c:1502
+#: nano.c:1507
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Salva il buffer modificato (RISPONDENDO \"No\" ANNULLERETE I CAMBIAMENTI "
 "AVVENUTI) ?"
 
-#: nano.c:1619
+#: nano.c:1624
 msgid "Received SIGHUP"
 msgstr ""
 
-#: nano.c:1682
+#: nano.c:1687
 msgid "Cannot resize top win"
 msgstr "Impossibile ridimensionare la finestra superiore"
 
-#: nano.c:1684
+#: nano.c:1689
 msgid "Cannot move top win"
 msgstr "Impossibile spostare la finestra superiore"
 
-#: nano.c:1686
+#: nano.c:1691
 msgid "Cannot resize edit win"
 msgstr "Impossibile ridimensionare la finestra di modifica"
 
-#: nano.c:1688
+#: nano.c:1693
 msgid "Cannot move edit win"
 msgstr "Impossibile spostare finestra di modifica"
 
-#: nano.c:1690
+#: nano.c:1695
 msgid "Cannot resize bottom win"
 msgstr "Impossibile ridimensionare la finestra inferiore"
 
-#: nano.c:1692
+#: nano.c:1697
 msgid "Cannot move bottom win"
 msgstr "Impossibile spostare la finestra inferiore"
 
-#: nano.c:2001
+#: nano.c:2006
 msgid "Can now UnJustify!"
 msgstr ""
 
-#: nano.c:2099
+#: nano.c:2104
 #, c-format
 msgid "%s enable/disable"
 msgstr ""
 
-#: nano.c:2114
+#: nano.c:2119
 msgid "enabled"
 msgstr ""
 
-#: nano.c:2115
+#: nano.c:2120
 msgid "disabled"
 msgstr ""
 
-#: nano.c:2168
+#: nano.c:2173
 msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 msgstr ""
 
-#: nano.c:2396
+#: nano.c:2405
 msgid "Main: set up windows\n"
 msgstr "Main: configura finestre\n"
 
-#: nano.c:2403
+#: nano.c:2416
 msgid "Main: bottom win\n"
 msgstr "Main: finestra inferiore\n"
 
-#: nano.c:2409
+#: nano.c:2422
 msgid "Main: open file\n"
 msgstr "Main: apri file\n"
 
-#: nano.c:2464
+#: nano.c:2478
 #, fuzzy, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "Premuto Alt-[-%c! (%d)\n"
 
-#: nano.c:2491
+#: nano.c:2505
 #, fuzzy, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "Premuto Alt-[-%c! (%d)\n"
 
-#: nano.c:2524
+#: nano.c:2538
 #, fuzzy, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "Premuto Alt-[-%c! (%d)\n"
 
-#: nano.c:2566
+#: nano.c:2584
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Premuto Alt-[-%c! (%d)\n"
 
-#: nano.c:2592
+#: nano.c:2610
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Premuto Alt-%c! (%d)\n"
 
-#: search.c:117
+#: search.c:118
 #, fuzzy, c-format
 msgid "Case Sensitive Regexp Search%s%s"
 msgstr "Ricerca case sensitive%s%s"
 
-#: search.c:119
+#: search.c:120
 #, fuzzy, c-format
 msgid "Regexp Search%s%s"
 msgstr "Ricerca%s%s"
 
-#: search.c:121
+#: search.c:122
 #, fuzzy, c-format
 msgid "Case Sensitive Search%s%s"
 msgstr "Ricerca case sensitive%s%s"
 
-#: search.c:123
+#: search.c:124
 #, fuzzy, c-format
 msgid "Search%s%s"
 msgstr "Ricerca%s%s"
 
-#: search.c:126
+#: search.c:127
 #, fuzzy
 msgid " (to replace)"
 msgstr " (sostituisci)"
 
-#: search.c:135 search.c:326
+#: search.c:136 search.c:327
 msgid "Search Cancelled"
 msgstr "Ricerca annullata"
 
-#: search.c:199
+#: search.c:200
 #, fuzzy, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s\" non trovato"
 
-#: search.c:248
+#: search.c:249
 msgid "Search Wrapped"
 msgstr "Ricerca interrotta"
 
-#: search.c:348
+#: search.c:349
 #, fuzzy, c-format
 msgid "Replaced %d occurrences"
 msgstr "Sostituite %d occorrenze"
 
-#: search.c:350
+#: search.c:351
 #, fuzzy
 msgid "Replaced 1 occurrence"
 msgstr "Sostituita 1 occorrenza"
 
-#: search.c:488 search.c:592 search.c:608
+#: search.c:489 search.c:599 search.c:615
 msgid "Replace Cancelled"
 msgstr "Sostituzione annullata"
 
-#: search.c:538
+#: search.c:539
 msgid "Replace this instance?"
 msgstr "Sostituisci questa istanza?"
 
-#: search.c:550
+#: search.c:551
 msgid "Replace failed: unknown subexpression!"
 msgstr ""
 
-#: search.c:633
+#: search.c:640
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Sostituisci con [%s]"
 
-#: search.c:637 search.c:641
+#: search.c:644 search.c:648
 msgid "Replace with"
 msgstr "Sostituisci con"
 
-#. Ask for it
-#: search.c:676
+#: search.c:682
 msgid "Enter line number"
 msgstr "Inserire numero linea"
 
-#: search.c:678
+#: search.c:684
 msgid "Aborted"
 msgstr "Operazione fallita"
 
-#: search.c:698
+#: search.c:693
 msgid "Come on, be reasonable"
 msgstr "Avanti, sii ragionevole"
 
-#: search.c:703
-#, c-format
-msgid "Only %d lines available, skipping to last line"
-msgstr "Solo %d linee disponibili, vai all'ultima"
-
-#: winio.c:123
+#: winio.c:124
 #, fuzzy, c-format
 msgid "actual_x_from_start for xplus=%d returned %d\n"
 msgstr "actual_x per xplus=%d ha riportato %d\n"
 
-#: winio.c:279
+#: winio.c:288
 #, fuzzy, c-format
 msgid "Aha! '%c' (%d)\n"
 msgstr "input '%c' (%d)\n"
 
-#: winio.c:461
+#: winio.c:470
 #, c-format
 msgid "input '%c' (%d)\n"
 msgstr "input '%c' (%d)\n"
 
-#: winio.c:503
+#: winio.c:519
 msgid "New Buffer"
 msgstr "Nuovo Buffer"
 
-#: winio.c:507
+#: winio.c:523
 msgid "  File: ..."
 msgstr "File: ..."
 
-#: winio.c:509
+#: winio.c:525
 #, fuzzy
 msgid "   DIR: ..."
 msgstr "File: ..."
 
-#: winio.c:520
+#: winio.c:536
 msgid "Modified"
 msgstr "Modificato"
 
-#: winio.c:972
+#: winio.c:1078
 #, c-format
 msgid "Moved to (%d, %d) in edit buffer\n"
 msgstr "Mosso in (%d, %d) nel buffer di modifica\n"
 
-#: winio.c:983
+#: winio.c:1089
 #, c-format
 msgid "current->data = \"%s\"\n"
 msgstr "current->data = \"%s\"\n"
 
-#: winio.c:1028
+#: winio.c:1146
 #, c-format
 msgid "I got \"%s\"\n"
 msgstr "Premuto \"%s\"\n"
@@ -954,84 +948,87 @@ msgstr "Premuto \"%s\"\n"
 #. Yes, no and all are strings of any length.  Each string consists of
 #. all characters accepted as a valid character for that value.
 #. The first value will be the one displayed in the shortcuts.
-#: winio.c:1057
+#: winio.c:1175
 msgid "Yy"
 msgstr "Ss"
 
-#: winio.c:1058
+#: winio.c:1176
 msgid "Nn"
 msgstr "Nn"
 
-#: winio.c:1059
+#: winio.c:1177
 msgid "Aa"
 msgstr "Tt"
 
-#: winio.c:1072
+#: winio.c:1191
 msgid "Yes"
 msgstr " Sì"
 
-#: winio.c:1076
+#: winio.c:1195
 msgid "All"
 msgstr " Tutti"
 
-#: winio.c:1081
+#: winio.c:1200
 msgid "No"
 msgstr " No"
 
-#: winio.c:1257
+#: winio.c:1400
 #, c-format
 msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
-#: winio.c:1261
+#: winio.c:1404
 #, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "linea %d di %d (%.0f%%), carattere %d di %d (%.0f%%)"
 
-#: winio.c:1402
+#: winio.c:1545
 msgid "Dumping file buffer to stderr...\n"
 msgstr "Copia file buffer sullo stderr...\n"
 
-#: winio.c:1404
+#: winio.c:1547
 msgid "Dumping cutbuffer to stderr...\n"
 msgstr "Copia cutbuffer sullo stderr...\n"
 
-#: winio.c:1406
+#: winio.c:1549
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Copia un buffer sullo stderr...\n"
 
-#: winio.c:1481
+#: winio.c:1624
 msgid "The nano text editor"
 msgstr ""
 
-#: winio.c:1482
+#: winio.c:1625
 msgid "version "
 msgstr ""
 
-#: winio.c:1483
+#: winio.c:1626
 msgid "Brought to you by:"
 msgstr ""
 
-#: winio.c:1484
+#: winio.c:1627
 msgid "Special thanks to:"
 msgstr ""
 
-#: winio.c:1485
+#: winio.c:1628
 msgid "The Free Software Foundation"
 msgstr ""
 
-#: winio.c:1486
+#: winio.c:1629
 msgid "Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurses"
 msgstr ""
 
-#: winio.c:1487
+#: winio.c:1630
 msgid "and anyone else we forgot..."
 msgstr ""
 
-#: winio.c:1488
+#: winio.c:1631
 msgid "Thank you for using nano!\n"
 msgstr ""
 
+#~ msgid "Only %d lines available, skipping to last line"
+#~ msgstr "Solo %d linee disponibili, vai all'ultima"
+
 #~ msgid "Could not open file: Path length exceeded."
 #~ msgstr "Impossibile aprire il file: esagerata lunghezza del percorso."