Updated FAQ, updated Spanish and Catalan, added utils.c to translations and

little typo fixes here and there. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@633 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2001-05-02 17:18:17 +00:00 · 2001-05-02 17:18:17 +00:00 · 725490495c
parent 09898d99d4
commit 725490495c
18 changed files with 1143 additions and 1150 deletions
--- a/16
+++ b/16
@ -23,8 +23,10 @@ Cvs code -
 	- New option, --enable-nanorc which allows people to have a .nanorc
 	  initialization file and set options normally used on the command
 	  line, and color later on.
-	- Added --enable-color option to allow color and syntax hilighting
+	- Added --enable-color option to allow color and syntax highlighting
 	  (stub as of now).
+- faq.html:
+	- Brought the FAQ up to date, many little changes (Jordi).
 - files.c:
  do_browser()
 	- Minor fixes to the processing of SELECT function (Rocco)
@ -57,6 +59,10 @@ Cvs code -
 - winio.c:
  actual_x()
 	- Remove inline from function decl (Albert Chin).
+- po/POTFILES.in:
+	- Added utils.c to the list.
+- po/es.po, po/ca.po:
+	- Updated (Jordi).
 - po/gl.po:
 	- New Galician translation by Jacobo Tarrío <jtarrio@trasno.net>,
 	  thanks! 
@ -493,11 +499,11 @@ nano 0.9.22 - 12/02/2000
  handle_sighup()
 	- Now calls die instead of writing on its own and exiting normally.
 - search.c:
-  do_replace_hilight()
-	- New function, displays the currently selected word as hilighted
+  do_replace_highlight()
+	- New function, displays the currently selected word as highlighted
 	  in the spell check.  Called from do_replace_loop (Rocco Corsi).
-	- Added calls to curs_set(0) and (1) to diable the cursor when
-	  hilighting, looks much better.
+	- Added calls to curs_set(0) and (1) to disable the cursor when
+	  highlighting, looks much better.
 - es.po: 
 	- Traditional Spanish strings updates.

--- 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@
-GT_NO = @GT_NO@
-GT_YES = @GT_YES@
-INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
-INSTOBJEXT = @INSTOBJEXT@
-INTLDEPS = @INTLDEPS@
+INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+LIBICONV = @LIBICONV@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@
@ -84,7 +84,6 @@ 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 
--- a/aclocal.m4
+++ b/aclocal.m4
@ -125,6 +125,24 @@ 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

@ -330,9 +348,37 @@ main ()
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.

-# serial 5
+# serial 9

-AC_DEFUN(AM_WITH_NLS,
+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],
  [AC_MSG_CHECKING([whether NLS is requested])
    dnl Default is enabled NLS
    AC_ARG_ENABLE(nls,
@ -341,11 +387,14 @@ 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)
+      AC_DEFINE(ENABLE_NLS, 1,
+        [Define to 1 if translation of program messages to the user's native language
+   is requested.])
      AC_MSG_CHECKING([whether included gettext is requested])
      AC_ARG_WITH(included-gettext,
        [  --with-included-gettext use the GNU gettext library included here],
@ -356,86 +405,58 @@ 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 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=
+        dnl to use.  If GNU gettext is available we use this.  Else we have
+        dnl to fall back to GNU NLS library.
 	CATOBJEXT=NONE

-	AC_CHECK_HEADER(libintl.h,
-	  [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)])
+        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])

-	   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)])
+	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"])
 	   fi

-	   if test "$gt_cv_func_gettext_libc" = "yes" \
-	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
-	      AC_DEFINE(HAVE_GETTEXT)
+	   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_CHECK_FUNCS(dcgettext)
 	       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)'`"], :)
-		AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-			       return _nl_msg_cat_cntr],
-		  [CATOBJEXT=.gmo
-		   DATADIRNAME=share],
-		  [CATOBJEXT=.mo
-		   DATADIRNAME=lib])
-		INSTOBJEXT=.mo
+	     CATOBJEXT=.gmo
+	     if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+	       INTLLIBS="-lintl"
 	     fi
 	   fi
 	])

        if test "$CATOBJEXT" = "NONE"; then
-	  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 GNU gettext is not found in the C library.
 	  dnl Fall back on GNU gettext library.
 	  nls_cv_use_gnu_gettext=yes
        fi
@ -450,15 +471,17 @@ AC_DEFUN(AM_WITH_NLS,
        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
-        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
+	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"
      fi

      dnl Test whether we really found GNU xgettext.
@ -474,25 +497,51 @@ AC_DEFUN(AM_WITH_NLS,
 	fi
      fi

-      # We need to process the po/ directory.
+      dnl 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*)
+     [case " "$CONFIG_FILES" " in *" po/Makefile.in "* | *" po/Makefile.in:"*)
        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+        ;;
      esac])


-    # 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.
+    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 test "$PACKAGE" = gettext; then
-      USE_NLS=yes
-      USE_INCLUDED_LIBINTL=yes
+      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=:
    fi

    dnl These rules are solely for the distribution goal.  While doing this
@ -504,22 +553,30 @@ AC_DEFUN(AM_WITH_NLS,
    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)
  ])

-AC_DEFUN(AM_GNU_GETTEXT,
+dnl Usage: Just like AM_WITH_NLS, which see.
+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
@ -530,20 +587,16 @@ 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 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
+   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])

+   AM_ICONV
+   AM_LANGINFO_CODESET
   AM_LC_MESSAGES
-   AM_WITH_NLS
+   AM_WITH_NLS([$1],[$2],[$3])

   if test "x$CATOBJEXT" != "x"; then
     if test "x$ALL_LINGUAS" = "x"; then
@ -551,11 +604,22 @@ strdup __argz_count __argz_stringify __argz_next])
     else
       AC_MSG_CHECKING(for catalogs to be installed)
       NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-         case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
+       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
+       done
       LINGUAS=$NEW_LINGUAS
       AC_MSG_RESULT($LINGUAS)
     fi
@ -566,47 +630,8 @@ strdup __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
@ -617,12 +642,14 @@ strdup __argz_count __argz_stringify __argz_next])
   fi
   AC_SUBST(MKINSTALLDIRS)

-   dnl *** For now the libtool support in intl/Makefile is not for real.
-   l=
-   AC_SUBST(l)
+   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 Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.
+   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
@ -636,6 +663,7 @@ strdup __argz_count __argz_stringify __argz_next])
      rm -f po/POTFILES
      sed -e "/^#/d" -e "/^\$/d" -e "s,.*,     $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
       	< $srcdir/po/POTFILES.in > po/POTFILES
+   fi
  ])

 # Search path for a program which passes the given test.
@ -650,7 +678,7 @@ strdup __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])
@ -686,6 +714,85 @@ 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.
 #
@ -694,15 +801,16 @@ AC_SUBST($1)dnl
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.

-# serial 1
+# serial 2

-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)
+      AC_DEFINE(HAVE_LC_MESSAGES, 1,
+        [Define if your <locale.h> file defines LC_MESSAGES.])
    fi
  fi])

--- a/config.h.in
+++ b/config.h.in
@ -31,9 +31,6 @@
 /* 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

@ -61,21 +58,6 @@
 /* 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

@ -127,6 +109,12 @@
 /* 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

@ -136,6 +124,9 @@
 /* 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

@ -163,6 +154,9 @@
 /* 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

@ -196,6 +190,12 @@
 /* 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,12 +211,28 @@
 /* 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
+
--- a/1323
+++ b/1323
--- a/configure.in
+++ b/configure.in
@ -15,7 +15,7 @@ AC_CHECK_HEADERS(fcntl.h unistd.h malloc.h termios.h termio.h limits.h getopt.h

 dnl options
 AC_ARG_ENABLE(tiny,
-[  --enable-tiny           Disables features for the sake of size
+[  --enable-tiny           Disable features for the sake of size
                          (currently disables detailed help and i18n)],
 [if test x$enableval = xyes; then
    AC_DEFINE(NANO_SMALL) tiny_support=yes
@ -40,14 +40,14 @@ AC_ARG_ENABLE(nanorc,
 fi])

 AC_ARG_ENABLE(color,
-[  --enable-color          Enable color and syntax hilighting],
+[  --enable-color          Enable color and syntax highlighting],
 [if test x$enableval = xyes; then
    AC_DEFINE(ENABLE_NANORC) nanorc_support=yes
    AC_DEFINE(ENABLE_COLOR) color_support=yes
 fi])

 AC_ARG_ENABLE(tabcomp,
-[  --disable-tabcomp       Disables tab completion code for a smaller binary],
+[  --disable-tabcomp       Disable tab completion code for a smaller binary],
 [if test x$enableval != xyes; then
    AC_DEFINE(DISABLE_TABCOMP) 
 fi])
@ -59,31 +59,31 @@ AC_ARG_ENABLE(justify,
 fi])

 AC_ARG_ENABLE(speller,
-[  --disable-speller       Disables spell checker function],
+[  --disable-speller       Disable spell checker function],
 [if test x$enableval != xyes; then
    AC_DEFINE(DISABLE_SPELLER) 
 fi])

 AC_ARG_ENABLE(help,
-[  --disable-help          Disables help function (^G)],
+[  --disable-help          Disable help function (^G)],
 [if test x$enableval != xyes; then
    AC_DEFINE(DISABLE_HELP) 
 fi])

 AC_ARG_ENABLE(browser,
-[  --disable-browser       Disables mini file browser],
+[  --disable-browser       Disable mini file browser],
 [if test x$enableval != xyes; then
    AC_DEFINE(DISABLE_BROWSER)
 fi])

 AC_ARG_ENABLE(wrapping,
-[  --disable-wrapping      Disables all wrapping of text (and -w flag)],
+[  --disable-wrapping      Disable all wrapping of text (and -w flag)],
 [if test x$enableval != xyes; then
    AC_DEFINE(DISABLE_WRAPPING)
 fi])

 AC_ARG_ENABLE(mouse,
-[  --disable-mouse         Disables mouse support (and -m flag)],
+[  --disable-mouse         Disable mouse support (and -m flag)],
 [if test x$enableval != xyes; then
    AC_DEFINE(DISABLE_MOUSE)
 fi])
--- a/faq.html
+++ b/faq.html
@ -63,11 +63,11 @@ bucky/meta key doesn't seem to work!&nbsp; What can I do?</a></font>
 &lt;insert keystroke here>!</a></font>
 <br><font color="#330000"><a href="#4.3">4.3. Nano crashes when I resize
 my window.&nbsp;&nbsp; How can I fix that?</a></font>
-<br><font color="#330000"><a href="#4.4">4.4. Why does nano show ^\ and
-^_ in the shortcut list instead of ^G and ^J?</a></font>
+<br><font color="#330000"><a href="#4.4">4.4. Why does nano show ^\
+in the shortcut list instead of ^J?</a></font>
 <br><font color="#330000"><a href="#4.5">4.5. When I type in a
 search string, the string I last searched for is already in front of
-my cursor!  !What happened?!</a></font>
+my cursor!  What happened?!</a></font>
 <br><font color="#330000"><a href="#4.6">4.6. I get the message "NumLock
 glitch detected.  Keypad will malfunction with NumLock off." What
 gives?</a></font>
@ -156,8 +156,8 @@ to Unix flocked to Pico and Pine because of their well organized, easy
 to use interfaces.&nbsp; With the proliferation of GNU/Linux in the mid to
 late 90's, many University students became intimately familiar with the
 strengths (and weaknesses) of Pine and Pico.</font>
-<p><b><font color="#330000">Then came debian...</font></b>
-<p><font color="#330000">The <a href="http://www.debian.org">debian GNU/Linux</a>
+<p><b><font color="#330000">Then came Debian...</font></b>
+<p><font color="#330000">The <a href="http://www.debian.org">Debian GNU/Linux</a>
 distribution, known for its strict standards in distributing truly "free"
 software (i.e. had no restrictions on redistribution), would not include
 a binary package for Pine or Pico.&nbsp; Many people had a serious dilemma:&nbsp;
@ -169,7 +169,7 @@ sense of the word.</font>
 hero) was yet again complaining to himself about the less-than-perfect
 license Pico was distributed under, the 1.0.1 makefiles that came with
 it and how just a few small improvements could make it the Best Editor
-in the World (TM).&nbsp; Having been a convert from Slackware to debian,
+in the World (TM).&nbsp; Having been a convert from Slackware to Debian,
 he missed having a simple binary package that included Pine and Pico, and
 had grown tired of downloading them himself.</font>
 <p><font color="#330000">Finally something snapped inside and Chris coded
@ -177,12 +177,11 @@ and hacked like a madman for many hours straight one weekend to make a
 (barely usable) Pico clone, at the time called TIP (Tip Isn't Pico).&nbsp;
 The program could not be invoked without a filename, could not save files,
 had no help menu, spell checker, and so forth.&nbsp; But over time it improved,
-and with the help of a few great coders it matured to the almost stable
+and with the help of a few great coders it matured to the (hopefully) stable
 state it is today.
 <p><font color="#330000">In February 2001, nano has been declared an
-official GNU program by Richard Stallman.  Nano is also nearing its 1.0
-release as of this writing (Valentine's Day 2001).
- </font></blockquote>
+official GNU program by Richard Stallman.  Nano also reached it's first
+production release on March 22, 2001.</font></blockquote>

 <h2>
 <a NAME="1.5"></a><font color="#330000">1.5. Why the name change from TIP?</font></h2>
@ -267,7 +266,7 @@ at:</font>
 <h2>
 <a NAME="2.3"></a><font color="#330000">2.3. Debian (.deb) packages.</font></h2>

-<blockquote><font color="#330000">For debian users, you can check out the
+<blockquote><font color="#330000">For Debian users, you can check out the
 current nano packages for:</font>
 <ul>
 <li>
@ -277,9 +276,9 @@ current nano packages for:</font>
 <font color="#330000"><a href="http://www.debian.org/Packages/unstable/editors/nano.html">unstable</a></font></li>
 </ul>
 <font color="#330000">Note that versions &lt; 0.9.10 are probably not for
-those wanting to get serious work done, so until the stable distribution
-has an updated version of nano, you are best off using the one in unstable
-for now.</font></blockquote>
+those wanting to get serious work done, so if you are using Debian 2.2, check
+that you have updated to 2.2r3, which comes with nano 0.9.23. If you're 
+tracking unstable, you probably have the newest version already.</font></blockquote>

 <h2>
 <a NAME="2.4"></a><font color="#330000">2.4. By CVS (for the brave).</font></h2>
@ -367,6 +366,8 @@ list:
 <b>--disable-speller</b>       Disables spell checker function
 <b>--disable-help</b>          Disables help function (^G)
 <b>--disable-browser</b>       Disables mini file browser
+<b>--disable-wrapping</b>      Disables all wrapping of text (and -w flag)
+<b>--disable-mouse</b>         Disables mouse support (and -m flag)
 </pre><br>
 There's also the <b>--enable-tiny</b> option which disables everything
 above, as well as some larger chunks of the program (like the marker code
@ -376,6 +377,12 @@ disable internationalization and save a few K to a few dozen K depending
 on if you have locale support on your system. And finally there's always
 good old <b>strip</b> to strip all debugging code and code that exists in
 libraries on your system.
+<p>If, in the other hand, you can't live with bells and whistles, you could
+try:
+<pre>
+<b>--enable-extra</b>          Enable extra functions, including easter eggs
+<b>--enable-nanorc</b>         Enable use of .nanorc file
+<b>--enable-color</b>          Enables color and syntax highlighting
 </font></blockquote> <hr WIDTH="100%"> <h1>
 <a NAME="4"></a><font color="#330000">4. Running</font></h1>

@ -395,7 +402,8 @@ keystroke here>!</font></h2>

 <blockquote><font color="#330000">If you aren't trying some bizarre keystroke
 combination with some bizarre $TERM entry, chances are you have found a
-bug.&nbsp;&nbsp; You are welcome to submit it to the nano-devel list or
+bug.&nbsp;&nbsp; You are welcome to submit it to the
+<a href="mailto:nano-devel@lists.sourceforge.net">nano-devel</a> list or
 to <a href="mailto:nano@nano-editor.org">nano@nano-editor.org</a>.</font></blockquote>

 <h2>
@ -407,19 +415,21 @@ please upgrade to a newer version (at least 0.9.9 would be great, 0.9.12
 is recommended).</font></blockquote>

 <h2>
-<a NAME="4.4"></a><font color="#330000">4.4. Why does nano show ^\ and
-^_ in the shortcut list instead of ^G and ^J?</font></h2>
+<a NAME="4.4"></a><font color="#330000">4.4. Why does nano show ^\ in the
+shortcut list instead of ^J?</font></h2>

-<blockquote><font color="#330000">The help (^G) and justify (^J) functions
+<blockquote><font color="#330000">The help (^G) and justify (^J) function
 were among the last to be written.&nbsp; To show the improvements that
 nano had over Pico (goto line # and replace), ^_ and ^\ were put on the
-shortcut list.&nbsp;&nbsp; If you use the <b>-p</b> option to nano you
-will get the same shortcuts at the bottom as Pico.</font></blockquote>
+shortcut list.&nbsp;&nbsp; Later, ^G came back in place of ^_ as it proved
+to be very valuable for new UNIX users. If you use the <b>-p</b> option to
+nano (or hit Meta-P) you will get the same shortcuts at the bottom as
+Pico.</font></blockquote>

 <h2>
 <a name="4.5"><font color="#330000">4.5. When I type in a search
 string, the string I last searched for is already in front of my
-cursor!  !What happened?!</font></h2>
+cursor!  What happened?!</font></h2>

 <blockquote><font color="#330000">In nano version 0.9.20, the default is
 to have a completely consistent user interface across all user input
@ -488,7 +498,7 @@ my language!</font></h2>
 language to write one =-).&nbsp; Just grab the <b>nano.pot</b> file from
 the latest and greatest nano distribution (it's in the <b>po/</b> directory)
 and translate each line into your native language on the <b>msgstr</b>
-line.&nbsp; Then send it to the nano devel list or <a href="mailto:nano@nano-editor.org">nano@nano-editor.org</a>.</font></blockquote>
+line.&nbsp; Then send it to the <a href="mailto:nano-devel@lists.sourceforge.net">nano-devel</a> list or <a href="mailto:nano@nano-editor.org">nano@nano-editor.org</a>.</font></blockquote>

 <h2>
 <a NAME="5.2"></a><font color="#330000">5.2. I don't like the translation
@ -521,7 +531,7 @@ of personal preference as to which editor you should use.&nbsp; If you're
 the type of person who likes using the original version of a program, then
 Pico is the editor for you.&nbsp;&nbsp; If you're looking for a few more
 features and a 'better' license as far as adding your own changes (sacrificing
-mailer integration and a little stability), nano is the way to go.
+mailer integration with Pine), nano is the way to go.
 </blockquote>

 <h2>
@ -580,7 +590,7 @@ any changes in the past few years in a positive direction.</font></blockquote>
 hosted at <a href="http://www.sourceforge.net">SourceForge</a>, nano-announce
 and nano-devel.&nbsp; Nano-announce is a very low traffic list where new
 versions of nano are announced (surprise!)&nbsp; Nano-devel is a normally
-low, sometimes very high traffic list for dicussing the present and future
+low, sometimes high traffic list for discussing the present and future
 development of nano.&nbsp; Here are links to where you can sign up for
 a given list:</font><font color="#330000"></font>
 <p><font color="#330000">nano-announce - <a href="http://lists.sourceforge.net/mailman/listinfo/nano-announce">http://lists.sourceforge.net/mailman/listinfo/nano-announce</a></font>
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@ -8,6 +8,7 @@ global.c
 move.c
 nano.c
 search.c
+utils.c
 winio.c

 # Package header files
--- a/po/ca.po
+++ b/po/ca.po
@ -6,14 +6,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\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"
+"Project-Id-Version: 1.1.0\n"
+"POT-Creation-Date: 2001-05-02 19:10+0200\n"
+"PO-Revision-Date: 2001-05-02 19:14+0200\n"
+"Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Catalan <jordi@sindominio.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso8859-1\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"

 #: cut.c:45
@ -127,14 +126,12 @@ msgid "Can't open \"%s\": %s"
 msgstr "No es pot obrir \"%s\": %s"

 #: files.c:1295 global.c:232
-#, fuzzy
 msgid "Goto Directory"
-msgstr "Anar a Línia"
+msgstr "Anar a Directori"

 #: files.c:1300
-#, fuzzy
 msgid "Goto Cancelled"
-msgstr "Cancel·lat"
+msgstr "Anar a Cancel·lat"

 #: global.c:144
 msgid "Constant cursor position"
@ -434,9 +431,8 @@ msgid "To Files"
 msgstr "A Fitxers"

 #: global.c:444
-#, fuzzy
 msgid "Goto"
-msgstr "Anar a Línia"
+msgstr "Anar a"

 #: nano.c:137
 #, c-format
@ -477,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"
@ -912,15 +908,27 @@ msgstr "Avortat"
 msgid "Come on, be reasonable"
 msgstr "Au vinga, sigues assenyat"

+#: utils.c:108
+msgid "nano: malloc: out of memory!"
+msgstr "nano: malloc: memòria insuficient!"
+
+#: utils.c:121
+msgid "nano: calloc: out of memory!"
+msgstr "nano: calloc: memòria insuficient!"
+
+#: utils.c:131
+msgid "nano: realloc: out of memory!"
+msgstr "nano: realloc: memòria insuficient!"
+
 #: 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:288
-#, fuzzy, c-format
+#, c-format
 msgid "Aha! '%c' (%d)\n"
-msgstr "entrada '%c' (%d)\n"
+msgstr "Aha! '%c' (%d)\n"

 #: winio.c:470
 #, c-format
--- a/po/cs.po
+++ b/po/cs.po
@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0.0\n"
-"POT-Creation-Date: 2001-04-30 09:44-0400\n"
+"POT-Creation-Date: 2001-05-02 19:10+0200\n"
 "Last-Translator: Václav Haisman <V.Haisman@sh.cvut.cz>\n"
 "Language-Team: N/A\n"
 "MIME-Version: 1.0\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"
@ -918,6 +918,20 @@ msgstr "P
 msgid "Come on, be reasonable"
 msgstr "Notak, buï rozumný."

+#: utils.c:108
+msgid "nano: malloc: out of memory!"
+msgstr "nano: malloc: nedostatek pamìti!"
+
+#: utils.c:121
+#, fuzzy
+msgid "nano: calloc: out of memory!"
+msgstr "nano: malloc: nedostatek pamìti!"
+
+#: utils.c:131
+#, fuzzy
+msgid "nano: realloc: out of memory!"
+msgstr "nano: malloc: nedostatek pamìti!"
+
 #: winio.c:124
 #, fuzzy, c-format
 msgid "actual_x_from_start for xplus=%d returned %d\n"
@ -1049,9 +1063,6 @@ msgstr "D
 #~ 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!"
-
 #~ msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n"
 #~ msgstr " -p\t \t--pico\t\t\tUdìlej spodní 2 øádky více Picoidní\n"

--- 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-30 09:44-0400\n"
+"POT-Creation-Date: 2001-05-02 19:10+0200\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"
@ -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,11 +494,11 @@ 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:294
@ -924,6 +924,19 @@ msgstr "Abgebrochen"
 msgid "Come on, be reasonable"
 msgstr "Komm schon, sei vernünftig"

+#: utils.c:108
+msgid "nano: malloc: out of memory!"
+msgstr "nano: malloc: Kein Speicher verfügbar!"
+
+#: utils.c:121
+#, fuzzy
+msgid "nano: calloc: out of memory!"
+msgstr "nano: malloc: Kein Speicher verfügbar!"
+
+#: utils.c:131
+msgid "nano: realloc: out of memory!"
+msgstr "nano: realloc: Kein Speicher verfügbar!"
+
 #: winio.c:124
 #, c-format
 msgid "actual_x_from_start for xplus=%d returned %d\n"
@ -1240,12 +1253,6 @@ msgstr "Danke f
 #~ msgid "To Search"
 #~ msgstr "Suche"

-#~ msgid "nano: malloc: out of memory!"
-#~ msgstr "nano: malloc: Kein Speicher verfügbar!"
-
-#~ msgid "nano: realloc: out of memory!"
-#~ msgstr "nano: realloc: Kein Speicher verfügbar!"
-
 #~ msgid "Suspend nano if suspend is enabled"
 #~ msgstr "nano anhalten und zur Shell zurückkehren (nur wenn aktiviert)"

--- a/po/es.po
+++ b/po/es.po
@ -6,13 +6,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2001-04-30 09:44-0400\n"
-"PO-Revision-Date: 2001-03-21 23:46+0100\n"
+"Project-Id-Version: 1.1.0\n"
+"POT-Creation-Date: 2001-05-02 19:10+0200\n"
+"PO-Revision-Date: 2001-05-02 19:10+0200\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso8859-1\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"

 #: cut.c:45
@ -126,14 +126,12 @@ msgid "Can't open \"%s\": %s"
 msgstr "No se puede abrir \"%s\": %s"

 #: files.c:1295 global.c:232
-#, fuzzy
 msgid "Goto Directory"
-msgstr "Ir a Línea"
+msgstr "Ir a Directorio"

 #: files.c:1300
-#, fuzzy
 msgid "Goto Cancelled"
-msgstr "Cancelado"
+msgstr "Ir a Cancelado"

 #: global.c:144
 msgid "Constant cursor position"
@ -433,9 +431,8 @@ msgid "To Files"
 msgstr "A Ficheros"

 #: global.c:444
-#, fuzzy
 msgid "Goto"
-msgstr "Ir a Línea"
+msgstr "Ir a"

 #: nano.c:137
 #, c-format
@ -476,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"
@ -912,15 +909,27 @@ msgstr "Abortado"
 msgid "Come on, be reasonable"
 msgstr "Venga ya, se razonable"

+#: utils.c:108
+msgid "nano: malloc: out of memory!"
+msgstr "nano: malloc: memoria insuficiente!"
+
+#: utils.c:121
+msgid "nano: calloc: out of memory!"
+msgstr "nano: calloc: memoria insuficiente!"
+
+#: utils.c:131
+msgid "nano: realloc: out of memory!"
+msgstr "nano: realloc: memoria insuficiente!"
+
 #: 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:288
-#, fuzzy, c-format
+#, c-format
 msgid "Aha! '%c' (%d)\n"
-msgstr "entrada '%c' (%d)\n"
+msgstr "Aha! '%c' (%d)\n"

 #: winio.c:470
 #, c-format
--- 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-30 09:44-0400\n"
+"POT-Creation-Date: 2001-05-02 19:10+0200\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"
@ -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"
@ -908,6 +908,18 @@ msgstr "Keskeytetty"
 msgid "Come on, be reasonable"
 msgstr "Jotakin järkevää, kiitos?"

+#: utils.c:108
+msgid "nano: malloc: out of memory!"
+msgstr ""
+
+#: utils.c:121
+msgid "nano: calloc: out of memory!"
+msgstr ""
+
+#: utils.c:131
+msgid "nano: realloc: out of memory!"
+msgstr ""
+
 #: winio.c:124
 #, c-format
 msgid "actual_x_from_start for xplus=%d returned %d\n"
--- 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-30 09:44-0400\n"
+"POT-Creation-Date: 2001-05-02 19:10+0200\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"
@ -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 "
@ -932,6 +932,20 @@ msgstr "Annul
 msgid "Come on, be reasonable"
 msgstr "Allez, soyez raisonnable"

+#: utils.c:108
+msgid "nano: malloc: out of memory!"
+msgstr "nano: malloc: plus de mémoire!"
+
+#: utils.c:121
+#, fuzzy
+msgid "nano: calloc: out of memory!"
+msgstr "nano: malloc: plus de mémoire!"
+
+#: utils.c:131
+#, fuzzy
+msgid "nano: realloc: out of memory!"
+msgstr "nano: malloc: plus de mémoire!"
+
 #: winio.c:124
 #, fuzzy, c-format
 msgid "actual_x_from_start for xplus=%d returned %d\n"
@ -1104,13 +1118,6 @@ msgstr ""
 #~ msgid "^C"
 #~ msgstr "^C"

-#~ msgid "nano: malloc: out of memory!"
-#~ msgstr "nano: malloc: plus de mémoire!"
-
-#, fuzzy
-#~ msgid "nano: realloc: out of memory!"
-#~ msgstr "nano: malloc: plus de mémoire!"
-
 #, fuzzy
 #~ msgid "I got %c (%d)!\n"
 #~ msgstr "J'ai reçu Alt-%c! (%d)\n"
--- 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 09:44-0400\n"
+"POT-Creation-Date: 2001-05-02 19:10+0200\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"
@ -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"
@ -904,6 +904,18 @@ msgstr "Abortado"
 msgid "Come on, be reasonable"
 msgstr "Vamos, sexa razonable"

+#: utils.c:108
+msgid "nano: malloc: out of memory!"
+msgstr ""
+
+#: utils.c:121
+msgid "nano: calloc: out of memory!"
+msgstr ""
+
+#: utils.c:131
+msgid "nano: realloc: out of memory!"
+msgstr ""
+
 #: winio.c:124
 #, c-format
 msgid "actual_x_from_start for xplus=%d returned %d\n"
--- 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-30 09:44-0400\n"
+"POT-Creation-Date: 2001-05-02 19:10+0200\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"
@ -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"
@ -914,6 +914,18 @@ msgstr "Megszak
 msgid "Come on, be reasonable"
 msgstr "Gyerünk, adj meg egy hihetõbb értéket :-)"

+#: utils.c:108
+msgid "nano: malloc: out of memory!"
+msgstr ""
+
+#: utils.c:121
+msgid "nano: calloc: out of memory!"
+msgstr ""
+
+#: utils.c:131
+msgid "nano: realloc: out of memory!"
+msgstr ""
+
 #: winio.c:124
 #, c-format
 msgid "actual_x_from_start for xplus=%d returned %d\n"
--- 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-30 09:44-0400\n"
+"POT-Creation-Date: 2001-05-02 19:10+0200\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"
@ -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"
@ -912,6 +912,20 @@ msgstr "Dibatalkan"
 msgid "Come on, be reasonable"
 msgstr "Ayo, yang masuk akal"

+#: utils.c:108
+msgid "nano: malloc: out of memory!"
+msgstr "nano: malloc: memori habis!"
+
+#: utils.c:121
+#, fuzzy
+msgid "nano: calloc: out of memory!"
+msgstr "nano: malloc: memori habis!"
+
+#: utils.c:131
+#, fuzzy
+msgid "nano: realloc: out of memory!"
+msgstr "nano: malloc: memori habis!"
+
 #: winio.c:124
 #, c-format
 msgid "actual_x_from_start for xplus=%d returned %d\n"
@ -1078,6 +1092,3 @@ msgstr "Terima kasih telah menggunakan nano!\n"

 #~ msgid "^C"
 #~ msgstr "^C"
-
-#~ msgid "nano: malloc: out of memory!"
-#~ msgstr "nano: malloc: memori habis!"
--- a/po/it.po
+++ b/po/it.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.8.7\n"
-"POT-Creation-Date: 2001-04-30 09:44-0400\n"
+"POT-Creation-Date: 2001-05-02 19:10+0200\n"
 "PO-Revision-Date: 2000-03-03 04:57+0100\n"
 "Last-Translator: Daniele Medri <madrid@linux.it>\n"
 "MIME-Version: 1.0\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"
@ -898,6 +898,20 @@ msgstr "Operazione fallita"
 msgid "Come on, be reasonable"
 msgstr "Avanti, sii ragionevole"

+#: utils.c:108
+msgid "nano: malloc: out of memory!"
+msgstr "nano: malloc: fuori memoria!"
+
+#: utils.c:121
+#, fuzzy
+msgid "nano: calloc: out of memory!"
+msgstr "nano: malloc: fuori memoria!"
+
+#: utils.c:131
+#, fuzzy
+msgid "nano: realloc: out of memory!"
+msgstr "nano: malloc: fuori memoria!"
+
 #: winio.c:124
 #, fuzzy, c-format
 msgid "actual_x_from_start for xplus=%d returned %d\n"
@ -1064,13 +1078,6 @@ msgstr ""
 #~ msgid "^C"
 #~ msgstr "^C"

-#~ msgid "nano: malloc: out of memory!"
-#~ msgstr "nano: malloc: fuori memoria!"
-
-#, fuzzy
-#~ msgid "nano: realloc: out of memory!"
-#~ msgstr "nano: malloc: fuori memoria!"
-
 #, fuzzy
 #~ msgid "I got %c (%d)!\n"
 #~ msgstr "Premuto Alt-%c! (%d)\n"