GNU nano 1.1.1 release

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@740 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
do_mark() - Temporarily disable cursorpos when enabled to be able to see the mark (un)set message (Ken Tyler)
2001-07-29 01:16:27 +00:00 · 2001-07-24 00:21:03 +00:00 · 2001-07-19 22:03:51 +00:00 · 2001-07-19 12:26:56 +00:00 · 2001-07-19 12:24:17 +00:00 · 2001-07-18 01:03:36 +00:00
69 changed files with 6525 additions and 8685 deletions
--- a/41
+++ b/41
@@ -1,3 +1,44 @@
+nano-1.1.1 - 07/28/2001
+- General
+	- Reverted included gettext from 0.10.38 to 0.10.35 in intl/ dir.
+	- Added m4/ directory to allow rebuilding using only the internal
+	  version of gettext.m4 (Albert Chin).
+- nano.c:
+  main()
+	- Change the multibuffer getopt option to 'F' (David Lawrence
+	  Ramsey)
+  do_mark()
+	- Temporarily disable cursorpos when enabled to be able to see
+	  the mark (un)set message (Ken Tyler).
+- nanorc.sample
+	- Typo fixes and updates (David Lawrence Ramsey)
+- files.c:
+  new_file()
+	- Do add_open_files if there aren't any open yet (David Lawrence 
+	  Ramsey).
+  close_open_file()
+	- Try to open the next file first, then the previous one 
+	  (David Lawrence Ramsey).
+- global.c:
+  shortcut_init()
+	- Rewrote the whereis and replace lists to put CANCEL at the end
+	  of the list, and not include the toggle functions when using
+	  NANO_SMALL.
+- nano.h:
+	- Fix type in INSERTFILE_LIST_LEN.
+	- Rewrote all the macro definitions to be a little less messy,
+	  for the #ifdefs anyway.
+- rcfile.c:
+	- Update for the multibuffer option (oops) (David Lawrence Ramsey).
+- search.c:
+	- Added #ifdef NANO_SMALLs around the REVERSE_SEARCH code.
+  search_init()
+	- add #ifdef NANO_SMALL around toggles code.
+- winio.c:
+  bottombars()
+	- Fixed an off by one that wasn't letting lines with odd #
+	  shortcuts work in certain cases.
+
 nano-1.1.0 - 07/15/2001
 - General
 	- New global variables currshortcut and currslen to support using
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,10 @@
 ## $Id$
+AUTOMAKE_OPTIONS = gnu no-dependencies
+M4DIR = $(srcdir)/m4
+ACLOCAL_AMFLAGS = -I $(M4DIR)
+ACINCLUDE_INPUTS = $(M4DIR)/gettext.m4 $(M4DIR)/largefile.m4 \
+	$(M4DIR)/lcmessage.m4 $(M4DIR)/progtest.m4
+
 bin_PROGRAMS = 	nano
 nano_SOURCES =	color.c \
 		cut.c \
@@ -14,16 +20,19 @@ nano_SOURCES =	color.c \
 		winio.c 

 man_MANS = nano.1
-nano_LDADD = @INTLLIBS@
+nano_LDADD = @GLIB_LIBS@ @INTLLIBS@

 info_TEXINFOS = nano.texi
 MAKEINFO = makeinfo --no-split

 EXTRA_DIST =	ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS \
 		README THANKS TODO install-sh missing mkinstalldirs \
-		nano.1 nano.1.html faq.html nanorc.sample
+		nano.1 nano.1.html faq.html nanorc.sample $(ACINCLUDE_INPUTS)

 SUBDIRS = po intl

-localedir = $(datadir)/locale
+localedir = @LOCALE_DIR@
 INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
+
+$(srcdir)/acinclude.m4: $(ACINCLUDE_INPUTS)
+	cat $(ACINCLUDE_INPUTS) > $@
--- a/Makefile.in
+++ b/Makefile.in
@@ -57,27 +57,26 @@ 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@
-GLIBC21 = @GLIBC21@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_CONFIG = @GLIB_CONFIG@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GNU_LOCALE_DIR = @GNU_LOCALE_DIR@
+GT_NO = @GT_NO@
+GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
+INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-LIBICONV = @LIBICONV@
+LOCALE_DIR = @LOCALE_DIR@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@
@@ -87,23 +86,30 @@ RANLIB = @RANLIB@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+l = @l@
+
+AUTOMAKE_OPTIONS = gnu no-dependencies
+M4DIR = $(srcdir)/m4
+ACLOCAL_AMFLAGS = -I $(M4DIR)
+ACINCLUDE_INPUTS = $(M4DIR)/gettext.m4 $(M4DIR)/largefile.m4 	$(M4DIR)/lcmessage.m4 $(M4DIR)/progtest.m4
+

 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 


 man_MANS = nano.1
-nano_LDADD = @INTLLIBS@
+nano_LDADD = @GLIB_LIBS@ @INTLLIBS@

 info_TEXINFOS = nano.texi
 MAKEINFO = makeinfo --no-split

-EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS 		README THANKS TODO install-sh missing mkinstalldirs 		nano.1 nano.1.html faq.html nanorc.sample
+EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS 		README THANKS TODO install-sh missing mkinstalldirs 		nano.1 nano.1.html faq.html nanorc.sample $(ACINCLUDE_INPUTS)


 SUBDIRS = po intl

-localedir = $(datadir)/locale
+localedir = @LOCALE_DIR@
 INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -149,14 +155,14 @@ all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .dvi .info .o .ps .s .texi .texinfo .txi
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status

 $(ACLOCAL_M4):  configure.in 
-	cd $(srcdir) && $(ACLOCAL)
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)

 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -521,6 +527,7 @@ distdir: $(DISTFILES)
 	-rm -rf $(distdir)
 	mkdir $(distdir)
 	-chmod 777 $(distdir)
+	$(mkinstalldirs) $(distdir)/$(M4DIR)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -632,6 +639,9 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean


+$(srcdir)/acinclude.m4: $(ACINCLUDE_INPUTS)
+	cat $(ACINCLUDE_INPUTS) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- a/12
+++ b/12
@@ -1,3 +1,15 @@
+07/28/2001 - GNU nano 1.1.1 is released.  Our second 1.1 unstable release
+		features many bugfixes from the initial release, in
+		particular fixs for the multibuffer code, and various
+		compiler macro fixes.  The shortcut lists for
+		the search and replace prompts are a little more logical
+		(with cancel the last option again), and the included
+		gettext was re-downgraded to 0.10.35 due to problems
+		on the PPC platform.  GNU nano now includes its own
+		aclocal macros in the m4/ directory to allow rebuilding
+		the configure script to work on platforms regardless of
+		their gettext version.
+
 07/15/2001 - GNU nano 1.1.0 is released.  This is the first release
 		in the 1.1.x unstable series of GNU nano. It
 		incorporates all changes up to the 1.0.3 release, 
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -143,6 +143,99 @@ AC_DEFUN([AC_ISC_POSIX],
  ]
 )

+#serial 19
+
+dnl By default, many hosts won't let programs access large files;
+dnl one must use special compiler options to get large-file access to work.
+dnl For more details about this brain damage please see:
+dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
+
+dnl Written by Paul Eggert <eggert@twinsun.com>.
+
+dnl Internal subroutine of AC_SYS_LARGEFILE.
+dnl AC_SYS_LARGEFILE_TEST_INCLUDES
+AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES,
+  [[#include <sys/types.h>
+    /* Check that off_t can represent 2**63 - 1 correctly.
+       We can't simply "#define LARGE_OFF_T 9223372036854775807",
+       since some C++ compilers masquerading as C compilers
+       incorrectly reject 9223372036854775807.  */
+#   define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+			&& LARGE_OFF_T % 2147483647 == 1)
+		       ? 1 : -1];
+  ]])
+
+dnl Internal subroutine of AC_SYS_LARGEFILE.
+dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, COMMENT, INCLUDES, FUNCTION-BODY)
+AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
+  [AC_CACHE_CHECK([for $1 value needed for large files], $3,
+     [$3=no
+      AC_TRY_COMPILE([$5],
+	[$6], 
+	,
+	[AC_TRY_COMPILE([#define $1 $2]
+[$5]
+	   ,
+	   [$6],
+	   [$3=$2])])])
+   if test "[$]$3" != no; then
+     AC_DEFINE_UNQUOTED([$1], [$]$3, [$4])
+   fi])
+
+AC_DEFUN(NANO_AC_SYS_LARGEFILE,
+  [AC_REQUIRE([AC_PROG_CC])
+   AC_ARG_ENABLE(largefile,
+     [  --disable-largefile     omit support for large files])
+   if test "$enable_largefile" != no; then
+
+     AC_CACHE_CHECK([for special C compiler options needed for large files],
+       ac_cv_sys_largefile_CC,
+       [ac_cv_sys_largefile_CC=no
+        if test "$GCC" != yes; then
+	  # IRIX 6.2 and later do not support large files by default,
+	  # so use the C compiler's -n32 option if that helps.
+	  AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , ,
+	    [ac_save_CC="$CC"
+	     CC="$CC -n32"
+	     AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, ,
+	       ac_cv_sys_largefile_CC=' -n32')
+	     CC="$ac_save_CC"])
+        fi])
+     if test "$ac_cv_sys_largefile_CC" != no; then
+       CC="$CC$ac_cv_sys_largefile_CC"
+     fi
+
+     AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
+       ac_cv_sys_file_offset_bits,
+       [Number of bits in a file offset, on hosts where this is settable.],
+       AC_SYS_LARGEFILE_TEST_INCLUDES)
+     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1,
+       ac_cv_sys_large_files,
+       [Define for large files, on AIX-style hosts.],
+       AC_SYS_LARGEFILE_TEST_INCLUDES)
+   fi
+  ])
+
+AC_DEFUN(AC_FUNC_FSEEKO,
+  [AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1,
+     ac_cv_sys_largefile_source,
+     [Define to make fseeko visible on some hosts (e.g. glibc 2.2).],
+     [#include <stdio.h>], [return !fseeko;])
+   # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+   # in glibc 2.1.3, but that breaks too many other things.
+   # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+
+   AC_CACHE_CHECK([for fseeko], ac_cv_func_fseeko,
+     [ac_cv_func_fseeko=no
+      AC_TRY_LINK([#include <stdio.h>],
+        [return fseeko && fseeko (stdin, 0, 0);],
+	[ac_cv_func_fseeko=yes])])
+   if test $ac_cv_func_fseeko != no; then
+     AC_DEFINE(HAVE_FSEEKO, 1,
+       [Define if fseeko (and presumably ftello) exists and is declared.])
+   fi])
+
 # Configure paths for GLIB
 # Owen Taylor     97-11-3

@@ -344,41 +437,15 @@ main ()
 # Ulrich Drepper <drepper@cygnus.com>, 1995.
 #
 # This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU General Public License
+# be used in projects which are not available under the GNU Public License
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.

-# serial 9
+# serial 108

-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_PREREQ(2.13)               dnl Minimum Autoconf version required.
+
+AC_DEFUN(NANO_AM_WITH_NLS,
  [AC_MSG_CHECKING([whether NLS is requested])
    dnl Default is enabled NLS
    AC_ARG_ENABLE(nls,
@@ -387,15 +454,23 @@ AC_DEFUN([AM_WITH_NLS],
    AC_MSG_RESULT($USE_NLS)
    AC_SUBST(USE_NLS)

-    BUILD_INCLUDED_LIBINTL=no
    USE_INCLUDED_LIBINTL=no
-    INTLLIBS=
+
+    AC_ARG_WITH(locale-dir,
+      [  --with-locale-dir=DIR   specify locale directory],
+      LOCALE_DIR=$withval)
+    test -z "$LOCALE_DIR" && LOCALE_DIR='$(datadir)/locale'
+    AC_SUBST(LOCALE_DIR)
+
+    AC_ARG_WITH(gnu-locale-dir,
+      [  --with-gnu-locale-dir=DIR specify GNU locale directory],
+      GNU_LOCALE_DIR=$withval)
+    test -z "$GNU_LOCALE_DIR" && GNU_LOCALE_DIR='$(prefix)/share/locale'
+    AC_SUBST(GNU_LOCALE_DIR)

    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, 1, [Define to 1 if NLS 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],
@@ -406,74 +481,83 @@ 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)])
+	  [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_gnugettext_libc" != "yes"; then
-	     AC_CACHE_CHECK([for GNU gettext in libintl],
-	       gt_cv_func_gnugettext_libintl,
-	       [gt_save_LIBS="$LIBS"
-		LIBS="$LIBS -lintl $LIBICONV"
-		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"])
+	   if test "$gt_cv_func_gettext_libc" != "yes"; then
+	     AC_CHECK_LIB(intl, bindtextdomain,
+	       [AC_CHECK_LIB(intl, gettext)])
 	   fi

-	   dnl If an already present or preinstalled GNU gettext() is found,
-	   dnl use it.  But if this macro is used in GNU gettext, and GNU
-	   dnl gettext is already preinstalled in libintl, we update this
-	   dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-	   if test "$gt_cv_func_gnugettext_libc" = "yes" \
-	      || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-		   && test "$PACKAGE" != gettext; }; then
-	     AC_DEFINE(HAVE_GETTEXT, 1,
-               [Define if the GNU gettext() function is already present or preinstalled.])
-
-	     if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-	       dnl If iconv() is in a separate libiconv library, then anyone
-	       dnl linking with libintl{.a,.so} also needs to link with
-	       dnl libiconv.
-	       INTLLIBS="-lintl $LIBICONV"
-	     fi
-
-	     gt_save_LIBS="$LIBS"
-	     LIBS="$LIBS $INTLLIBS"
-	     AC_CHECK_FUNCS(dcgettext)
-	     LIBS="$gt_save_LIBS"
-
-	     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
-	   fi
+	   if test "$gt_cv_func_gettext_libc" = "yes" \
+	      || test "$ac_cv_lib_intl_gettext" = "yes"; then
+	      AC_DEFINE(HAVE_GETTEXT, 1,
+	  [Define to 1 if you have gettext and don't want to use GNU gettext.])
+	      NANO_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)
+		NANO_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, 1,
+			 [Define as 1 if you have catgets and don't want to use GNU gettext.])
+	       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
+		   NANO_AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
+		    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
+		 fi
+		 NANO_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
@@ -482,17 +566,21 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
      if test "$nls_cv_use_gnu_gettext" = "yes"; then
        dnl Mark actions used to generate GNU NLS library.
        INTLOBJS="\$(GETTOBJS)"
-        AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+        NANO_AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
 	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
        AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-        AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+        NANO_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 $LIBICONV"
-	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+        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.
@@ -508,74 +596,29 @@ 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
-    fi
-    AC_OUTPUT_COMMANDS(
-     [for ac_file in $CONFIG_FILES; do
-        # Support "outfile[:infile[:infile...]]"
-        case "$ac_file" in
-          *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-        esac
-        # PO directories have a Makefile.in generated from Makefile.in.in.
-        case "$ac_file" in */Makefile.in)
-          # Adjust a relative srcdir.
-          ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-          ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-          ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-          test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-          case "$ac_given_srcdir" in
-            .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-            /*) top_srcdir="$ac_given_srcdir" ;;
-            *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-          esac
-          if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-            rm -f "$ac_dir/POTFILES"
-            test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-            sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
-            test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-            sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          fi
-          ;;
-        esac
-      done])
-
-
-    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
-      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])
+      DATADIRNAME=share
+      nls_cv_header_intl=intl/libintl.h
+      nls_cv_header_libgt=intl/libgettext.h
    fi
-    if test $ac_verc_fail = yes; then
-      INTLBISON=:
+    if test -z "$nls_cv_header_intl"; then
+      # Clean out junk possibly left behind by a previous configuration.
+      rm -f intl/libintl.h
+    fi
+    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+    AC_OUTPUT_COMMANDS(
+     [case "$CONFIG_FILES" 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.
+    if test "$PACKAGE" = gettext; then
+      USE_NLS=yes
+      USE_INCLUDED_LIBINTL=yes
    fi

    dnl These rules are solely for the distribution goal.  While doing this
@@ -587,38 +630,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 For backward compatibility. Some Makefiles may be using this.
-    INSTOBJEXT=.mo
-    AC_SUBST(INSTOBJEXT)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    GENCAT=gencat
-    AC_SUBST(GENCAT)
  ])

-dnl Usage: Just like AM_WITH_NLS, which see.
-AC_DEFUN([AM_GNU_GETTEXT],
+AC_DEFUN(NANO_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
@@ -628,18 +655,21 @@ AC_DEFUN([AM_GNU_GETTEXT],
   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
   AC_REQUIRE([AC_FUNC_MMAP])dnl
-   AC_REQUIRE([jm_GLIBC21])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 getegid geteuid \
-getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
-strdup strtoul 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])

-   AM_ICONV
-   AM_LANGINFO_CODESET
-   AM_LC_MESSAGES
-   AM_WITH_NLS([$1],[$2],[$3])
+   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, 1, [Define to 1 if you have the stpcpy function.])
+   fi
+
+   NANO_AM_LC_MESSAGES
+   NANO_AM_WITH_NLS

   if test "x$CATOBJEXT" != "x"; then
     if test "x$ALL_LINGUAS" = "x"; then
@@ -647,21 +677,10 @@ strdup strtoul tsearch __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)
@@ -673,8 +692,47 @@ strdup strtoul tsearch __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
@@ -685,11 +743,74 @@ strdup strtoul tsearch __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.
+   test -d po || mkdir po
+   case "$srcdir" in
+   .)
+     posrcprefix="../" ;;
+   /* | [[A-Za-z]]:*)
+     posrcprefix="$srcdir/" ;;
+   *)
+     posrcprefix="../$srcdir/" ;;
+   esac
+   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.
+# Ulrich Drepper <drepper@cygnus.com>, 1996.
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+# serial 1
+
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN(NANO_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])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+  /*)
+  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if [$3]; then
+	ac_cv_path_$1="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+  ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test -n "[$]$1"; then
+  AC_MSG_RESULT([$]$1)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])
+
 # Search path for a program which passes the given test.
 # Ulrich Drepper <drepper@cygnus.com>, 1996.
 #
@@ -738,139 +859,26 @@ fi
 AC_SUBST($1)dnl
 ])

-#serial 2
-
-# Test for the GNU C Library, version 2.1 or newer.
-# From Bruno Haible.
-
-AC_DEFUN([jm_GLIBC21],
-  [
-    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
-      ac_cv_gnu_library_2_1,
-      [AC_EGREP_CPP([Lucky GNU user],
-	[
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-  Lucky GNU user
- #endif
-#endif
-	],
-	ac_cv_gnu_library_2_1=yes,
-	ac_cv_gnu_library_2_1=no)
-      ]
-    )
-    AC_SUBST(GLIBC21)
-    GLIBC21="$ac_cv_gnu_library_2_1"
-  ]
-)
-
-#serial AM2
-
-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_ARG_WITH([libiconv-prefix],
-[  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib], [
-    for dir in `echo "$withval" | tr : ' '`; do
-      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
-      if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
-    done
-   ])
-
-  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.
 #
 # This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU General Public License
+# be used in projects which are not available under the GNU Public License
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.

 # serial 2

-AC_DEFUN([AM_LC_MESSAGES],
+AC_PREREQ(2.13)               dnl Minimum Autoconf version required.
+
+AC_DEFUN(NANO_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.])
+		[Define if your locale.h file contains LC_MESSAGES.])
    fi
  fi])

--- a/config.h.in
+++ b/config.h.in
@@ -112,36 +112,15 @@
 /* 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

-/* Define if you have the getegid function.  */
-#undef HAVE_GETEGID
-
-/* Define if you have the geteuid function.  */
-#undef HAVE_GETEUID
-
-/* Define if you have the getgid function.  */
-#undef HAVE_GETGID
-
 /* Define if you have the getopt_long function.  */
 #undef HAVE_GETOPT_LONG

 /* Define if you have the getpagesize function.  */
 #undef HAVE_GETPAGESIZE

-/* Define if you have the getuid function.  */
-#undef HAVE_GETUID
-
-/* Define if you have the mempcpy function.  */
-#undef HAVE_MEMPCPY
-
 /* Define if you have the munmap function.  */
 #undef HAVE_MUNMAP

@@ -169,12 +148,6 @@
 /* Define if you have the strdup function.  */
 #undef HAVE_STRDUP

-/* Define if you have the strtoul function.  */
-#undef HAVE_STRTOUL
-
-/* Define if you have the tsearch function.  */
-#undef HAVE_TSEARCH
-
 /* Define if you have the vsnprintf function.  */
 #undef HAVE_VSNPRINTF

@@ -208,12 +181,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

@@ -229,28 +196,36 @@
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H

+/* Define if you have the i library (-li).  */
+#undef HAVE_LIBI
+
+/* Define if you have the intl library (-lintl).  */
+#undef HAVE_LIBINTL
+
 /* Name of package */
 #undef PACKAGE

 /* Version number of package */
 #undef VERSION

-/* Define if you have the iconv() function. */
-#undef HAVE_ICONV
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS

-/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES

-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#undef HAVE_LANGINFO_CODESET
+/* Define to 1 if you have the stpcpy function. */
+#undef HAVE_STPCPY

-/* Define if your <locale.h> file defines LC_MESSAGES. */
+/* Define if your locale.h file contains LC_MESSAGES. */
 #undef HAVE_LC_MESSAGES

-/* Define to 1 if translation of program messages to the user's native language
-   is requested. */
+/* Define to 1 if NLS is requested. */
 #undef ENABLE_NLS

-/* Define if the GNU gettext() function is already present or preinstalled. */
+/* Define to 1 if you have gettext and don't want to use GNU gettext. */
 #undef HAVE_GETTEXT

+/* Define as 1 if you have catgets and don't want to use GNU gettext. */
+#undef HAVE_CATGETS
+
--- a/1639
+++ b/1639
--- a/configure.in
+++ b/configure.in
@@ -1,13 +1,14 @@
 # $Id$
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(nano.c)
-AM_INIT_AUTOMAKE(nano, 1.1.0)
+AM_INIT_AUTOMAKE(nano, 1.1.1)
 AM_CONFIG_HEADER(config.h:config.h.in)
 ALL_LINGUAS="es de fr it id fi hu ca cs gl uk ru sv no"

 dnl Checks for programs.
 AC_PROG_CC
 AC_ISC_POSIX
+NANO_AC_SYS_LARGEFILE

 dnl Checks for header files.
 AC_HEADER_STDC
@@ -289,6 +290,6 @@ then
 fi

 dnl i18n stuff - pretty incomplete for now
-AM_GNU_GETTEXT
+NANO_AM_GNU_GETTEXT

 AC_OUTPUT([Makefile intl/Makefile po/Makefile.in])
--- a/faq.html
+++ b/faq.html
@@ -203,7 +203,7 @@ nano was developed).</font></blockquote>
 of nano?</font></h2>

 <blockquote><font color="#330000">The current version of nano *should*
-be 1.1.0.&nbsp; Of course you should always check the nano hompage to
+be 1.1.1.&nbsp; Of course you should always check the nano hompage to
 see what the latest and greatest version is.</font></blockquote>

 <h2>
@@ -394,7 +394,7 @@ try:
 <a NAME="3.7"></a><font color="#330000">
 3.7. Tell me more about this multibuffer stuff!</font></h2>

-<blockquote><font color="#330000"> To use multiple file buffers, you must be using nano 1.1.0
+<blockquote><font color="#330000"> To use multiple file buffers, you must be using nano 1.1.1
 or newer, and you must have configured nano with <b>--enable-multibuffer</b> or
 <b>--enable-extra</b> (use nano -V to check).  Then when you want to enable inserting a file
 into its own buffer instead of into the current file, just hit <b>Meta-F</b>, then insert the
@@ -412,7 +412,7 @@ normal "Exit" when only one buffer is open.
 3.8. How do I make a .nanorc file that nano will read when I start it?</font></h2>

 <blockquote><font color="#330000"> It's not hard at all!  But, your version of nano must have
-beem compiled with <b>--enable-nanorc</b>, and again must be version 1.1.0 or newer (use nano
+beem compiled with <b>--enable-nanorc</b>, and again must be version 1.1.1 or newer (use nano
 -V to check your version and compiled features).  Then simply copy the <b>nanorc.sample</b>
 that came with the nano source or your nano package (most likely in /usr/doc/nano) to .nanorc
 in your home directory. If you didn't get one, the syntax is simple.  Flags are turned on and
--- a/files.c
+++ b/files.c
@@ -74,6 +74,17 @@ void new_file(void)
    editbot = fileage;
    current = fileage;
    totlines = 1;
+
+#ifdef ENABLE_MULTIBUFFER
+    /* if there aren't any entries in open_files, create the entry for
+       this new file, and, of course, don't bother checking for
+       duplicates; without this, if nano is started without a filename on
+       the command line, a new file with no name will be created, but it
+       will be given no open_files entry, leading to problems later on */
+    if (!open_files)
+	add_open_file(0, 0);
+#endif
+
    UNSET(VIEW_MODE);
 }

@@ -730,7 +741,7 @@ int open_nextfile(int closing_file)

 /*
 * Delete an entry from the open_files filestruct.  After deletion of an
- * entry, the previous or next entry is opened, whichever is found first.
+ * entry, the next or previous entry is opened, whichever is found first.
 * Return 0 on success or 1 on error.
 */
 int close_open_file(void)
@@ -741,8 +752,8 @@ int close_open_file(void)
 	return 1;

    tmp = open_files;
-    if (open_prevfile(1)) {
-	if (open_nextfile(1))
+    if (open_nextfile(1)) {
+	if (open_prevfile(1))
 	    return 1;
    }

--- a/global.c
+++ b/global.c
@@ -226,14 +226,12 @@ void shortcut_init(int unjustify)
 	"", *nano_lastline_msg = "", *nano_refresh_msg =
 	"", *nano_mark_msg = "", *nano_delete_msg =
 	"", *nano_backspace_msg = "", *nano_tab_msg =
-	"", *nano_enter_msg = "", *nano_case_msg =
-	"", *nano_cancel_msg = "", *nano_unjustify_msg = 
-	"", *nano_append_msg = "", *nano_reverse_msg = 
-	"", *nano_regexp_msg = "";
+	"", *nano_enter_msg = "", *nano_cancel_msg = 
+	"", *nano_unjustify_msg = "", *nano_append_msg = ""; 

 #ifndef NANO_SMALL
-    char *nano_tofiles_msg = "";
-    char *nano_gotodir_msg = "";
+    char *nano_tofiles_msg = "", *nano_gotodir_msg = "", *nano_case_msg =
+	"", *nano_reverse_msg = "", *nano_regexp_msg = "";

    nano_help_msg = _("Invoke the help menu");
    nano_writeout_msg = _("Write the current file to disk");
@@ -414,19 +412,22 @@ void shortcut_init(int unjustify)
 		_("Goto Line"), nano_goto_msg, 0, 0, 0, VIEW,
 		do_gotoline_void);

-    sc_init_one(&whereis_list[4], NANO_CANCEL_KEY, _("Cancel"),
-		nano_cancel_msg, 0, 0, 0, VIEW, 0);
-
-    sc_init_one(&whereis_list[5], TOGGLE_CASE_KEY, _("Case Sens"),
+#ifndef NANO_SMALL
+    sc_init_one(&whereis_list[4], TOGGLE_CASE_KEY, _("Case Sens"),
 		nano_case_msg, 0, 0, 0, VIEW, 0);

-    sc_init_one(&whereis_list[6], TOGGLE_BACKWARDS_KEY, _("Backward"),
+    sc_init_one(&whereis_list[5], TOGGLE_BACKWARDS_KEY, _("Backward"),
 		nano_reverse_msg, 0, 0, 0, VIEW, 0);

 #ifdef HAVE_REGEX_H
-    sc_init_one(&whereis_list[7], TOGGLE_REGEXP_KEY, _("Regexp"),
-		nano_regexp_msg, 0, 0, 0, VIEW, 0);
+    sc_init_one(&whereis_list[REPLACE_LIST_LEN - 2], TOGGLE_REGEXP_KEY,
+		_("Regexp"), nano_regexp_msg, 0, 0, 0, VIEW, 0);
 #endif
+#endif /* NANO_SMALL */
+
+    sc_init_one(&whereis_list[REPLACE_LIST_LEN - 1], NANO_CANCEL_KEY,
+		_("Cancel"), nano_cancel_msg, 0, 0, 0, VIEW, 0);
+

    sc_init_one(&replace_list[0], NANO_FIRSTLINE_KEY, _("First Line"),
 		nano_firstline_msg, 0, 0, 0, VIEW, do_first_line);
@@ -441,19 +442,21 @@ void shortcut_init(int unjustify)
 		_("Goto Line"), nano_goto_msg, 0, 0, 0, VIEW,
 		do_gotoline_void);

-    sc_init_one(&replace_list[4], NANO_CANCEL_KEY, _("Cancel"),
-		nano_cancel_msg, 0, 0, 0, VIEW, 0);
-
-    sc_init_one(&replace_list[5], TOGGLE_CASE_KEY, _("Case Sens"),
+#ifndef NANO_SMALL
+    sc_init_one(&replace_list[4], TOGGLE_CASE_KEY, _("Case Sens"),
 		nano_case_msg, 0, 0, 0, VIEW, 0);

-    sc_init_one(&replace_list[6], TOGGLE_BACKWARDS_KEY, _("Backward"),
+    sc_init_one(&replace_list[5], TOGGLE_BACKWARDS_KEY, _("Backward"),
 		nano_reverse_msg, 0, 0, 0, VIEW, 0);

 #ifdef HAVE_REGEX_H
-    sc_init_one(&replace_list[7], TOGGLE_REGEXP_KEY, _("Regexp"),
-		nano_regexp_msg, 0, 0, 0, VIEW, 0);
+    sc_init_one(&replace_list[REPLACE_LIST_LEN - 2], TOGGLE_REGEXP_KEY, 
+		_("Regexp"), nano_regexp_msg, 0, 0, 0, VIEW, 0);
 #endif
+#endif /* NANO_SMALL */
+
+    sc_init_one(&replace_list[REPLACE_LIST_LEN - 1], NANO_CANCEL_KEY,
+		_("Cancel"), nano_cancel_msg, 0, 0, 0, VIEW, 0);


    sc_init_one(&replace_list_2[0], NANO_FIRSTLINE_KEY, _("First Line"),
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for directory with message catalog handling in GNU NLS Utilities.
-# Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,106 +28,75 @@ VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 transform = @program_transform_name@
-libdir = @libdir@
-includedir = @includedir@
-datadir = @datadir@
+libdir = $(exec_prefix)/lib
+includedir = $(prefix)/include
+datadir = $(prefix)/@DATADIRNAME@
 localedir = $(datadir)/locale
-gettextsrcdir = $(datadir)/gettext/intl
-aliaspath = $(localedir)
+gnulocaledir = $(prefix)/share/locale
+gettextsrcdir = @datadir@/gettext/intl
+aliaspath = $(localedir):.
 subdir = intl

 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`

-l = @INTL_LIBTOOL_SUFFIX_PREFIX@
+l = @l@

 AR = ar
 CC = @CC@
 LIBTOOL = @LIBTOOL@
 RANLIB = @RANLIB@
-YACC = @INTLBISON@ -y -d
-YFLAGS = --name-prefix=__gettext

-DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
-DLIBDIR=\"$(libdir)\" @DEFS@
+DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
+-DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@
 CPPFLAGS = @CPPFLAGS@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@

 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)

-HEADERS = $(COMHDRS) libgnuintl.h libgettext.h loadinfo.h
+HEADERS = $(COMHDRS) libgettext.h loadinfo.h
 COMHDRS = gettext.h gettextP.h hash-string.h
-SOURCES = $(COMSRCS) intl-compat.c
+SOURCES = $(COMSRCS) intl-compat.c cat-compat.c
 COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
 finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \
-explodename.c dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \
-localcharset.c
+explodename.c
 OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \
 finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
-explodename.$lo dcigettext.$lo dcngettext.$lo dngettext.$lo ngettext.$lo \
-plural.$lo localcharset.$lo
+explodename.$lo
+CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo
 GETTOBJS = intl-compat.$lo
-DISTFILES.common = Makefile.in \
-config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
-DISTFILES.generated = plural.c
+DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \
+xopen-msg.sed $(HEADERS) $(SOURCES)
 DISTFILES.normal = VERSION
-DISTFILES.gettext = libintl.glibc
-DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c
-
-# Libtool's library version information for libintl.
-# Before making a gettext release, the gettext maintainer must change this
-# according to the libtool documentation, section "Library interface versions".
-# Maintainers of other packages that include the intl directory must *not*
-# change these values.
-LTV_CURRENT=1
-LTV_REVISION=1
-LTV_AGE=0
+DISTFILES.gettext = libintl.glibc intlh.inst.in

 .SUFFIXES:
-.SUFFIXES: .c .y .o .lo .sin .sed
+.SUFFIXES: .c .o .lo
 .c.o:
 	$(COMPILE) $<
 .c.lo:
 	$(LIBTOOL) --mode=compile $(COMPILE) $<

-.y.c:
-	$(YACC) $(YFLAGS) --output $@ $<
-	rm -f $*.h
-
-.sin.sed:
-	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@
-	mv t-$@ $@
-
-INCLUDES = -I.. -I. -I$(top_srcdir)/intl
+INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib

 all: all-@USE_INCLUDED_LIBINTL@
-all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
-all-no: all-no-@BUILD_INCLUDED_LIBINTL@
-all-no-yes: libgnuintl.$la
-all-no-no:

-libintl.a libgnuintl.a: $(OBJECTS)
+all-yes: libintl.$la intlh.inst
+all-no:
+
+libintl.a: $(OBJECTS)
 	rm -f $@
 	$(AR) cru $@ $(OBJECTS)
 	$(RANLIB) $@

-libintl.la libgnuintl.la: $(OBJECTS)
-	$(LIBTOOL) --mode=link \
-	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
-	  $(OBJECTS) @LIBICONV@ \
-	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
-	  -rpath $(libdir) \
-	  -no-undefined
+libintl.la: $(OBJECTS)
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \
+		   -version-info 1:0 -rpath $(libdir)

-libintl.h: libgnuintl.h
-	cp $(srcdir)/libgnuintl.h libintl.h
-
-charset.alias: config.charset
-	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
-	mv t-$@ $@
+../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot
+	cd ../po && $(MAKE) cat-id-tbl.$lo

 check: all

@@ -135,70 +104,36 @@ check: all
 # only use the library should use install instead.

 # We must not install the libintl.h/libintl.a files if we are on a
-# system which has the GNU gettext() function in its C library or in a
-# separate library.
+# system which has the gettext() function in its C library or in a
+# separate library or use the catgets interface.  A special case is
+# where configure found a previously installed GNU gettext library.
 # If you want to use the one which comes with this version of the
 # package, you have to use `configure --with-included-gettext'.
 install: install-exec install-data
 install-exec: all
 	if test "$(PACKAGE)" = "gettext" \
 	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
-	  $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
-	  $(LIBTOOL) --mode=install \
-	    $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
-	else \
-	  : ; \
-	fi
-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir); \
-	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
-	  dest=$(DESTDIR)$(libdir)/charset.alias; \
-	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
-	    orig=$(DESTDIR)$(libdir)/charset.alias; \
-	    sed -f ref-add.sed $$orig > $$temp; \
-	    $(INSTALL_DATA) $$temp $$dest; \
-	    rm -f $$temp; \
+	  if test -r $(MKINSTALLDIRS); then \
+	    $(MKINSTALLDIRS) $(libdir) $(includedir); \
 	  else \
-	    if test @GLIBC21@ = no; then \
-	      orig=charset.alias; \
-	      sed -f ref-add.sed $$orig > $$temp; \
-	      $(INSTALL_DATA) $$temp $$dest; \
-	      rm -f $$temp; \
-	    fi; \
+	    $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
 	  fi; \
-	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
-	  test -f $(DESTDIR)$(localedir)/locale.alias \
-	    && orig=$(DESTDIR)$(localedir)/locale.alias \
-	    || orig=$(srcdir)/locale.alias; \
-	  temp=$(DESTDIR)$(localedir)/t-locale.alias; \
-	  dest=$(DESTDIR)$(localedir)/locale.alias; \
-	  sed -f ref-add.sed $$orig > $$temp; \
-	  $(INSTALL_DATA) $$temp $$dest; \
-	  rm -f $$temp; \
+	  $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
+	  $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
 	else \
 	  : ; \
 	fi
 install-data: all
 	if test "$(PACKAGE)" = "gettext"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
-	  $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
+	  if test -r $(MKINSTALLDIRS); then \
+	    $(MKINSTALLDIRS) $(gettextsrcdir); \
+	  else \
+	    $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+	  fi; \
+	  $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \
 	  dists="$(DISTFILES.common)"; \
 	  for file in $$dists; do \
-	    $(INSTALL_DATA) $(srcdir)/$$file \
-			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	  chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \
-	  dists="$(DISTFILES.generated)"; \
-	  for file in $$dists; do \
-	    if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-	    $(INSTALL_DATA) $$dir/$$file \
-			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	  dists="$(DISTFILES.obsolete)"; \
-	  for file in $$dists; do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	    $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \
 	  done; \
 	else \
 	  : ; \
@@ -208,51 +143,14 @@ install-data: all
 installcheck:

 uninstall:
-	if test "$(PACKAGE)" = "gettext" \
-	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
-	  rm -f $(DESTDIR)$(includedir)/libintl.h; \
-	  $(LIBTOOL) --mode=uninstall \
-	    rm -f $(DESTDIR)$(libdir)/libintl.$la; \
-	else \
-	  : ; \
-	fi
-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
-	    temp=$(DESTDIR)$(libdir)/t-charset.alias; \
-	    dest=$(DESTDIR)$(libdir)/charset.alias; \
-	    sed -f ref-del.sed $$dest > $$temp; \
-	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
-	      rm -f $$dest; \
-	    else \
-	      $(INSTALL_DATA) $$temp $$dest; \
-	    fi; \
-	    rm -f $$temp; \
-	  fi; \
-	  if test -f $(DESTDIR)$(localedir)/locale.alias; then \
-	    temp=$(DESTDIR)$(localedir)/t-locale.alias; \
-	    dest=$(DESTDIR)$(localedir)/locale.alias; \
-	    sed -f ref-del.sed $$dest > $$temp; \
-	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
-	      rm -f $$dest; \
-	    else \
-	      $(INSTALL_DATA) $$temp $$dest; \
-	    fi; \
-	    rm -f $$temp; \
-	  fi; \
-	else \
-	  : ; \
-	fi
-	if test "$(PACKAGE)" = "gettext"; then \
-	  for file in VERSION ChangeLog $(DISTFILES.common) $(DISTFILES.generated); do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
+	dists="$(DISTFILES.common)"; \
+	for file in $$dists; do \
+	  rm -f $(gettextsrcdir)/$$file; \
+	done

 info dvi:

-$(OBJECTS): ../config.h libgnuintl.h
+$(OBJECTS): ../config.h libgettext.h
 bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
 dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h

@@ -268,19 +166,12 @@ ID: $(HEADERS) $(SOURCES)


 mostlyclean:
-	rm -f *.a *.la *.o *.lo core core.*
-	rm -f libintl.h charset.alias ref-add.sed ref-del.sed
-	rm -f -r .libs _libs
+	rm -f *.a *.o *.lo core core.*

 clean: mostlyclean

 distclean: clean
-	rm -f Makefile ID TAGS
-	if test "$(PACKAGE)" = gettext; then \
-	  rm -f ChangeLog.inst $(DISTFILES.normal); \
-	else \
-	  : ; \
-	fi
+	rm -f Makefile ID TAGS po2msg.sed po2tbl.sed libintl.h

 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
@@ -290,23 +181,34 @@ maintainer-clean: distclean
 # GNU gettext needs not contain the file `VERSION' but contains some
 # other files which should not be distributed in other packages.
 distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: Makefile
+dist distdir: Makefile $(DISTFILES)
 	if test "$(PACKAGE)" = gettext; then \
 	  additional="$(DISTFILES.gettext)"; \
 	else \
 	  additional="$(DISTFILES.normal)"; \
 	fi; \
-	$(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
-	for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
-	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-	  ln $$dir/$$file $(distdir) 2> /dev/null \
-	    || cp -p $$dir/$$file $(distdir); \
+	for file in $(DISTFILES.common) $$additional; do \
+	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
+	    || cp -p $(srcdir)/$$file $(distdir); \
 	done

+dist-libc:
+	tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc
+
 Makefile: Makefile.in ../config.status
 	cd .. \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

+# The dependency for intlh.inst is different in gettext and all other
+# packages.  Because we cannot you GNU make features we have to solve
+# the problem while rewriting Makefile.in.
+@GT_YES@intlh.inst: intlh.inst.in ../config.status
+@GT_YES@	cd .. \
+@GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
+@GT_YES@	  $(SHELL) ./config.status
+@GT_NO@.PHONY: intlh.inst
+@GT_NO@intlh.inst:
+
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- a/intl/VERSION
+++ b/intl/VERSION
@@ -1 +1 @@
-GNU gettext library from gettext-0.10.38
+GNU gettext library from gettext-0.10.35
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -1,5 +1,5 @@
 /* Implementation of the bindtextdomain(3) function
-   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,40 +19,33 @@
 # include <config.h>
 #endif

-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#else
+# ifdef HAVE_MALLOC_H
+#  include <malloc.h>
+# else
+void free ();
+# endif
+#endif
+
+#if defined HAVE_STRING_H || defined _LIBC
+# include <string.h>
+#else
+# include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif

 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgnuintl.h"
+# include "libgettext.h"
 #endif
+#include "gettext.h"
 #include "gettextP.h"

-#ifdef _LIBC
-/* We have to handle multi-threaded applications.  */
-# include <bits/libc-lock.h>
-#else
-/* Provide dummy implementation if this is outside glibc.  */
-# define __libc_rwlock_define(CLASS, NAME)
-# define __libc_rwlock_wrlock(NAME)
-# define __libc_rwlock_unlock(NAME)
-#endif
-
-/* The internal variables in the standalone libintl.a must have different
-   names than the internal variables in GNU libc, otherwise programs
-   using libintl.a cannot be linked statically.  */
-#if !defined _LIBC
-# define _nl_default_dirname _nl_default_dirname__
-# define _nl_domain_bindings _nl_domain_bindings__
-#endif
-
-/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>.  */
-#ifndef offsetof
-# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
-#endif
-
 /* @@ end of prolog @@ */

 /* Contains the default location of the message catalogs.  */
@@ -61,9 +54,6 @@ extern const char _nl_default_dirname[];
 /* List with bindings of specific domains.  */
 extern struct binding *_nl_domain_bindings;

-/* Lock variable to protect the global data in the gettext implementation.  */
-__libc_rwlock_define (extern, _nl_state_lock)
-

 /* Names for the libintl functions are a problem.  They must not clash
   with existing names and they should follow ANSI C.  But this source
@@ -71,48 +61,25 @@ __libc_rwlock_define (extern, _nl_state_lock)
   prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define BINDTEXTDOMAIN __bindtextdomain
-# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset
 # ifndef strdup
 #  define strdup(str) __strdup (str)
 # endif
 #else
 # define BINDTEXTDOMAIN bindtextdomain__
-# define BIND_TEXTDOMAIN_CODESET bind_textdomain_codeset__
 #endif

-/* Prototypes for local functions.  */
-static void set_binding_values PARAMS ((const char *domainname,
-					const char **dirnamep,
-					const char **codesetp));
-     
-/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
-   to be used for the DOMAINNAME message catalog.
-   If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not
-   modified, only the current value is returned.
-   If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
-   modified nor returned.  */
-static void
-set_binding_values (domainname, dirnamep, codesetp)
+/* Specify that the DOMAINNAME message catalog will be found
+   in DIRNAME rather than in the system locale data base.  */
+char *
+BINDTEXTDOMAIN (domainname, dirname)
     const char *domainname;
-     const char **dirnamep;
-     const char **codesetp;
+     const char *dirname;
 {
  struct binding *binding;
-  int modified;

  /* Some sanity checks.  */
  if (domainname == NULL || domainname[0] == '\0')
-    {
-      if (dirnamep)
-	*dirnamep = NULL;
-      if (codesetp)
-	*codesetp = NULL;
-      return;
-    }
-
-  __libc_rwlock_wrlock (_nl_state_lock);
-
-  modified = 0;
+    return NULL;

  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
    {
@@ -128,173 +95,83 @@ set_binding_values (domainname, dirnamep, codesetp)
 	}
    }

+  if (dirname == NULL)
+    /* The current binding has be to returned.  */
+    return binding == NULL ? (char *) _nl_default_dirname : binding->dirname;
+
  if (binding != NULL)
    {
-      if (dirnamep)
+      /* The domain is already bound.  If the new value and the old
+	 one are equal we simply do nothing.  Otherwise replace the
+	 old binding.  */
+      if (strcmp (dirname, binding->dirname) != 0)
 	{
-	  const char *dirname = *dirnamep;
+	  char *new_dirname;

-	  if (dirname == NULL)
-	    /* The current binding has be to returned.  */
-	    *dirnamep = binding->dirname;
+	  if (strcmp (dirname, _nl_default_dirname) == 0)
+	    new_dirname = (char *) _nl_default_dirname;
 	  else
 	    {
-	      /* The domain is already bound.  If the new value and the old
-		 one are equal we simply do nothing.  Otherwise replace the
-		 old binding.  */
-	      char *result = binding->dirname;
-	      if (strcmp (dirname, result) != 0)
-		{
-		  if (strcmp (dirname, _nl_default_dirname) == 0)
-		    result = (char *) _nl_default_dirname;
-		  else
-		    {
 #if defined _LIBC || defined HAVE_STRDUP
-		      result = strdup (dirname);
+	      new_dirname = strdup (dirname);
+	      if (new_dirname == NULL)
+		return NULL;
 #else
-		      size_t len = strlen (dirname) + 1;
-		      result = (char *) malloc (len);
-		      if (__builtin_expect (result != NULL, 1))
-			memcpy (result, dirname, len);
+	      size_t len = strlen (dirname) + 1;
+	      new_dirname = (char *) malloc (len);
+	      if (new_dirname == NULL)
+		return NULL;
+
+	      memcpy (new_dirname, dirname, len);
 #endif
-		    }
-
-		  if (__builtin_expect (result != NULL, 1))
-		    {
-		      if (binding->dirname != _nl_default_dirname)
-			free (binding->dirname);
-
-		      binding->dirname = result;
-		      modified = 1;
-		    }
-		}
-	      *dirnamep = result;
 	    }
+
+	  if (binding->dirname != _nl_default_dirname)
+	    free (binding->dirname);
+
+	  binding->dirname = new_dirname;
 	}
-
-      if (codesetp)
-	{
-	  const char *codeset = *codesetp;
-
-	  if (codeset == NULL)
-	    /* The current binding has be to returned.  */
-	    *codesetp = binding->codeset;
-	  else
-	    {
-	      /* The domain is already bound.  If the new value and the old
-		 one are equal we simply do nothing.  Otherwise replace the
-		 old binding.  */
-	      char *result = binding->codeset;
-	      if (result == NULL || strcmp (codeset, result) != 0)
-		{
-#if defined _LIBC || defined HAVE_STRDUP
-		  result = strdup (codeset);
-#else
-		  size_t len = strlen (codeset) + 1;
-		  result = (char *) malloc (len);
-		  if (__builtin_expect (result != NULL, 1))
-		    memcpy (result, codeset, len);
-#endif
-
-		  if (__builtin_expect (result != NULL, 1))
-		    {
-		      if (binding->codeset != NULL)
-			free (binding->codeset);
-
-		      binding->codeset = result;
-		      binding->codeset_cntr++;
-		      modified = 1;
-		    }
-		}
-	      *codesetp = result;
-	    }
-	}
-    }
-  else if ((dirnamep == NULL || *dirnamep == NULL)
-	   && (codesetp == NULL || *codesetp == NULL))
-    {
-      /* Simply return the default values.  */
-      if (dirnamep)
-	*dirnamep = _nl_default_dirname;
-      if (codesetp)
-	*codesetp = NULL;
    }
  else
    {
      /* We have to create a new binding.  */
-      size_t len = strlen (domainname) + 1;
+#if !defined _LIBC && !defined HAVE_STRDUP
+      size_t len;
+#endif
      struct binding *new_binding =
-	(struct binding *) malloc (offsetof (struct binding, domainname) + len);
+	(struct binding *) malloc (sizeof (*new_binding));

-      if (__builtin_expect (new_binding == NULL, 0))
-	goto failed;
+      if (new_binding == NULL)
+	return NULL;

+#if defined _LIBC || defined HAVE_STRDUP
+      new_binding->domainname = strdup (domainname);
+      if (new_binding->domainname == NULL)
+	return NULL;
+#else
+      len = strlen (domainname) + 1;
+      new_binding->domainname = (char *) malloc (len);
+      if (new_binding->domainname == NULL)
+	return NULL;
      memcpy (new_binding->domainname, domainname, len);
-
-      if (dirnamep)
-	{
-	  const char *dirname = *dirnamep;
-
-	  if (dirname == NULL)
-	    /* The default value.  */
-	    dirname = _nl_default_dirname;
-	  else
-	    {
-	      if (strcmp (dirname, _nl_default_dirname) == 0)
-		dirname = _nl_default_dirname;
-	      else
-		{
-		  char *result;
-#if defined _LIBC || defined HAVE_STRDUP
-		  result = strdup (dirname);
-		  if (__builtin_expect (result == NULL, 0))
-		    goto failed_dirname;
-#else
-		  size_t len = strlen (dirname) + 1;
-		  result = (char *) malloc (len);
-		  if (__builtin_expect (result == NULL, 0))
-		    goto failed_dirname;
-		  memcpy (result, dirname, len);
 #endif
-		  dirname = result;
-		}
-	    }
-	  *dirnamep = dirname;
-	  new_binding->dirname = (char *) dirname;
-	}
-      else
-	/* The default value.  */
+
+      if (strcmp (dirname, _nl_default_dirname) == 0)
 	new_binding->dirname = (char *) _nl_default_dirname;
-
-      new_binding->codeset_cntr = 0;
-
-      if (codesetp)
-	{
-	  const char *codeset = *codesetp;
-
-	  if (codeset != NULL)
-	    {
-	      char *result;
-
-#if defined _LIBC || defined HAVE_STRDUP
-	      result = strdup (codeset);
-	      if (__builtin_expect (result == NULL, 0))
-		goto failed_codeset;
-#else
-	      size_t len = strlen (codeset) + 1;
-	      result = (char *) malloc (len);
-	      if (__builtin_expect (result == NULL, 0))
-		goto failed_codeset;
-	      memcpy (result, codeset, len);
-#endif
-	      codeset = result;
-	      new_binding->codeset_cntr++;
-	    }
-	  *codesetp = codeset;
-	  new_binding->codeset = (char *) codeset;
-	}
      else
-	new_binding->codeset = NULL;
+	{
+#if defined _LIBC || defined HAVE_STRDUP
+	  new_binding->dirname = strdup (dirname);
+	  if (new_binding->dirname == NULL)
+	    return NULL;
+#else
+	  len = strlen (dirname) + 1;
+	  new_binding->dirname = (char *) malloc (len);
+	  if (new_binding->dirname == NULL)
+	    return NULL;
+	  memcpy (new_binding->dirname, dirname, len);
+#endif
+	}

      /* Now enqueue it.  */
      if (_nl_domain_bindings == NULL
@@ -314,55 +191,13 @@ set_binding_values (domainname, dirnamep, codesetp)
 	  binding->next = new_binding;
 	}

-      modified = 1;
-
-      /* Here we deal with memory allocation failures.  */
-      if (0)
-	{
-	failed_codeset:
-	  if (new_binding->dirname != _nl_default_dirname)
-	    free (new_binding->dirname);
-	failed_dirname:
-	  free (new_binding);
-	failed:
-	  if (dirnamep)
-	    *dirnamep = NULL;
-	  if (codesetp)
-	    *codesetp = NULL;
-	}
+      binding = new_binding;
    }

-  /* If we modified any binding, we flush the caches.  */
-  if (modified)
-    ++_nl_msg_cat_cntr;
-
-  __libc_rwlock_unlock (_nl_state_lock);
-}
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-char *
-BINDTEXTDOMAIN (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
-{
-  set_binding_values (domainname, &dirname, NULL);
-  return (char *) dirname;
-}
-
-/* Specify the character encoding in which the messages from the
-   DOMAINNAME message catalog will be returned.  */
-char *
-BIND_TEXTDOMAIN_CODESET (domainname, codeset)
-     const char *domainname;
-     const char *codeset;
-{
-  set_binding_values (domainname, NULL, &codeset);
-  return (char *) codeset;
+  return binding->dirname;
 }

 #ifdef _LIBC
-/* Aliases for function names in GNU C Library.  */
+/* Alias for function name in GNU C Library.  */
 weak_alias (__bindtextdomain, bindtextdomain);
-weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset);
 #endif
--- a/intl/config.charset
+++ b/intl/config.charset
@@ -1,438 +0,0 @@
-#! /bin/sh
-# Output a system dependent table of character encoding aliases.
-#
-#   Copyright (C) 2000-2001 Free Software Foundation, Inc.
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Library General Public License as published
-#   by the Free Software Foundation; either version 2, or (at your option)
-#   any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Library General Public License for more details.
-#
-#   You should have received a copy of the GNU Library General Public
-#   License along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-#   USA.
-#
-# The table consists of lines of the form
-#    ALIAS  CANONICAL
-#
-# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
-# ALIAS is compared in a case sensitive way.
-#
-# CANONICAL is the GNU canonical name for this character encoding.
-# It must be an encoding supported by libiconv. Support by GNU libc is
-# also desirable. CANONICAL is case insensitive. Usually an upper case
-# MIME charset name is preferred.
-# The current list of GNU canonical charset names is as follows.
-#
-#       name                         used by which systems         a MIME name?
-#   ASCII, ANSI_X3.4-1968     glibc solaris freebsd
-#   ISO-8859-1                glibc aix hpux irix osf solaris freebsd   yes
-#   ISO-8859-2                glibc aix hpux irix osf solaris freebsd   yes
-#   ISO-8859-3                glibc                                     yes
-#   ISO-8859-4                osf solaris freebsd                       yes
-#   ISO-8859-5                glibc aix hpux irix osf solaris freebsd   yes
-#   ISO-8859-6                glibc aix hpux solaris                    yes
-#   ISO-8859-7                glibc aix hpux irix osf solaris           yes
-#   ISO-8859-8                glibc aix hpux osf solaris                yes
-#   ISO-8859-9                glibc aix hpux irix osf solaris           yes
-#   ISO-8859-13               glibc
-#   ISO-8859-15               glibc aix osf solaris freebsd
-#   KOI8-R                    glibc solaris freebsd                     yes
-#   KOI8-U                    glibc freebsd                             yes
-#   CP437                     dos
-#   CP775                     dos
-#   CP850                     aix osf dos
-#   CP852                     dos
-#   CP855                     dos
-#   CP856                     aix
-#   CP857                     dos
-#   CP861                     dos
-#   CP862                     dos
-#   CP864                     dos
-#   CP865                     dos
-#   CP866                     freebsd dos
-#   CP869                     dos
-#   CP874                     win32 dos
-#   CP922                     aix
-#   CP932                     aix win32 dos
-#   CP943                     aix
-#   CP949                     osf win32 dos
-#   CP950                     win32 dos
-#   CP1046                    aix
-#   CP1124                    aix
-#   CP1129                    aix
-#   CP1250                    win32
-#   CP1251                    glibc win32
-#   CP1252                    aix win32
-#   CP1253                    win32
-#   CP1254                    win32
-#   CP1255                    win32
-#   CP1256                    win32
-#   CP1257                    win32
-#   GB2312                    glibc aix hpux irix solaris freebsd       yes
-#   EUC-JP                    glibc aix hpux irix osf solaris freebsd   yes
-#   EUC-KR                    glibc aix hpux irix osf solaris freebsd   yes
-#   EUC-TW                    glibc aix hpux irix osf solaris
-#   BIG5                      glibc aix hpux osf solaris freebsd        yes
-#   BIG5HKSCS                 glibc
-#   GBK                       aix osf win32 dos
-#   GB18030                   glibc
-#   SJIS                      hpux osf solaris freebsd
-#   JOHAB                     glibc win32
-#   TIS-620                   glibc aix hpux osf solaris
-#   VISCII                    glibc                                     yes
-#   HP-ROMAN8                 hpux
-#   HP-ARABIC8                hpux
-#   HP-GREEK8                 hpux
-#   HP-HEBREW8                hpux
-#   HP-TURKISH8               hpux
-#   HP-KANA8                  hpux
-#   DEC-KANJI                 osf
-#   DEC-HANYU                 osf
-#   UTF-8                     glibc aix hpux osf solaris                yes
-#
-# Note: Names which are not marked as being a MIME name should not be used in
-# Internet protocols for information interchange (mail, news, etc.).
-#
-# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
-# must understand both names and treat them as equivalent.
-#
-# The first argument passed to this file is the canonical host specification,
-#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or
-#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-
-host="$1"
-os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
-echo "# This file contains a table of character encoding aliases,"
-echo "# suitable for operating system '${os}'."
-echo "# It was automatically generated from config.charset."
-# List of references, updated during installation:
-echo "# Packages using this file: "
-case "$os" in
-    linux* | *-gnu*)
-	# With glibc-2.1 or newer, we don't need any canonicalization,
-	# because glibc has iconv and both glibc and libiconv support all
-	# GNU canonical names directly. Therefore, the Makefile does not
-	# need to install the alias file at all.
-	# The following applies only to glibc-2.0.x and older libcs.
-	echo "ISO_646.IRV:1983 ASCII"
-	;;
-    aix*)
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-6 ISO-8859-6"
-	echo "ISO8859-7 ISO-8859-7"
-	echo "ISO8859-8 ISO-8859-8"
-	echo "ISO8859-9 ISO-8859-9"
-	echo "ISO8859-15 ISO-8859-15"
-	echo "IBM-850 CP850"
-	echo "IBM-856 CP856"
-	echo "IBM-921 ISO-8859-13"
-	echo "IBM-922 CP922"
-	echo "IBM-932 CP932"
-	echo "IBM-943 CP943"
-	echo "IBM-1046 CP1046"
-	echo "IBM-1124 CP1124"
-	echo "IBM-1129 CP1129"
-	echo "IBM-1252 CP1252"
-	echo "IBM-eucCN GB2312"
-	echo "IBM-eucJP EUC-JP"
-	echo "IBM-eucKR EUC-KR"
-	echo "IBM-eucTW EUC-TW"
-	echo "big5 BIG5"
-	echo "GBK GBK"
-	echo "TIS-620 TIS-620"
-	echo "UTF-8 UTF-8"
-	;;
-    hpux*)
-	echo "iso88591 ISO-8859-1"
-	echo "iso88592 ISO-8859-2"
-	echo "iso88595 ISO-8859-5"
-	echo "iso88596 ISO-8859-6"
-	echo "iso88597 ISO-8859-7"
-	echo "iso88598 ISO-8859-8"
-	echo "iso88599 ISO-8859-9"
-	echo "iso885915 ISO-8859-15"
-	echo "roman8 HP-ROMAN8"
-	echo "arabic8 HP-ARABIC8"
-	echo "greek8 HP-GREEK8"
-	echo "hebrew8 HP-HEBREW8"
-	echo "turkish8 HP-TURKISH8"
-	echo "kana8 HP-KANA8"
-	echo "tis620 TIS-620"
-	echo "big5 BIG5"
-	echo "eucJP EUC-JP"
-	echo "eucKR EUC-KR"
-	echo "eucTW EUC-TW"
-	echo "hp15CN GB2312"
-	#echo "ccdc ?" # what is this?
-	echo "SJIS SJIS"
-	echo "utf8 UTF-8"
-	;;
-    irix*)
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-7 ISO-8859-7"
-	echo "ISO8859-9 ISO-8859-9"
-	echo "eucCN GB2312"
-	echo "eucJP EUC-JP"
-	echo "eucKR EUC-KR"
-	echo "eucTW EUC-TW"
-	;;
-    osf*)
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-4 ISO-8859-4"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-7 ISO-8859-7"
-	echo "ISO8859-8 ISO-8859-8"
-	echo "ISO8859-9 ISO-8859-9"
-	echo "ISO8859-15 ISO-8859-15"
-	echo "cp850 CP850"
-	echo "big5 BIG5"
-	echo "dechanyu DEC-HANYU"
-	echo "dechanzi GB2312"
-	echo "deckanji DEC-KANJI"
-	echo "deckorean EUC-KR"
-	echo "eucJP EUC-JP"
-	echo "eucKR EUC-KR"
-	echo "eucTW EUC-TW"
-	echo "GBK GBK"
-	echo "KSC5601 CP949"
-	echo "sdeckanji EUC-JP"
-	echo "SJIS SJIS"
-	echo "TACTIS TIS-620"
-	echo "UTF-8 UTF-8"
-	;;
-    solaris*)
-	echo "646 ASCII"
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-4 ISO-8859-4"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-6 ISO-8859-6"
-	echo "ISO8859-7 ISO-8859-7"
-	echo "ISO8859-8 ISO-8859-8"
-	echo "ISO8859-9 ISO-8859-9"
-	echo "ISO8859-15 ISO-8859-15"
-	echo "koi8-r KOI8-R"
-	echo "BIG5 BIG5"
-	echo "gb2312 GB2312"
-	echo "cns11643 EUC-TW"
-	echo "5601 EUC-KR"
-	echo "eucJP EUC-JP"
-	echo "PCK SJIS"
-	echo "TIS620.2533 TIS-620"
-	#echo "sun_eu_greek ?" # what is this?
-	echo "UTF-8 UTF-8"
-	;;
-    freebsd*)
-	# FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
-	# localcharset.c falls back to using the full locale name
-	# from the environment variables.
-	echo "C ASCII"
-	echo "US-ASCII ASCII"
-	for l in la_LN lt_LN; do
-	  echo "$l.ASCII ASCII"
-	done
-	for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
-	         fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
-	         lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
-	  echo "$l.ISO_8859-1 ISO-8859-1"
-	  echo "$l.DIS_8859-15 ISO-8859-15"
-	done
-	for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
-	  echo "$l.ISO_8859-2 ISO-8859-2"
-	done
-	for l in la_LN lt_LT; do
-	  echo "$l.ISO_8859-4 ISO-8859-4"
-	done
-	for l in ru_RU ru_SU; do
-	  echo "$l.KOI8-R KOI8-R"
-	  echo "$l.ISO_8859-5 ISO-8859-5"
-	  echo "$l.CP866 CP866"
-	done
-	echo "uk_UA.KOI8-U KOI8-U"
-	echo "zh_TW.BIG5 BIG5"
-	echo "zh_TW.Big5 BIG5"
-	echo "zh_CN.EUC GB2312"
-	echo "ja_JP.EUC EUC-JP"
-	echo "ja_JP.SJIS SJIS"
-	echo "ja_JP.Shift_JIS SJIS"
-	echo "ko_KR.EUC EUC-KR"
-	;;
-    beos*)
-	# BeOS has a single locale, and it has UTF-8 encoding.
-	echo "* UTF-8"
-	;;
-    msdosdjgpp*)
-	# DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
-	# localcharset.c falls back to using the full locale name
-	# from the environment variables.
-	echo "#"
-	echo "# The encodings given here may not all be correct."
-	echo "# If you find that the encoding given for your language and"
-	echo "# country is not the one your DOS machine actually uses, just"
-	echo "# correct it in this file, and send a mail to"
-	echo "# Juan Manuel Guerrero <st001906@hrz1.hrz.tu-darmstadt.de>"
-	echo "# and Bruno Haible <haible@clisp.cons.org>."
-	echo "#"
-	echo "C ASCII"
-	# ISO-8859-1 languages
-	echo "ca CP850"
-	echo "ca_ES CP850"
-	echo "da CP865"    # not CP850 ??
-	echo "da_DK CP865" # not CP850 ??
-	echo "de CP850"
-	echo "de_AT CP850"
-	echo "de_CH CP850"
-	echo "de_DE CP850"
-	echo "en CP850"
-	echo "en_AU CP850" # not CP437 ??
-	echo "en_CA CP850"
-	echo "en_GB CP850"
-	echo "en_NZ CP437"
-	echo "en_US CP437"
-	echo "en_ZA CP850" # not CP437 ??
-	echo "es CP850"
-	echo "es_AR CP850"
-	echo "es_BO CP850"
-	echo "es_CL CP850"
-	echo "es_CO CP850"
-	echo "es_CR CP850"
-	echo "es_CU CP850"
-	echo "es_DO CP850"
-	echo "es_EC CP850"
-	echo "es_ES CP850"
-	echo "es_GT CP850"
-	echo "es_HN CP850"
-	echo "es_MX CP850"
-	echo "es_NI CP850"
-	echo "es_PA CP850"
-	echo "es_PY CP850"
-	echo "es_PE CP850"
-	echo "es_SV CP850"
-	echo "es_UY CP850"
-	echo "es_VE CP850"
-	echo "et CP850"
-	echo "et_EE CP850"
-	echo "eu CP850"
-	echo "eu_ES CP850"
-	echo "fi CP850"
-	echo "fi_FI CP850"
-	echo "fr CP850"
-	echo "fr_BE CP850"
-	echo "fr_CA CP850"
-	echo "fr_CH CP850"
-	echo "fr_FR CP850"
-	echo "ga CP850"
-	echo "ga_IE CP850"
-	echo "gd CP850"
-	echo "gd_GB CP850"
-	echo "gl CP850"
-	echo "gl_ES CP850"
-	echo "id CP850"    # not CP437 ??
-	echo "id_ID CP850" # not CP437 ??
-	echo "is CP861"    # not CP850 ??
-	echo "is_IS CP861" # not CP850 ??
-	echo "it CP850"
-	echo "it_CH CP850"
-	echo "it_IT CP850"
-	echo "lt CP775"
-	echo "lt_LT CP775"
-	echo "lv CP775"
-	echo "lv_LV CP775"
-	echo "nb CP865"    # not CP850 ??
-	echo "nb_NO CP865" # not CP850 ??
-	echo "nl CP850"
-	echo "nl_BE CP850"
-	echo "nl_NL CP850"
-	echo "nn CP865"    # not CP850 ??
-	echo "nn_NO CP865" # not CP850 ??
-	echo "no CP865"    # not CP850 ??
-	echo "no_NO CP865" # not CP850 ??
-	echo "pt CP850"
-	echo "pt_BR CP850"
-	echo "pt_PT CP850"
-	echo "sv CP850"
-	echo "sv_SE CP850"
-	# ISO-8859-2 languages
-	echo "cs CP852"
-	echo "cs_CZ CP852"
-	echo "hr CP852"
-	echo "hr_HR CP852"
-	echo "hu CP852"
-	echo "hu_HU CP852"
-	echo "pl CP852"
-	echo "pl_PL CP852"
-	echo "ro CP852"
-	echo "ro_RO CP852"
-	echo "sk CP852"
-	echo "sk_SK CP852"
-	echo "sl CP852"
-	echo "sl_SI CP852"
-	echo "sq CP852"
-	echo "sq_AL CP852"
-	echo "sr CP852"    # CP852 or CP866 or CP855 ??
-	echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
-	# ISO-8859-3 languages
-	echo "mt CP850"
-	echo "mt_MT CP850"
-	# ISO-8859-5 languages
-	echo "be CP866"
-	echo "be_BE CP866"
-	echo "bg CP866"    # not CP855 ??
-	echo "bg_BG CP866" # not CP855 ??
-	echo "mk CP866"    # not CP855 ??
-	echo "mk_MK CP866" # not CP855 ??
-	echo "ru KOI8-R"    # not CP866 ??
-	echo "ru_RU KOI8-R" # not CP866 ??
-	# ISO-8859-6 languages
-	echo "ar CP864"
-	echo "ar_AE CP864"
-	echo "ar_DZ CP864"
-	echo "ar_EG CP864"
-	echo "ar_IQ CP864"
-	echo "ar_IR CP864"
-	echo "ar_JO CP864"
-	echo "ar_KW CP864"
-	echo "ar_MA CP864"
-	echo "ar_OM CP864"
-	echo "ar_QA CP864"
-	echo "ar_SA CP864"
-	echo "ar_SY CP864"
-	# ISO-8859-7 languages
-	echo "el CP869"
-	echo "el_GR CP869"
-	# ISO-8859-8 languages
-	echo "he CP862"
-	echo "he_IL CP862"
-	# ISO-8859-9 languages
-	echo "tr CP857"
-	echo "tr_TR CP857"
-	# Japanese
-	echo "ja CP932"
-	echo "ja_JP CP932"
-	# Chinese
-	echo "zh_CN GBK"
-	echo "zh_TW CP950" # not CP938 ??
-	# Korean
-	echo "kr CP949"    # not CP934 ??
-	echo "kr_KR CP949" # not CP934 ??
-	# Thai
-	echo "th CP874"
-	echo "th_TH CP874"
-	# Other
-	echo "eo CP850"
-	echo "eo_EO CP850"
-	;;
-esac
--- a/intl/dcgettext.c
+++ b/intl/dcgettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dcgettext(3) function.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,25 +19,220 @@
 # include <config.h>
 #endif

+#include <sys/types.h>
+
+#if defined __GNUC__ && !defined C_ALLOCA
+# define alloca __builtin_alloca
+# define HAVE_ALLOCA 1
+#else
+# if (defined HAVE_ALLOCA_H || defined _LIBC) && !defined C_ALLOCA
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+ #pragma alloca
+#  else
+#   ifndef alloca
+char *alloca ();
+#   endif
+#  endif
+# endif
+#endif
+
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+#ifndef __set_errno
+# define __set_errno(val) errno = (val)
+#endif
+
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#else
+char *getenv ();
+# ifdef HAVE_MALLOC_H
+#  include <malloc.h>
+# else
+void free ();
+# endif
+#endif
+
+#if defined HAVE_STRING_H || defined _LIBC
+# ifndef _GNU_SOURCE
+#  define _GNU_SOURCE	1
+# endif
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+#if !HAVE_STRCHR && !defined _LIBC
+# ifndef strchr
+#  define strchr index
+# endif
+#endif
+
+#if defined HAVE_UNISTD_H || defined _LIBC
+# include <unistd.h>
+#endif
+
+#include "gettext.h"
 #include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgnuintl.h"
+# include "libgettext.h"
 #endif
+#include "hash-string.h"

 /* @@ end of prolog @@ */

+#ifdef _LIBC
+/* Rename the non ANSI C functions.  This is required by the standard
+   because some ANSI C functions will require linking with this object
+   file and the name space must not be polluted.  */
+# define getcwd __getcwd
+# ifndef stpcpy
+#  define stpcpy __stpcpy
+# endif
+#else
+# if !defined HAVE_GETCWD
+char *getwd ();
+#  define getcwd(buf, max) getwd (buf)
+# else
+char *getcwd ();
+# endif
+# ifndef HAVE_STPCPY
+static char *stpcpy PARAMS ((char *dest, const char *src));
+# endif
+#endif
+
+/* Amount to increase buffer size by in each try.  */
+#define PATH_INCR 32
+
+/* The following is from pathmax.h.  */
+/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
+   PATH_MAX but might cause redefinition warnings when sys/param.h is
+   later included (as on MORE/BSD 4.3).  */
+#if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__))
+# include <limits.h>
+#endif
+
+#ifndef _POSIX_PATH_MAX
+# define _POSIX_PATH_MAX 255
+#endif
+
+#if !defined(PATH_MAX) && defined(_PC_PATH_MAX)
+# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
+#endif
+
+/* Don't include sys/param.h if it already has been.  */
+#if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN)
+# include <sys/param.h>
+#endif
+
+#if !defined(PATH_MAX) && defined(MAXPATHLEN)
+# define PATH_MAX MAXPATHLEN
+#endif
+
+#ifndef PATH_MAX
+# define PATH_MAX _POSIX_PATH_MAX
+#endif
+
+/* XPG3 defines the result of `setlocale (category, NULL)' as:
+   ``Directs `setlocale()' to query `category' and return the current
+     setting of `local'.''
+   However it does not specify the exact format.  And even worse: POSIX
+   defines this not at all.  So we can use this feature only on selected
+   system (e.g. those using GNU C Library).  */
+#ifdef _LIBC
+# define HAVE_LOCALE_NULL
+#endif
+
+/* Name of the default domain used for gettext(3) prior any call to
+   textdomain(3).  The default value for this is "messages".  */
+const char _nl_default_default_domain[] = "messages";
+
+/* Value used as the default domain for gettext(3).  */
+const char *_nl_current_default_domain = _nl_default_default_domain;
+
+/* Contains the default location of the message catalogs.  */
+const char _nl_default_dirname[] = GNULOCALEDIR;
+
+/* List with bindings of specific domains created by bindtextdomain()
+   calls.  */
+struct binding *_nl_domain_bindings;
+
+/* Prototypes for local functions.  */
+static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file,
+			       const char *msgid)) internal_function;
+static const char *category_to_name PARAMS ((int category)) internal_function;
+static const char *guess_category_value PARAMS ((int category,
+						 const char *categoryname))
+     internal_function;
+
+
+/* For those loosing systems which don't have `alloca' we have to add
+   some additional code emulating it.  */
+#ifdef HAVE_ALLOCA
+/* Nothing has to be done.  */
+# define ADD_BLOCK(list, address) /* nothing */
+# define FREE_BLOCKS(list) /* nothing */
+#else
+struct block_list
+{
+  void *address;
+  struct block_list *next;
+};
+# define ADD_BLOCK(list, addr)						      \
+  do {									      \
+    struct block_list *newp = (struct block_list *) malloc (sizeof (*newp));  \
+    /* If we cannot get a free block we cannot add the new element to	      \
+       the list.  */							      \
+    if (newp != NULL) {							      \
+      newp->address = (addr);						      \
+      newp->next = (list);						      \
+      (list) = newp;							      \
+    }									      \
+  } while (0)
+# define FREE_BLOCKS(list)						      \
+  do {									      \
+    while (list != NULL) {						      \
+      struct block_list *old = list;					      \
+      list = list->next;						      \
+      free (old);							      \
+    }									      \
+  } while (0)
+# undef alloca
+# define alloca(size) (malloc (size))
+#endif	/* have alloca */
+
+
 /* Names for the libintl functions are a problem.  They must not clash
   with existing names and they should follow ANSI C.  But this source
   code is also used in GNU C Library where the names have a __
   prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define DCGETTEXT __dcgettext
-# define DCIGETTEXT __dcigettext
 #else
 # define DCGETTEXT dcgettext__
-# define DCIGETTEXT dcigettext__
+#endif
+
+/* Checking whether the binaries runs SUID must be done and glibc provides
+   easier methods therefore we make a difference here.  */
+#ifdef _LIBC
+# define ENABLE_SECURE __libc_enable_secure
+# define DETERMINE_SECURE
+#else
+static int enable_secure;
+# define ENABLE_SECURE (enable_secure == 1)
+# define DETERMINE_SECURE \
+  if (enable_secure == 0)						      \
+    {									      \
+      if (getuid () != geteuid () || getgid () != getegid ())		      \
+	enable_secure = 1;						      \
+      else								      \
+	enable_secure = -1;						      \
+    }
 #endif

 /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
@@ -48,10 +243,413 @@ DCGETTEXT (domainname, msgid, category)
     const char *msgid;
     int category;
 {
-  return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category);
+#ifndef HAVE_ALLOCA
+  struct block_list *block_list = NULL;
+#endif
+  struct loaded_l10nfile *domain;
+  struct binding *binding;
+  const char *categoryname;
+  const char *categoryvalue;
+  char *dirname, *xdomainname;
+  char *single_locale;
+  char *retval;
+  int saved_errno = errno;
+
+  /* If no real MSGID is given return NULL.  */
+  if (msgid == NULL)
+    return NULL;
+
+  /* See whether this is a SUID binary or not.  */
+  DETERMINE_SECURE;
+
+  /* If DOMAINNAME is NULL, we are interested in the default domain.  If
+     CATEGORY is not LC_MESSAGES this might not make much sense but the
+     definition left this undefined.  */
+  if (domainname == NULL)
+    domainname = _nl_current_default_domain;
+
+  /* First find matching binding.  */
+  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
+    {
+      int compare = strcmp (domainname, binding->domainname);
+      if (compare == 0)
+	/* We found it!  */
+	break;
+      if (compare < 0)
+	{
+	  /* It is not in the list.  */
+	  binding = NULL;
+	  break;
+	}
+    }
+
+  if (binding == NULL)
+    dirname = (char *) _nl_default_dirname;
+  else if (binding->dirname[0] == '/')
+    dirname = binding->dirname;
+  else
+    {
+      /* We have a relative path.  Make it absolute now.  */
+      size_t dirname_len = strlen (binding->dirname) + 1;
+      size_t path_max;
+      char *ret;
+
+      path_max = (unsigned int) PATH_MAX;
+      path_max += 2;		/* The getcwd docs say to do this.  */
+
+      dirname = (char *) alloca (path_max + dirname_len);
+      ADD_BLOCK (block_list, dirname);
+
+      __set_errno (0);
+      while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE)
+	{
+	  path_max += PATH_INCR;
+	  dirname = (char *) alloca (path_max + dirname_len);
+	  ADD_BLOCK (block_list, dirname);
+	  __set_errno (0);
+	}
+
+      if (ret == NULL)
+	{
+	  /* We cannot get the current working directory.  Don't signal an
+	     error but simply return the default string.  */
+	  FREE_BLOCKS (block_list);
+	  __set_errno (saved_errno);
+	  return (char *) msgid;
+	}
+
+      stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
+    }
+
+  /* Now determine the symbolic name of CATEGORY and its value.  */
+  categoryname = category_to_name (category);
+  categoryvalue = guess_category_value (category, categoryname);
+
+  xdomainname = (char *) alloca (strlen (categoryname)
+				 + strlen (domainname) + 5);
+  ADD_BLOCK (block_list, xdomainname);
+
+  stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
+		  domainname),
+	  ".mo");
+
+  /* Creating working area.  */
+  single_locale = (char *) alloca (strlen (categoryvalue) + 1);
+  ADD_BLOCK (block_list, single_locale);
+
+
+  /* Search for the given string.  This is a loop because we perhaps
+     got an ordered list of languages to consider for the translation.  */
+  while (1)
+    {
+      /* Make CATEGORYVALUE point to the next element of the list.  */
+      while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
+	++categoryvalue;
+      if (categoryvalue[0] == '\0')
+	{
+	  /* The whole contents of CATEGORYVALUE has been searched but
+	     no valid entry has been found.  We solve this situation
+	     by implicitly appending a "C" entry, i.e. no translation
+	     will take place.  */
+	  single_locale[0] = 'C';
+	  single_locale[1] = '\0';
+	}
+      else
+	{
+	  char *cp = single_locale;
+	  while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
+	    *cp++ = *categoryvalue++;
+	  *cp = '\0';
+
+	  /* When this is a SUID binary we must not allow accessing files
+	     outside the dedicated directories.  */
+	  if (ENABLE_SECURE
+	      && (memchr (single_locale, '/',
+			  _nl_find_language (single_locale) - single_locale)
+		  != NULL))
+	    /* Ingore this entry.  */
+	    continue;
+	}
+
+      /* If the current locale value is C (or POSIX) we don't load a
+	 domain.  Return the MSGID.  */
+      if (strcmp (single_locale, "C") == 0
+	  || strcmp (single_locale, "POSIX") == 0)
+	{
+	  FREE_BLOCKS (block_list);
+	  __set_errno (saved_errno);
+	  return (char *) msgid;
+	}
+
+
+      /* Find structure describing the message catalog matching the
+	 DOMAINNAME and CATEGORY.  */
+      domain = _nl_find_domain (dirname, single_locale, xdomainname);
+
+      if (domain != NULL)
+	{
+	  retval = find_msg (domain, msgid);
+
+	  if (retval == NULL)
+	    {
+	      int cnt;
+
+	      for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
+		{
+		  retval = find_msg (domain->successor[cnt], msgid);
+
+		  if (retval != NULL)
+		    break;
+		}
+	    }
+
+	  if (retval != NULL)
+	    {
+	      FREE_BLOCKS (block_list);
+	      __set_errno (saved_errno);
+	      return retval;
+	    }
+	}
+    }
+  /* NOTREACHED */
 }

 #ifdef _LIBC
 /* Alias for function name in GNU C Library.  */
 weak_alias (__dcgettext, dcgettext);
 #endif
+
+
+static char *
+internal_function
+find_msg (domain_file, msgid)
+     struct loaded_l10nfile *domain_file;
+     const char *msgid;
+{
+  size_t act = 0;
+  size_t top, bottom;
+  struct loaded_domain *domain;
+
+  if (domain_file->decided == 0)
+    _nl_load_domain (domain_file);
+
+  if (domain_file->data == NULL)
+    return NULL;
+
+  domain = (struct loaded_domain *) domain_file->data;
+
+  /* Locate the MSGID and its translation.  */
+  if (domain->hash_size > 2 && domain->hash_tab != NULL)
+    {
+      /* Use the hashing table.  */
+      nls_uint32 len = strlen (msgid);
+      nls_uint32 hash_val = hash_string (msgid);
+      nls_uint32 idx = hash_val % domain->hash_size;
+      nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
+      nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]);
+
+      if (nstr == 0)
+	/* Hash table entry is empty.  */
+	return NULL;
+
+      if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
+	  && strcmp (msgid,
+		     domain->data + W (domain->must_swap,
+				       domain->orig_tab[nstr - 1].offset)) == 0)
+	return (char *) domain->data + W (domain->must_swap,
+					  domain->trans_tab[nstr - 1].offset);
+
+      while (1)
+	{
+	  if (idx >= domain->hash_size - incr)
+	    idx -= domain->hash_size - incr;
+	  else
+	    idx += incr;
+
+	  nstr = W (domain->must_swap, domain->hash_tab[idx]);
+	  if (nstr == 0)
+	    /* Hash table entry is empty.  */
+	    return NULL;
+
+	  if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
+	      && strcmp (msgid,
+			 domain->data + W (domain->must_swap,
+					   domain->orig_tab[nstr - 1].offset))
+	         == 0)
+	    return (char *) domain->data
+	      + W (domain->must_swap, domain->trans_tab[nstr - 1].offset);
+	}
+      /* NOTREACHED */
+    }
+
+  /* Now we try the default method:  binary search in the sorted
+     array of messages.  */
+  bottom = 0;
+  top = domain->nstrings;
+  while (bottom < top)
+    {
+      int cmp_val;
+
+      act = (bottom + top) / 2;
+      cmp_val = strcmp (msgid, domain->data
+			       + W (domain->must_swap,
+				    domain->orig_tab[act].offset));
+      if (cmp_val < 0)
+	top = act;
+      else if (cmp_val > 0)
+	bottom = act + 1;
+      else
+	break;
+    }
+
+  /* If an translation is found return this.  */
+  return bottom >= top ? NULL : (char *) domain->data
+                                + W (domain->must_swap,
+				     domain->trans_tab[act].offset);
+}
+
+
+/* Return string representation of locale CATEGORY.  */
+static const char *
+internal_function
+category_to_name (category)
+     int category;
+{
+  const char *retval;
+
+  switch (category)
+  {
+#ifdef LC_COLLATE
+  case LC_COLLATE:
+    retval = "LC_COLLATE";
+    break;
+#endif
+#ifdef LC_CTYPE
+  case LC_CTYPE:
+    retval = "LC_CTYPE";
+    break;
+#endif
+#ifdef LC_MONETARY
+  case LC_MONETARY:
+    retval = "LC_MONETARY";
+    break;
+#endif
+#ifdef LC_NUMERIC
+  case LC_NUMERIC:
+    retval = "LC_NUMERIC";
+    break;
+#endif
+#ifdef LC_TIME
+  case LC_TIME:
+    retval = "LC_TIME";
+    break;
+#endif
+#ifdef LC_MESSAGES
+  case LC_MESSAGES:
+    retval = "LC_MESSAGES";
+    break;
+#endif
+#ifdef LC_RESPONSE
+  case LC_RESPONSE:
+    retval = "LC_RESPONSE";
+    break;
+#endif
+#ifdef LC_ALL
+  case LC_ALL:
+    /* This might not make sense but is perhaps better than any other
+       value.  */
+    retval = "LC_ALL";
+    break;
+#endif
+  default:
+    /* If you have a better idea for a default value let me know.  */
+    retval = "LC_XXX";
+  }
+
+  return retval;
+}
+
+/* Guess value of current locale from value of the environment variables.  */
+static const char *
+internal_function
+guess_category_value (category, categoryname)
+     int category;
+     const char *categoryname;
+{
+  const char *retval;
+
+  /* The highest priority value is the `LANGUAGE' environment
+     variable.  This is a GNU extension.  */
+  retval = getenv ("LANGUAGE");
+  if (retval != NULL && retval[0] != '\0')
+    return retval;
+
+  /* `LANGUAGE' is not set.  So we have to proceed with the POSIX
+     methods of looking to `LC_ALL', `LC_xxx', and `LANG'.  On some
+     systems this can be done by the `setlocale' function itself.  */
+#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
+  return setlocale (category, NULL);
+#else
+  /* Setting of LC_ALL overwrites all other.  */
+  retval = getenv ("LC_ALL");
+  if (retval != NULL && retval[0] != '\0')
+    return retval;
+
+  /* Next comes the name of the desired category.  */
+  retval = getenv (categoryname);
+  if (retval != NULL && retval[0] != '\0')
+    return retval;
+
+  /* Last possibility is the LANG environment variable.  */
+  retval = getenv ("LANG");
+  if (retval != NULL && retval[0] != '\0')
+    return retval;
+
+  /* We use C as the default domain.  POSIX says this is implementation
+     defined.  */
+  return "C";
+#endif
+}
+
+/* @@ begin of epilog @@ */
+
+/* We don't want libintl.a to depend on any other library.  So we
+   avoid the non-standard function stpcpy.  In GNU C Library this
+   function is available, though.  Also allow the symbol HAVE_STPCPY
+   to be defined.  */
+#if !_LIBC && !HAVE_STPCPY
+static char *
+stpcpy (dest, src)
+     char *dest;
+     const char *src;
+{
+  while ((*dest++ = *src++) != '\0')
+    /* Do nothing. */ ;
+  return dest - 1;
+}
+#endif
+
+
+#ifdef _LIBC
+/* If we want to free all resources we have to do some work at
+   program's end.  */
+static void __attribute__ ((unused))
+free_mem (void)
+{
+  struct binding *runp;
+
+  for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next)
+    {
+      free (runp->domainname);
+      if (runp->dirname != _nl_default_dirname)
+	/* Yes, this is a pointer comparison.  */
+	free (runp->dirname);
+    }
+
+  if (_nl_current_default_domain != _nl_default_default_domain)
+    /* Yes, again a pointer comparison.  */
+    free ((char *) _nl_current_default_domain);
+}
+
+text_set_element (__libc_subfreeres, free_mem);
+#endif
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
--- a/intl/dcngettext.c
+++ b/intl/dcngettext.c
@@ -1,59 +0,0 @@
-/* Implementation of the dcngettext(3) function.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DCNGETTEXT __dcngettext
-# define DCIGETTEXT __dcigettext
-#else
-# define DCNGETTEXT dcngettext__
-# define DCIGETTEXT dcigettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-char *
-DCNGETTEXT (domainname, msgid1, msgid2, n, category)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-     int category;
-{
-  return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dcngettext, dcngettext);
-#endif
--- a/intl/dgettext.c
+++ b/intl/dgettext.c
@@ -1,5 +1,5 @@
-/* Implementation of the dgettext(3) function.
-   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
+/* Implementation of the dgettext(3) function
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,13 +19,14 @@
 # include <config.h>
 #endif

-#include <locale.h>
+#if defined HAVE_LOCALE_H || defined _LIBC
+# include <locale.h>
+#endif

-#include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgnuintl.h"
+# include "libgettext.h"
 #endif

 /* @@ end of prolog @@ */
--- a/intl/dngettext.c
+++ b/intl/dngettext.c
@@ -1,60 +0,0 @@
-/* Implementation of the dngettext(3) function.
-   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <locale.h>
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DNGETTEXT __dngettext
-# define DCNGETTEXT __dcngettext
-#else
-# define DNGETTEXT dngettext__
-# define DCNGETTEXT dcngettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog of the current
-   LC_MESSAGES locale and skip message according to the plural form.  */
-char *
-DNGETTEXT (domainname, msgid1, msgid2, n)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-{
-  return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dngettext, dngettext);
-#endif
--- a/intl/explodename.c
+++ b/intl/explodename.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.

   This program is free software; you can redistribute it and/or modify
@@ -19,8 +19,15 @@
 # include <config.h>
 #endif

-#include <stdlib.h>
-#include <string.h>
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#endif
+
+#if defined HAVE_STRING_H || defined _LIBC
+# include <string.h>
+#else
+# include <strings.h>
+#endif
 #include <sys/types.h>

 #include "loadinfo.h"
--- a/intl/finddomain.c
+++ b/intl/finddomain.c
@@ -1,6 +1,6 @@
 /* Handle list of needed message catalogs
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.org>, 1995.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,20 +20,45 @@
 # include <config.h>
 #endif

+#include <ctype.h>
+#include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include <stdlib.h>
-#include <string.h>
+
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#else
+# ifdef HAVE_MALLOC_H
+#  include <malloc.h>
+# else
+void free ();
+# endif
+#endif
+
+#if defined HAVE_STRING_H || defined _LIBC
+# include <string.h>
+#else
+# include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif
+#if !HAVE_STRCHR && !defined _LIBC
+# ifndef strchr
+#  define strchr index
+# endif
+#endif

 #if defined HAVE_UNISTD_H || defined _LIBC
 # include <unistd.h>
 #endif

+#include "gettext.h"
 #include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgnuintl.h"
+# include "libgettext.h"
 #endif

 /* @@ end of prolog @@ */
@@ -46,11 +71,10 @@ static struct loaded_l10nfile *_nl_loaded_domains;
   established bindings.  */
 struct loaded_l10nfile *
 internal_function
-_nl_find_domain (dirname, locale, domainname, domainbinding)
+_nl_find_domain (dirname, locale, domainname)
     const char *dirname;
     char *locale;
     const char *domainname;
-     struct binding *domainbinding;
 {
  struct loaded_l10nfile *retval;
  const char *language;
@@ -96,7 +120,7 @@ _nl_find_domain (dirname, locale, domainname, domainbinding)
      int cnt;

      if (retval->decided == 0)
-	_nl_load_domain (retval, domainbinding);
+	_nl_load_domain (retval);

      if (retval->data != NULL)
 	return retval;
@@ -104,7 +128,7 @@ _nl_find_domain (dirname, locale, domainname, domainbinding)
      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
 	{
 	  if (retval->successor[cnt]->decided == 0)
-	    _nl_load_domain (retval->successor[cnt], domainbinding);
+	    _nl_load_domain (retval->successor[cnt]);

 	  if (retval->successor[cnt]->data != NULL)
 	    break;
@@ -151,14 +175,14 @@ _nl_find_domain (dirname, locale, domainname, domainbinding)
    return NULL;

  if (retval->decided == 0)
-    _nl_load_domain (retval, domainbinding);
+    _nl_load_domain (retval);
  if (retval->data == NULL)
    {
      int cnt;
      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
 	{
 	  if (retval->successor[cnt]->decided == 0)
-	    _nl_load_domain (retval->successor[cnt], domainbinding);
+	    _nl_load_domain (retval->successor[cnt]);
 	  if (retval->successor[cnt]->data != NULL)
 	    break;
 	}
@@ -168,10 +192,6 @@ _nl_find_domain (dirname, locale, domainname, domainbinding)
  if (alias_value != NULL)
    free (locale);

-  /* The space for normalized_codeset is dynamically allocated.  Free it.  */
-  if (mask & XPG_NORM_CODESET)
-    free ((void *) normalized_codeset);
-
  return retval;
 }

@@ -188,7 +208,6 @@ free_mem (void)
      if (runp->data != NULL)
 	_nl_unload_domain ((struct loaded_domain *) runp->data);
      runp = runp->next;
-      free ((char *) here->filename);
      free (here);
    }
 }
--- a/intl/gettext.c
+++ b/intl/gettext.c
@@ -1,5 +1,5 @@
 /* Implementation of gettext(3) function.
-   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997 Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -23,14 +23,21 @@
 # define __need_NULL
 # include <stddef.h>
 #else
-# include <stdlib.h>		/* Just for NULL.  */
+# ifdef STDC_HEADERS
+#  include <stdlib.h>		/* Just for NULL.  */
+# else
+#  ifdef HAVE_STRING_H
+#   include <string.h>
+#  else
+#   define NULL ((void *) 0)
+#  endif
+# endif
 #endif

-#include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgnuintl.h"
+# include "libgettext.h"
 #endif

 /* @@ end of prolog @@ */
@@ -41,10 +48,10 @@
   prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define GETTEXT __gettext
-# define DCGETTEXT __dcgettext
+# define DGETTEXT __dgettext
 #else
 # define GETTEXT gettext__
-# define DCGETTEXT dcgettext__
+# define DGETTEXT dgettext__
 #endif

 /* Look up MSGID in the current default message catalog for the current
@@ -54,7 +61,7 @@ char *
 GETTEXT (msgid)
     const char *msgid;
 {
-  return DCGETTEXT (NULL, msgid, LC_MESSAGES);
+  return DGETTEXT (NULL, msgid);
 }

 #ifdef _LIBC
--- a/intl/gettext.h
+++ b/intl/gettext.h
@@ -1,5 +1,5 @@
-/* Description of GNU message catalog format: general file layout.
-   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
+/* Internal header for GNU gettext internationalization functions.
+   Copyright (C) 1995, 1997 Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -11,13 +11,16 @@
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */

 #ifndef _GETTEXT_H
 #define _GETTEXT_H 1

+#include <stdio.h>
+
 #if HAVE_LIMITS_H || _LIBC
 # include <limits.h>
 #endif
@@ -34,8 +37,9 @@
 /* The following contortions are an attempt to use the C preprocessor
   to determine an unsigned integral type that is 32 bits wide.  An
   alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
-   as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work
-   when cross-compiling.  */
+   doing that would require that the configure script compile and *run*
+   the resulting executable.  Locally running cross-compiled executables
+   is usually not possible.  */

 #if __STDC__
 # define UINT_MAX_32_BITS 4294967295U
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -1,6 +1,6 @@
-/* Header describing internals of libintl library.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
+/* Header describing internals of gettext library
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,20 +19,8 @@
 #ifndef _GETTEXTP_H
 #define _GETTEXTP_H

-#include <stddef.h>		/* Get size_t.  */
-
-#ifdef _LIBC
-# include "../iconv/gconv_int.h"
-#else
-# if HAVE_ICONV
-#  include <iconv.h>
-# endif
-#endif
-
 #include "loadinfo.h"

-#include "gettext.h"		/* Get nls_uint32.  */
-
 /* @@ end of prolog @@ */

 #ifndef PARAMS
@@ -47,12 +35,6 @@
 # define internal_function
 #endif

-/* Tell the compiler when a conditional or integer expression is
-   almost always true or almost always false.  */
-#ifndef HAVE_BUILTIN_EXPECT
-# define __builtin_expect(expr, val) (expr)
-#endif
-
 #ifndef W
 # define W(flag, data) ((flag) ? SWAP (data) : (data))
 #endif
@@ -62,6 +44,8 @@
 # include <byteswap.h>
 # define SWAP(i) bswap_32 (i)
 #else
+static nls_uint32 SWAP PARAMS ((nls_uint32 i));
+
 static inline nls_uint32
 SWAP (i)
     nls_uint32 i;
@@ -71,52 +55,6 @@ SWAP (i)
 #endif


-/* This is the representation of the expressions to determine the
-   plural form.  */
-struct expression
-{
-  int nargs;			/* Number of arguments.  */
-  enum operator
-  {
-    /* Without arguments:  */
-    var,			/* The variable "n".  */
-    num,			/* Decimal number.  */
-    /* Unary operators:  */
-    lnot,			/* Logical NOT.  */
-    /* Binary operators:  */
-    mult,			/* Multiplication.  */
-    divide,			/* Division.  */
-    module,			/* Module operation.  */
-    plus,			/* Addition.  */
-    minus,			/* Subtraction.  */
-    less_than,			/* Comparison.  */
-    greater_than,		/* Comparison.  */
-    less_or_equal,		/* Comparison.  */
-    greater_or_equal,		/* Comparison.  */
-    equal,			/* Comparision for equality.  */
-    not_equal,			/* Comparision for inequality.  */
-    land,			/* Logical AND.  */
-    lor,			/* Logical OR.  */
-    /* Ternary operators:  */
-    qmop			/* Question mark operator.  */
-  } operation;
-  union
-  {
-    unsigned long int num;	/* Number value for `num'.  */
-    struct expression *args[3];	/* Up to three arguments.  */
-  } val;
-};
-
-/* This is the data structure to pass information to the parser and get
-   the result in a thread-safe way.  */
-struct parse_args
-{
-  const char *cp;
-  struct expression *res;
-};
-
-
-/* The representation of an opened message catalog.  */
 struct loaded_domain
 {
  const char *data;
@@ -128,123 +66,23 @@ struct loaded_domain
  struct string_desc *trans_tab;
  nls_uint32 hash_size;
  nls_uint32 *hash_tab;
-  int codeset_cntr;
-#ifdef _LIBC
-  __gconv_t conv;
-#else
-# if HAVE_ICONV
-  iconv_t conv;
-# endif
-#endif
-  char **conv_tab;
-
-  struct expression *plural;
-  unsigned long int nplurals;
 };

-/* We want to allocate a string at the end of the struct.  But ISO C
-   doesn't allow zero sized arrays.  */
-#ifdef __GNUC__
-# define ZERO 0
-#else
-# define ZERO 1
-#endif
-
-/* A set of settings bound to a message domain.  Used to store settings
-   from bindtextdomain() and bind_textdomain_codeset().  */
 struct binding
 {
  struct binding *next;
+  char *domainname;
  char *dirname;
-  int codeset_cntr;	/* Incremented each time codeset changes.  */
-  char *codeset;
-  char domainname[ZERO];
 };

-/* A counter which is incremented each time some previous translations
-   become invalid.
-   This variable is part of the external ABI of the GNU libintl.  */
-extern int _nl_msg_cat_cntr;
-
 struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname,
 						 char *__locale,
-						 const char *__domainname,
-					      struct binding *__domainbinding))
+						 const char *__domainname))
     internal_function;
-void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain,
-			      struct binding *__domainbinding))
+void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain))
     internal_function;
 void _nl_unload_domain PARAMS ((struct loaded_domain *__domain))
     internal_function;
-const char *_nl_init_domain_conv PARAMS ((struct loaded_l10nfile *__domain_file,
-					  struct loaded_domain *__domain,
-					  struct binding *__domainbinding))
-     internal_function;
-void _nl_free_domain_conv PARAMS ((struct loaded_domain *__domain))
-     internal_function;
-
-char *_nl_find_msg PARAMS ((struct loaded_l10nfile *domain_file,
-			    struct binding *domainbinding,
-			    const char *msgid, size_t *lengthp))
-     internal_function;
-
-#ifdef _LIBC
-extern char *__gettext PARAMS ((const char *__msgid));
-extern char *__dgettext PARAMS ((const char *__domainname,
-				 const char *__msgid));
-extern char *__dcgettext PARAMS ((const char *__domainname,
-				  const char *__msgid, int __category));
-extern char *__ngettext PARAMS ((const char *__msgid1, const char *__msgid2,
-				 unsigned long int __n));
-extern char *__dngettext PARAMS ((const char *__domainname,
-				  const char *__msgid1, const char *__msgid2,
-				  unsigned long int n));
-extern char *__dcngettext PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   unsigned long int __n, int __category));
-extern char *__dcigettext PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   int __plural, unsigned long int __n,
-				   int __category));
-extern char *__textdomain PARAMS ((const char *__domainname));
-extern char *__bindtextdomain PARAMS ((const char *__domainname,
-				       const char *__dirname));
-extern char *__bind_textdomain_codeset PARAMS ((const char *__domainname,
-						const char *__codeset));
-#else
-extern char *gettext__ PARAMS ((const char *__msgid));
-extern char *dgettext__ PARAMS ((const char *__domainname,
-				 const char *__msgid));
-extern char *dcgettext__ PARAMS ((const char *__domainname,
-				  const char *__msgid, int __category));
-extern char *ngettext__ PARAMS ((const char *__msgid1, const char *__msgid2,
-				 unsigned long int __n));
-extern char *dngettext__ PARAMS ((const char *__domainname,
-				  const char *__msgid1, const char *__msgid2,
-				  unsigned long int __n));
-extern char *dcngettext__ PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   unsigned long int __n, int __category));
-extern char *dcigettext__ PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   int __plural, unsigned long int __n,
-				   int __category));
-extern char *textdomain__ PARAMS ((const char *__domainname));
-extern char *bindtextdomain__ PARAMS ((const char *__domainname,
-				       const char *__dirname));
-extern char *bind_textdomain_codeset__ PARAMS ((const char *__domainname,
-						const char *__codeset));
-#endif
-
-#ifdef _LIBC
-extern void __gettext_free_exp PARAMS ((struct expression *exp))
-     internal_function;
-extern int __gettextparse PARAMS ((void *arg));
-#else
-extern void gettext_free_exp__ PARAMS ((struct expression *exp))
-     internal_function;
-extern int gettextparse__ PARAMS ((void *arg));
-#endif

 /* @@ begin of epilog @@ */

--- a/intl/hash-string.h
+++ b/intl/hash-string.h
@@ -1,5 +1,5 @@
-/* Description of GNU message catalog format: string hashing function.
-   Copyright (C) 1995, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
+/* Implements a string hashing function.
+   Copyright (C) 1995, 1997 Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -11,9 +11,10 @@
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */

 /* @@ end of prolog @@ */

--- a/intl/intl-compat.c
+++ b/intl/intl-compat.c
@@ -1,6 +1,6 @@
 /* intl-compat.c - Stub functions to call gettext functions from GNU gettext
   Library.
-   Copyright (C) 1995, 2000, 2001 Software Foundation, Inc.
+   Copyright (C) 1995 Software Foundation, Inc.

 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -20,79 +20,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include <config.h>
 #endif

-#include "libgnuintl.h"
-#include "gettextP.h"
+#include "libgettext.h"

 /* @@ end of prolog @@ */

-/* This file redirects the gettext functions (without prefix or suffix) to
-   those defined in the included GNU gettext library (with "__" suffix).
-   It is compiled into libintl when the included GNU gettext library is
-   configured --with-included-gettext.
-
-   This redirection works also in the case that the system C library or
-   the system libintl library contain gettext/textdomain/... functions.
-   If it didn't, we would need to add preprocessor level redirections to
-   libgnuintl.h of the following form:
-
-#    define gettext gettext__
-#    define dgettext dgettext__
-#    define dcgettext dcgettext__
-#    define ngettext ngettext__
-#    define dngettext dngettext__
-#    define dcngettext dcngettext__
-#    define textdomain textdomain__
-#    define bindtextdomain bindtextdomain__
-#    define bind_textdomain_codeset bind_textdomain_codeset__
-
-   How does this redirection work? There are two cases.
-   A. When libintl.a is linked into an executable, it works because
-      functions defined in the executable always override functions in
-      the shared libraries.
-   B. When libintl.so is used, it works because
-      1. those systems defining gettext/textdomain/... in the C library
-         (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer) are
-         ELF systems and define these symbols as weak, thus explicitly
-         letting other shared libraries override it.
-      2. those systems defining gettext/textdomain/... in a standalone
-         libintl.so library (namely, Solaris 2.3 and newer) have this
-         shared library in /usr/lib, and the linker will search /usr/lib
-         *after* the directory where the GNU gettext library is installed.
-
-   A third case, namely when libintl.a is linked into a shared library
-   whose name is not libintl.so, is not supported. In this case, on
-   Solaris, when -lintl precedes the linker option for the shared library
-   containing GNU gettext, the system's gettext would indeed override
-   the GNU gettext. Anyone doing this kind of stuff must be clever enough
-   to 1. compile libintl.a with -fPIC, 2. remove -lintl from his linker
-   command line.  */
-

 #undef gettext
 #undef dgettext
 #undef dcgettext
-#undef ngettext
-#undef dngettext
-#undef dcngettext
 #undef textdomain
 #undef bindtextdomain
-#undef bind_textdomain_codeset


 char *
-gettext (msgid)
-     const char *msgid;
-{
-  return gettext__ (msgid);
-}
-
-
-char *
-dgettext (domainname, msgid)
+bindtextdomain (domainname, dirname)
     const char *domainname;
-     const char *msgid;
+     const char *dirname;
 {
-  return dgettext__ (domainname, msgid);
+  return bindtextdomain__ (domainname, dirname);
 }


@@ -107,35 +52,19 @@ dcgettext (domainname, msgid, category)


 char *
-ngettext (msgid1, msgid2, n)
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
+dgettext (domainname, msgid)
+     const char *domainname;
+     const char *msgid;
 {
-  return ngettext__ (msgid1, msgid2, n);
+  return dgettext__ (domainname, msgid);
 }


 char *
-dngettext (domainname, msgid1, msgid2, n)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
+gettext (msgid)
+     const char *msgid;
 {
-  return dngettext__ (domainname, msgid1, msgid2, n);
-}
-
-
-char *
-dcngettext (domainname, msgid1, msgid2, n, category)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-     int category;
-{
-  return dcngettext__ (domainname, msgid1, msgid2, n, category);
+  return gettext__ (msgid);
 }


@@ -145,21 +74,3 @@ textdomain (domainname)
 {
  return textdomain__ (domainname);
 }
-
-
-char *
-bindtextdomain (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
-{
-  return bindtextdomain__ (domainname, dirname);
-}
-
-
-char *
-bind_textdomain_codeset (domainname, codeset)
-     const char *domainname;
-     const char *codeset;
-{
-  return bind_textdomain_codeset__ (domainname, codeset);
-}
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+/* Handle list of needed message catalogs
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.

   This program is free software; you can redistribute it and/or modify
@@ -15,18 +16,22 @@
   along with this program; if not, write to the Free Software Foundation,
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

-/* Tell glibc's <string.h> to provide a prototype for stpcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE	1
-#endif
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

-#include <string.h>
+
+#if defined HAVE_STRING_H || defined _LIBC
+# ifndef _GNU_SOURCE
+#  define _GNU_SOURCE	1
+# endif
+# include <string.h>
+#else
+# include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif
 #if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
@@ -38,7 +43,10 @@
 #endif
 #include <ctype.h>
 #include <sys/types.h>
-#include <stdlib.h>
+
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#endif

 #include "loadinfo.h"

@@ -216,7 +224,7 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,

  /* Construct file name.  */
  memcpy (abs_filename, dirlist, dirlist_len);
-  __argz_stringify (abs_filename, dirlist_len, PATH_SEPARATOR);
+  __argz_stringify (abs_filename, dirlist_len, ':');
  cp = abs_filename + (dirlist_len - 1);
  *cp++ = '/';
  cp = stpcpy (cp, language);
@@ -341,8 +349,7 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,

 /* Normalize codeset name.  There is no standard for the codeset
   names.  Normalization allows the user to use any of the common
-   names.  The return value is dynamically allocated and has to be
-   freed by the caller.  */
+   names.  */
 const char *
 _nl_normalize_codeset (codeset, name_len)
     const char *codeset;
--- a/intl/libgettext.h
+++ b/intl/libgettext.h
@@ -1,5 +1,5 @@
-/* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+/* Message catalogs for internationalization.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -15,34 +15,168 @@
   along with this program; if not, write to the Free Software Foundation,
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

-#ifndef _LIBGETTEXT_H
-#define _LIBGETTEXT_H 1
+/* Because on some systems (e.g. Solaris) we sometimes have to include
+   the systems libintl.h as well as this file we have more complex
+   include protection above.  But the systems header might perhaps also
+   define _LIBINTL_H and therefore we have to protect the definition here.  */
+
+#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H
+#ifndef _LIBINTL_H
+# define _LIBINTL_H	1
+#endif
+#define _LIBGETTEXT_H	1
+
+/* We define an additional symbol to signal that we use the GNU
+   implementation of gettext.  */
+#define __USE_GNU_GETTEXT 1
+
+#include <sys/types.h>
+
+#if HAVE_LOCALE_H
+# include <locale.h>
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* @@ end of prolog @@ */
+
+#ifndef PARAMS
+# if __STDC__ || defined __cplusplus
+#  define PARAMS(args) args
+# else
+#  define PARAMS(args) ()
+# endif
+#endif
+
+#ifndef NULL
+# if !defined __cplusplus || defined __GNUC__
+#  define NULL ((void *) 0)
+# else
+#  define NULL (0)
+# endif
+#endif
+
+#if !HAVE_LC_MESSAGES
+/* This value determines the behaviour of the gettext() and dgettext()
+   function.  But some system does not have this defined.  Define it
+   to a default value.  */
+# define LC_MESSAGES (-1)
+#endif
+
+
+/* Declarations for gettext-using-catgets interface.  Derived from
+   Jim Meyering's libintl.h.  */
+struct _msg_ent
+{
+  const char *_msg;
+  int _msg_number;
+};
+
+
+#if HAVE_CATGETS
+/* These two variables are defined in the automatically by po-to-tbl.sed
+   generated file `cat-id-tbl.c'.  */
+extern const struct _msg_ent _msg_tbl[];
+extern int _msg_tbl_length;
+#endif
+
+
+/* For automatical extraction of messages sometimes no real
+   translation is needed.  Instead the string itself is the result.  */
+#define gettext_noop(Str) (Str)
+
+/* Look up MSGID in the current default message catalog for the current
+   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
+   text).  */
+extern char *gettext PARAMS ((const char *__msgid));
+extern char *gettext__ PARAMS ((const char *__msgid));
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current
+   LC_MESSAGES locale.  */
+extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
+extern char *dgettext__ PARAMS ((const char *__domainname,
+				 const char *__msgid));
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
+   locale.  */
+extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
+				int __category));
+extern char *dcgettext__ PARAMS ((const char *__domainname,
+				  const char *__msgid, int __category));
+
+
+/* Set the current default message catalog to DOMAINNAME.
+   If DOMAINNAME is null, return the current default.
+   If DOMAINNAME is "", reset to the default of "messages".  */
+extern char *textdomain PARAMS ((const char *__domainname));
+extern char *textdomain__ PARAMS ((const char *__domainname));
+
+/* Specify that the DOMAINNAME message catalog will be found
+   in DIRNAME rather than in the system locale data base.  */
+extern char *bindtextdomain PARAMS ((const char *__domainname,
+				  const char *__dirname));
+extern char *bindtextdomain__ PARAMS ((const char *__domainname,
+				    const char *__dirname));

-/* NLS can be disabled through the configure --disable-nls option.  */
 #if ENABLE_NLS

-/* Get declarations of GNU message catalog functions.  */
-# include <libintl.h>
+/* Solaris 2.3 has the gettext function but dcgettext is missing.
+   So we omit this optimization for Solaris 2.3.  BTW, Solaris 2.4
+   has dcgettext.  */
+# if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT)
+
+#  define gettext(Msgid)						      \
+     dgettext (NULL, Msgid)
+
+#  define dgettext(Domainname, Msgid)					      \
+     dcgettext (Domainname, Msgid, LC_MESSAGES)
+
+#  if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7
+/* This global variable is defined in loadmsgcat.c.  We need a sign,
+   whether a new catalog was loaded, which can be associated with all
+   translations.  */
+extern int _nl_msg_cat_cntr;
+
+#   define dcgettext(Domainname, Msgid, Category)			      \
+  (__extension__							      \
+   ({									      \
+     char *__result;							      \
+     if (__builtin_constant_p (Msgid))					      \
+       {								      \
+	 static char *__translation__;					      \
+	 static int __catalog_counter__;				      \
+	 if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr)    \
+	   {								      \
+	     __translation__ =						      \
+	       dcgettext__ (Domainname, Msgid, Category);		      \
+	     __catalog_counter__ = _nl_msg_cat_cntr;			      \
+	   }								      \
+	 __result = __translation__;					      \
+       }								      \
+     else								      \
+       __result = dcgettext__ (Domainname, Msgid, Category);		      \
+     __result;								      \
+    }))
+#  endif
+# endif

 #else

 # define gettext(Msgid) (Msgid)
 # define dgettext(Domainname, Msgid) (Msgid)
 # define dcgettext(Domainname, Msgid, Category) (Msgid)
-# define ngettext(Msgid1, Msgid2, N) \
-    ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2))
-# define dngettext(Domainname, Msgid1, Msgid2, N) \
-    ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2))
-# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
-    ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2))
-# define textdomain(Domainname) ((char *) (Domainname))
-# define bindtextdomain(Domainname, Dirname) ((char *) (Dirname))
-# define bind_textdomain_codeset(Domainname, Codeset) ((char *) (Codeset))
+# define textdomain(Domainname) ((char *) Domainname)
+# define bindtextdomain(Domainname, Dirname) ((char *) Dirname)

 #endif

-/* For automatical extraction of messages sometimes no real
-   translation is needed.  Instead the string itself is the result.  */
-#define gettext_noop(Str) (Str)
+/* @@ begin of epilog @@ */

-#endif /* _LIBGETTEXT_H */
+#ifdef __cplusplus
+}
+#endif
+
+#endif
--- a/intl/libgnuintl.h
+++ b/intl/libgnuintl.h
@@ -1,127 +0,0 @@
-/* Message catalogs for internationalization.
-   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef _LIBINTL_H
-#define _LIBINTL_H	1
-
-#include <locale.h>
-
-/* The LC_MESSAGES locale category is the category used by the functions
-   gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
-   On systems that don't define it, use an arbitrary value instead.
-   On Solaris, <locale.h> defines __LOCALE_H then includes <libintl.h> (i.e.
-   this file!) and then only defines LC_MESSAGES.  To avoid a redefinition
-   warning, don't define LC_MESSAGES in this case.  */
-#if !defined LC_MESSAGES && !defined __LOCALE_H
-# define LC_MESSAGES 1729
-#endif
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-/* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
-   precedence over _conio_gettext.  */
-#ifdef __DJGPP__
-# undef gettext
-# define gettext gettext
-#endif
-
-#ifndef PARAMS
-# if __STDC__ || defined __cplusplus
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-extern char *gettext PARAMS ((const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
-				int __category));
-
-
-/* Similar to `gettext' but select the plural form corresponding to the
-   number N.  */
-extern char *ngettext PARAMS ((const char *__msgid1, const char *__msgid2,
-			       unsigned long int __n));
-
-/* Similar to `dgettext' but select the plural form corresponding to the
-   number N.  */
-extern char *dngettext PARAMS ((const char *__domainname, const char *__msgid1,
-				const char *__msgid2, unsigned long int __n));
-
-/* Similar to `dcgettext' but select the plural form corresponding to the
-   number N.  */
-extern char *dcngettext PARAMS ((const char *__domainname, const char *__msgid1,
-				 const char *__msgid2, unsigned long int __n,
-				 int __category));
-
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-extern char *textdomain PARAMS ((const char *__domainname));
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-extern char *bindtextdomain PARAMS ((const char *__domainname,
-				     const char *__dirname));
-
-/* Specify the character encoding in which the messages from the
-   DOMAINNAME message catalog will be returned.  */
-extern char *bind_textdomain_codeset PARAMS ((const char *__domainname,
-					      const char *__codeset));
-
-
-/* Optimized version of the functions above.  */
-#if defined __OPTIMIZED
-/* These are macros, but could also be inline functions.  */
-
-# define gettext(msgid)							      \
-  dgettext (NULL, msgid)
-
-# define dgettext(domainname, msgid)					      \
-  dcgettext (domainname, msgid, LC_MESSAGES)
-
-# define ngettext(msgid1, msgid2, n)					      \
-  dngettext (NULL, msgid1, msgid2, n)
-
-# define dngettext(domainname, msgid1, msgid2, n)			      \
-  dcngettext (domainname, msgid1, msgid2, n, LC_MESSAGES)
-
-#endif /* Optimizing. */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* libintl.h */
--- a/intl/loadinfo.h
+++ b/intl/loadinfo.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
   This file is part of the GNU C Library.
   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.

@@ -16,9 +16,6 @@
   along with this program; if not, write to the Free Software Foundation,
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

-#ifndef _LOADINFO_H
-#define _LOADINFO_H	1
-
 #ifndef PARAMS
 # if __STDC__
 #  define PARAMS(args) args
@@ -27,25 +24,6 @@
 # endif
 #endif

-#ifndef internal_function
-# define internal_function
-#endif
-
-/* Tell the compiler when a conditional or integer expression is
-   almost always true or almost always false.  */
-#ifndef HAVE_BUILTIN_EXPECT
-# define __builtin_expect(expr, val) (expr)
-#endif
-
-/* Separator in PATH like lists of pathnames.  */
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, OS/2, DOS */
-# define PATH_SEPARATOR ';'
-#else
-  /* Unix */
-# define PATH_SEPARATOR ':'
-#endif
-
 /* Encoding of locale name parts.  */
 #define CEN_REVISION		1
 #define CEN_SPONSOR		2
@@ -72,10 +50,6 @@ struct loaded_l10nfile
 };


-/* Normalize codeset name.  There is no standard for the codeset
-   names.  Normalization allows the user to use any of the common
-   names.  The return value is dynamically allocated and has to be
-   freed by the caller.  */
 extern const char *_nl_normalize_codeset PARAMS ((const char *codeset,
 						  size_t name_len));

@@ -92,8 +66,6 @@ _nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,

 extern const char *_nl_expand_alias PARAMS ((const char *name));

-/* normalized_codeset is dynamically allocated and has to be freed by
-   the caller.  */
 extern int _nl_explode_name PARAMS ((char *name, const char **language,
 				     const char **modifier,
 				     const char **territory,
@@ -104,5 +76,3 @@ extern int _nl_explode_name PARAMS ((char *name, const char **language,
 				     const char **revision));

 extern char *_nl_find_language PARAMS ((const char *name));
-
-#endif	/* loadinfo.h */
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -1,5 +1,5 @@
 /* Load needed message catalogs.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -15,52 +15,22 @@
   along with this program; if not, write to the Free Software Foundation,
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE    1
-#endif
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

-#include <ctype.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>

-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca
-char *alloca ();
-#   endif
-#  endif
-# endif
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
 #endif

-#include <stdlib.h>
-#include <string.h>
-
 #if defined HAVE_UNISTD_H || defined _LIBC
 # include <unistd.h>
 #endif

-#ifdef _LIBC
-# include <langinfo.h>
-# include <locale.h>
-#endif
-
 #if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
    || (defined _LIBC && defined _POSIX_MAPPED_FILES)
 # include <sys/mman.h>
@@ -73,10 +43,6 @@ char *alloca ();
 #include "gettext.h"
 #include "gettextP.h"

-#ifdef _LIBC
-# include "../locale/localeinfo.h"
-#endif
-
 /* @@ end of prolog @@ */

 #ifdef _LIBC
@@ -90,275 +56,29 @@ char *alloca ();
 # define munmap __munmap
 #endif

-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define PLURAL_PARSE __gettextparse
-#else
-# define PLURAL_PARSE gettextparse__
-#endif
-
-/* For those losing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-# define freea(p) /* nothing */
-#else
-# define alloca(n) malloc (n)
-# define freea(p) free (p)
-#endif
-
-/* For systems that distinguish between text and binary I/O.
-   O_BINARY is usually declared in <fcntl.h>. */
-#if !defined O_BINARY && defined _O_BINARY
-  /* For MSC-compatible compilers.  */
-# define O_BINARY _O_BINARY
-# define O_TEXT _O_TEXT
-#endif
-#ifdef __BEOS__
-  /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect.  */
-# undef O_BINARY
-# undef O_TEXT
-#endif
-/* On reasonable systems, binary I/O is the default.  */
-#ifndef O_BINARY
-# define O_BINARY 0
-#endif
-
 /* We need a sign, whether a new catalog was loaded, which can be associated
   with all translations.  This is important if the translations are
   cached by one of GCC's features.  */
-int _nl_msg_cat_cntr;
+int _nl_msg_cat_cntr = 0;

-#if (defined __GNUC__ && !defined __APPLE_CC__) \
-    || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
-
-/* These structs are the constant expression for the germanic plural
-   form determination.  It represents the expression  "n != 1".  */
-static const struct expression plvar =
-{
-  .nargs = 0,
-  .operation = var,
-};
-static const struct expression plone =
-{
-  .nargs = 0,
-  .operation = num,
-  .val =
-  {
-    .num = 1
-  }
-};
-static struct expression germanic_plural =
-{
-  .nargs = 2,
-  .operation = not_equal,
-  .val =
-  {
-    .args =
-    {
-      [0] = (struct expression *) &plvar,
-      [1] = (struct expression *) &plone
-    }
-  }
-};
-
-# define INIT_GERMANIC_PLURAL()
-
-#else
-
-/* For compilers without support for ISO C 99 struct/union initializers:
-   Initialization at run-time.  */
-
-static struct expression plvar;
-static struct expression plone;
-static struct expression germanic_plural;
-
-static void
-init_germanic_plural ()
-{
-  if (plone.val.num == 0)
-    {
-      plvar.nargs = 0;
-      plvar.operation = var;
-
-      plone.nargs = 0;
-      plone.operation = num;
-      plone.val.num = 1;
-
-      germanic_plural.nargs = 2;
-      germanic_plural.operation = not_equal;
-      germanic_plural.val.args[0] = &plvar;
-      germanic_plural.val.args[1] = &plone;
-    }
-}
-
-# define INIT_GERMANIC_PLURAL() init_germanic_plural ()
-
-#endif
-
-
-/* Initialize the codeset dependent parts of an opened message catalog.
-   Return the header entry.  */
-const char *
-internal_function
-_nl_init_domain_conv (domain_file, domain, domainbinding)
-     struct loaded_l10nfile *domain_file;
-     struct loaded_domain *domain;
-     struct binding *domainbinding;
-{
-  /* Find out about the character set the file is encoded with.
-     This can be found (in textual form) in the entry "".  If this
-     entry does not exist or if this does not contain the `charset='
-     information, we will assume the charset matches the one the
-     current locale and we don't have to perform any conversion.  */
-  char *nullentry;
-  size_t nullentrylen;
-
-  /* Preinitialize fields, to avoid recursion during _nl_find_msg.  */
-  domain->codeset_cntr =
-    (domainbinding != NULL ? domainbinding->codeset_cntr : 0);
-#ifdef _LIBC
-  domain->conv = (__gconv_t) -1;
-#else
-# if HAVE_ICONV
-  domain->conv = (iconv_t) -1;
-# endif
-#endif
-  domain->conv_tab = NULL;
-
-  /* Get the header entry.  */
-  nullentry = _nl_find_msg (domain_file, domainbinding, "", &nullentrylen);
-
-  if (nullentry != NULL)
-    {
-#if defined _LIBC || HAVE_ICONV
-      const char *charsetstr;
-
-      charsetstr = strstr (nullentry, "charset=");
-      if (charsetstr != NULL)
-	{
-	  size_t len;
-	  char *charset;
-	  const char *outcharset;
-
-	  charsetstr += strlen ("charset=");
-	  len = strcspn (charsetstr, " \t\n");
-
-	  charset = (char *) alloca (len + 1);
-# if defined _LIBC || HAVE_MEMPCPY
-	  *((char *) mempcpy (charset, charsetstr, len)) = '\0';
-# else
-	  memcpy (charset, charsetstr, len);
-	  charset[len] = '\0';
-# endif
-
-	  /* The output charset should normally be determined by the
-	     locale.  But sometimes the locale is not used or not correctly
-	     set up, so we provide a possibility for the user to override
-	     this.  Moreover, the value specified through
-	     bind_textdomain_codeset overrides both.  */
-	  if (domainbinding != NULL && domainbinding->codeset != NULL)
-	    outcharset = domainbinding->codeset;
-	  else
-	    {
-	      outcharset = getenv ("OUTPUT_CHARSET");
-	      if (outcharset == NULL || outcharset[0] == '\0')
-		{
-# ifdef _LIBC
-		  outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string;
-# else
-#  if HAVE_ICONV
-		  extern const char *locale_charset (void);
-		  outcharset = locale_charset ();
-#  endif
-# endif
-		}
-	    }
-
-# ifdef _LIBC
-	  /* We always want to use transliteration.  */
-	  outcharset = norm_add_slashes (outcharset, "TRANSLIT");
-	  charset = norm_add_slashes (charset, NULL);
-	  if (__gconv_open (outcharset, charset, &domain->conv,
-			    GCONV_AVOID_NOCONV)
-	      != __GCONV_OK)
-	    domain->conv = (__gconv_t) -1;
-# else
-#  if HAVE_ICONV
-	  /* When using GNU libiconv, we want to use transliteration.  */
-#   if _LIBICONV_VERSION >= 0x0105
-	  len = strlen (outcharset);
-	  {
-	    char *tmp = (char *) alloca (len + 10 + 1);
-	    memcpy (tmp, outcharset, len);
-	    memcpy (tmp + len, "//TRANSLIT", 10 + 1);
-	    outcharset = tmp;
-	  }
-#   endif
-	  domain->conv = iconv_open (outcharset, charset);
-#   if _LIBICONV_VERSION >= 0x0105
-	  freea (outcharset);
-#   endif
-#  endif
-# endif
-
-	  freea (charset);
-	}
-#endif /* _LIBC || HAVE_ICONV */
-    }
-
-  return nullentry;
-}
-
-/* Frees the codeset dependent parts of an opened message catalog.  */
-void
-internal_function
-_nl_free_domain_conv (domain)
-     struct loaded_domain *domain;
-{
-  if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1)
-    free (domain->conv_tab);
-
-#ifdef _LIBC
-  if (domain->conv != (__gconv_t) -1)
-    __gconv_close (domain->conv);
-#else
-# if HAVE_ICONV
-  if (domain->conv != (iconv_t) -1)
-    iconv_close (domain->conv);
-# endif
-#endif
-}

 /* Load the message catalogs specified by FILENAME.  If it is no valid
   message catalog do nothing.  */
 void
 internal_function
-_nl_load_domain (domain_file, domainbinding)
+_nl_load_domain (domain_file)
     struct loaded_l10nfile *domain_file;
-     struct binding *domainbinding;
 {
  int fd;
  size_t size;
-#ifdef _LIBC
-  struct stat64 st;
-#else
  struct stat st;
-#endif
  struct mo_file_header *data = (struct mo_file_header *) -1;
  int use_mmap = 0;
  struct loaded_domain *domain;
-  const char *nullentry;

  domain_file->decided = 1;
  domain_file->data = NULL;

-  /* Note that it would be useless to store domainbinding in domain_file
-     because domainbinding might be == NULL now but != NULL later (after
-     a call to bind_textdomain_codeset).  */
-
  /* If the record does not represent a valid locale the FILENAME
     might be NULL.  This can happen when according to the given
     specification the locale file name is different for XPG and CEN
@@ -367,19 +87,14 @@ _nl_load_domain (domain_file, domainbinding)
    return;

  /* Try to open the addressed file.  */
-  fd = open (domain_file->filename, O_RDONLY | O_BINARY);
+  fd = open (domain_file->filename, O_RDONLY);
  if (fd == -1)
    return;

  /* We must know about the size of the file.  */
-  if (
-#ifdef _LIBC
-      __builtin_expect (fstat64 (fd, &st) != 0, 0)
-#else
-      __builtin_expect (fstat (fd, &st) != 0, 0)
-#endif
-      || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0)
-      || __builtin_expect (size < sizeof (struct mo_file_header), 0))
+  if (fstat (fd, &st) != 0
+      || (size = (size_t) st.st_size) != st.st_size
+      || size < sizeof (struct mo_file_header))
    {
      /* Something went wrong.  */
      close (fd);
@@ -392,7 +107,7 @@ _nl_load_domain (domain_file, domainbinding)
  data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
 					 MAP_PRIVATE, fd, 0);

-  if (__builtin_expect (data != (struct mo_file_header *) -1, 1))
+  if (data != (struct mo_file_header *) -1)
    {
      /* mmap() call was successful.  */
      close (fd);
@@ -416,15 +131,12 @@ _nl_load_domain (domain_file, domainbinding)
      do
 	{
 	  long int nb = (long int) read (fd, read_ptr, to_read);
-	  if (nb <= 0)
+	  if (nb == -1)
 	    {
-#ifdef EINTR
-	      if (nb == -1 && errno == EINTR)
-		continue;
-#endif
 	      close (fd);
 	      return;
 	    }
+
 	  read_ptr += nb;
 	  to_read -= nb;
 	}
@@ -435,8 +147,7 @@ _nl_load_domain (domain_file, domainbinding)

  /* Using the magic number we can test whether it really is a message
     catalog file.  */
-  if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED,
-			0))
+  if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED)
    {
      /* The magic number is wrong: not a message catalog file.  */
 #ifdef HAVE_MMAP
@@ -448,11 +159,12 @@ _nl_load_domain (domain_file, domainbinding)
      return;
    }

-  domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
-  if (domain == NULL)
+  domain_file->data
+    = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
+  if (domain_file->data == NULL)
    return;
-  domain_file->data = domain;

+  domain = (struct loaded_domain *) domain_file->data;
  domain->data = (char *) data;
  domain->use_mmap = use_mmap;
  domain->mmap_size = size;
@@ -484,62 +196,9 @@ _nl_load_domain (domain_file, domainbinding)
      return;
    }

-  /* Now initialize the character set converter from the character set
-     the file is encoded with (found in the header entry) to the domain's
-     specified character set or the locale's character set.  */
-  nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding);
-
-  /* Also look for a plural specification.  */
-  if (nullentry != NULL)
-    {
-      const char *plural;
-      const char *nplurals;
-
-      plural = strstr (nullentry, "plural=");
-      nplurals = strstr (nullentry, "nplurals=");
-      if (plural == NULL || nplurals == NULL)
-	goto no_plural;
-      else
-	{
-	  /* First get the number.  */
-	  char *endp;
-	  unsigned long int n;
-	  struct parse_args args;
-
-	  nplurals += 9;
-	  while (*nplurals != '\0' && isspace (*nplurals))
-	    ++nplurals;
-#if defined HAVE_STRTOUL || defined _LIBC
-	  n = strtoul (nplurals, &endp, 10);
-#else
-	  for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++)
-	    n = n * 10 + (*endp - '0');
-#endif
-	  domain->nplurals = n;
-	  if (nplurals == endp)
-	    goto no_plural;
-
-	  /* Due to the restrictions bison imposes onto the interface of the
-	     scanner function we have to put the input string and the result
-	     passed up from the parser into the same structure which address
-	     is passed down to the parser.  */
-	  plural += 7;
-	  args.cp = plural;
-	  if (PLURAL_PARSE (&args) != 0)
-	    goto no_plural;
-	  domain->plural = args.res;
-	}
-    }
-  else
-    {
-      /* By default we are using the Germanic form: singular form only
-         for `one', the plural form otherwise.  Yes, this is also what
-         English is using since English is a Germanic language.  */
-    no_plural:
-      INIT_GERMANIC_PLURAL ();
-      domain->plural = &germanic_plural;
-      domain->nplurals = 2;
-    }
+  /* Show that one domain is changed.  This might make some cached
+     translations invalid.  */
+  ++_nl_msg_cat_cntr;
 }


@@ -549,16 +208,11 @@ internal_function
 _nl_unload_domain (domain)
     struct loaded_domain *domain;
 {
-  if (domain->plural != &germanic_plural)
-    __gettext_free_exp (domain->plural);
-
-  _nl_free_domain_conv (domain);
-
-# ifdef _POSIX_MAPPED_FILES
+#ifdef _POSIX_MAPPED_FILES
  if (domain->use_mmap)
    munmap ((caddr_t) domain->data, domain->mmap_size);
  else
-# endif	/* _POSIX_MAPPED_FILES */
+#endif	/* _POSIX_MAPPED_FILES */
    free ((void *) domain->data);

  free (domain);
--- a/intl/localcharset.c
+++ b/intl/localcharset.c
@@ -1,271 +0,0 @@
-/* Determine a canonical name for the current locale's character encoding.
-
-   Copyright (C) 2000-2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-/* Written by Bruno Haible <haible@clisp.cons.org>.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if HAVE_STDDEF_H
-# include <stddef.h>
-#endif
-
-#include <stdio.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#if defined _WIN32 || defined __WIN32__
-# undef WIN32   /* avoid warning on mingw32 */
-# define WIN32
-#endif
-
-#ifndef WIN32
-# if HAVE_LANGINFO_CODESET
-#  include <langinfo.h>
-# else
-#  if HAVE_SETLOCALE
-#   include <locale.h>
-#  endif
-# endif
-#else /* WIN32 */
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-#endif
-
-#ifndef DIRECTORY_SEPARATOR
-# define DIRECTORY_SEPARATOR '/'
-#endif
-
-#ifndef ISSLASH
-# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
-#endif
-
-/* The following static variable is declared 'volatile' to avoid a
-   possible multithread problem in the function get_charset_aliases. If we
-   are running in a threaded environment, and if two threads initialize
-   'charset_aliases' simultaneously, both will produce the same value,
-   and everything will be ok if the two assignments to 'charset_aliases'
-   are atomic. But I don't know what will happen if the two assignments mix.  */
-#if __STDC__ != 1
-# define volatile /* empty */
-#endif
-/* Pointer to the contents of the charset.alias file, if it has already been
-   read, else NULL.  Its format is:
-   ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0'  */
-static char * volatile charset_aliases;
-
-/* Return a pointer to the contents of the charset.alias file.  */
-static const char *
-get_charset_aliases ()
-{
-  char *cp;
-
-  cp = charset_aliases;
-  if (cp == NULL)
-    {
-#ifndef WIN32
-      FILE *fp;
-      const char *dir = LIBDIR;
-      const char *base = "charset.alias";
-      char *file_name;
-
-      /* Concatenate dir and base into freshly allocated file_name.  */
-      {
-	size_t dir_len = strlen (dir);
-	size_t base_len = strlen (base);
-	int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
-	file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
-	if (file_name != NULL)
-	  {
-	    memcpy (file_name, dir, dir_len);
-	    if (add_slash)
-	      file_name[dir_len] = DIRECTORY_SEPARATOR;
-	    memcpy (file_name + dir_len + add_slash, base, base_len + 1);
-	  }
-      }
-
-      if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL)
-	/* Out of memory or file not found, treat it as empty.  */
-	cp = "";
-      else
-	{
-	  /* Parse the file's contents.  */
-	  int c;
-	  char buf1[50+1];
-	  char buf2[50+1];
-	  char *res_ptr = NULL;
-	  size_t res_size = 0;
-	  size_t l1, l2;
-
-	  for (;;)
-	    {
-	      c = getc (fp);
-	      if (c == EOF)
-		break;
-	      if (c == '\n' || c == ' ' || c == '\t')
-		continue;
-	      if (c == '#')
-		{
-		  /* Skip comment, to end of line.  */
-		  do
-		    c = getc (fp);
-		  while (!(c == EOF || c == '\n'));
-		  if (c == EOF)
-		    break;
-		  continue;
-		}
-	      ungetc (c, fp);
-	      if (fscanf(fp, "%50s %50s", buf1, buf2) < 2)
-		break;
-	      l1 = strlen (buf1);
-	      l2 = strlen (buf2);
-	      if (res_size == 0)
-		{
-		  res_size = l1 + 1 + l2 + 1;
-		  res_ptr = malloc (res_size + 1);
-		}
-	      else
-		{
-		  res_size += l1 + 1 + l2 + 1;
-		  res_ptr = realloc (res_ptr, res_size + 1);
-		}
-	      if (res_ptr == NULL)
-		{
-		  /* Out of memory. */
-		  res_size = 0;
-		  break;
-		}
-	      strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
-	      strcpy (res_ptr + res_size - (l2 + 1), buf2);
-	    }
-	  fclose (fp);
-	  if (res_size == 0)
-	    cp = "";
-	  else
-	    {
-	      *(res_ptr + res_size) = '\0';
-	      cp = res_ptr;
-	    }
-	}
-
-      if (file_name != NULL)
-	free (file_name);
-
-#else /* WIN32 */
-
-      /* To avoid the troubles of installing a separate file in the same
-	 directory as the DLL and of retrieving the DLL's directory at
-	 runtime, simply inline the aliases here.  */
-
-      cp = "CP936" "\0" "GBK" "\0"
-	   "CP1361" "\0" "JOHAB" "\0";
-#endif
-
-      charset_aliases = cp;
-    }
-
-  return cp;
-}
-
-/* Determine the current locale's character encoding, and canonicalize it
-   into one of the canonical names listed in config.charset.
-   The result must not be freed; it is statically allocated.
-   If the canonical name cannot be determined, the result is a non-canonical
-   name.  */
-
-#ifdef STATIC
-STATIC
-#endif
-const char *
-locale_charset ()
-{
-  const char *codeset;
-  const char *aliases;
-
-#ifndef WIN32
-
-# if HAVE_LANGINFO_CODESET
-
-  /* Most systems support nl_langinfo (CODESET) nowadays.  */
-  codeset = nl_langinfo (CODESET);
-
-# else
-
-  /* On old systems which lack it, use setlocale or getenv.  */
-  const char *locale = NULL;
-
-  /* But most old systems don't have a complete set of locales.  Some
-     (like SunOS 4 or DJGPP) have only the C locale.  Therefore we don't
-     use setlocale here; it would return "C" when it doesn't support the
-     locale name the user has set.  */
-#  if HAVE_SETLOCALE && 0
-  locale = setlocale (LC_CTYPE, NULL);
-#  endif
-  if (locale == NULL || locale[0] == '\0')
-    {
-      locale = getenv ("LC_ALL");
-      if (locale == NULL || locale[0] == '\0')
-	{
-	  locale = getenv ("LC_CTYPE");
-	  if (locale == NULL || locale[0] == '\0')
-	    locale = getenv ("LANG");
-	}
-    }
-
-  /* On some old systems, one used to set locale = "iso8859_1". On others,
-     you set it to "language_COUNTRY.charset". In any case, we resolve it
-     through the charset.alias file.  */
-  codeset = locale;
-
-# endif
-
-#else /* WIN32 */
-
-  static char buf[2 + 10 + 1];
-
-  /* Win32 has a function returning the locale's codepage as a number.  */
-  sprintf (buf, "CP%u", GetACP ());
-  codeset = buf;
-
-#endif
-
-  if (codeset == NULL)
-    /* The canonical name cannot be determined.  */
-    codeset = "";
-
-  /* Resolve alias. */
-  for (aliases = get_charset_aliases ();
-       *aliases != '\0';
-       aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
-    if (strcmp (codeset, aliases) == 0
-	|| (aliases[0] == '*' && aliases[1] == '\0'))
-      {
-	codeset = aliases + strlen (aliases) + 1;
-	break;
-      }
-
-  return codeset;
-}
--- a/intl/locale.alias
+++ b/intl/locale.alias
@@ -1,77 +0,0 @@
-# Locale name alias data base.
-# Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# The format of this file is the same as for the corresponding file of
-# the X Window System, which normally can be found in
-#	/usr/lib/X11/locale/locale.alias
-# A single line contains two fields: an alias and a substitution value.
-# All entries are case independent.
-
-# Note: This file is far from being complete.  If you have a value for
-# your own site which you think might be useful for others too, share
-# it with the rest of us.  Send it using the `glibcbug' script to
-# bugs@gnu.org.
-
-# Packages using this file: 
-
-bokmal		no_NO.ISO-8859-1
-bokmål		no_NO.ISO-8859-1
-catalan		ca_ES.ISO-8859-1
-croatian	hr_HR.ISO-8859-2
-czech		cs_CZ.ISO-8859-2
-danish          da_DK.ISO-8859-1
-dansk		da_DK.ISO-8859-1
-deutsch		de_DE.ISO-8859-1
-dutch		nl_NL.ISO-8859-1
-eesti		et_EE.ISO-8859-1
-estonian	et_EE.ISO-8859-1
-finnish         fi_FI.ISO-8859-1
-français	fr_FR.ISO-8859-1
-french		fr_FR.ISO-8859-1
-galego		gl_ES.ISO-8859-1
-galician	gl_ES.ISO-8859-1
-german		de_DE.ISO-8859-1
-greek           el_GR.ISO-8859-7
-hebrew          iw_IL.ISO-8859-8
-hrvatski	hr_HR.ISO-8859-2
-hungarian       hu_HU.ISO-8859-2
-icelandic       is_IS.ISO-8859-1
-italian         it_IT.ISO-8859-1
-japanese	ja_JP.eucJP
-japanese.euc	ja_JP.eucJP
-ja_JP		ja_JP.eucJP
-ja_JP.ujis	ja_JP.eucJP
-japanese.sjis	ja_JP.SJIS
-korean		ko_KR.eucKR
-korean.euc 	ko_KR.eucKR
-ko_KR		ko_KR.eucKR
-lithuanian      lt_LT.ISO-8859-13
-nb_NO		no_NO.ISO-8859-1
-nb_NO.ISO-8859-1 no_NO.ISO-8859-1
-norwegian       no_NO.ISO-8859-1
-nynorsk		nn_NO.ISO-8859-1
-polish          pl_PL.ISO-8859-2
-portuguese      pt_PT.ISO-8859-1
-romanian        ro_RO.ISO-8859-2
-russian         ru_RU.ISO-8859-5
-slovak          sk_SK.ISO-8859-2
-slovene         sl_SI.ISO-8859-2
-slovenian       sl_SI.ISO-8859-2
-spanish         es_ES.ISO-8859-1
-swedish         sv_SE.ISO-8859-1
-thai		th_TH.TIS-620
-turkish         tr_TR.ISO-8859-9
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -1,5 +1,6 @@
 /* Handle aliases for locale names.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -15,13 +16,6 @@
   along with this program; if not, write to the Free Software Foundation,
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE    1
-#endif
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -47,15 +41,35 @@ char *alloca ();
 # endif
 #endif

-#include <stdlib.h>
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#else
+char *getenv ();
+# ifdef HAVE_MALLOC_H
+#  include <malloc.h>
+# else
+void free ();
+# endif
+#endif

-#include <string.h>
+#if defined HAVE_STRING_H || defined _LIBC
+# ifndef _GNU_SOURCE
+#  define _GNU_SOURCE	1
+# endif
+# include <string.h>
+#else
+# include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif
 #if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
 # endif
 #endif

+#include "gettext.h"
 #include "gettextP.h"

 /* @@ end of prolog @@ */
@@ -81,14 +95,40 @@ __libc_lock_define_initialized (static, lock);
 # define internal_function
 #endif

-/* For those losing systems which don't have `alloca' we have to add
+/* For those loosing systems which don't have `alloca' we have to add
   some additional code emulating it.  */
 #ifdef HAVE_ALLOCA
-# define freea(p) /* nothing */
+/* Nothing has to be done.  */
+# define ADD_BLOCK(list, address) /* nothing */
+# define FREE_BLOCKS(list) /* nothing */
 #else
-# define alloca(n) malloc (n)
-# define freea(p) free (p)
-#endif
+struct block_list
+{
+  void *address;
+  struct block_list *next;
+};
+# define ADD_BLOCK(list, addr)						      \
+  do {									      \
+    struct block_list *newp = (struct block_list *) malloc (sizeof (*newp));  \
+    /* If we cannot get a free block we cannot add the new element to	      \
+       the list.  */							      \
+    if (newp != NULL) {							      \
+      newp->address = (addr);						      \
+      newp->next = (list);						      \
+      (list) = newp;							      \
+    }									      \
+  } while (0)
+# define FREE_BLOCKS(list)						      \
+  do {									      \
+    while (list != NULL) {						      \
+      struct block_list *old = list;					      \
+      list = list->next;						      \
+      free (old);							      \
+    }									      \
+  } while (0)
+# undef alloca
+# define alloca(size) (malloc (size))
+#endif	/* have alloca */

 #if defined _LIBC_REENTRANT || defined HAVE_FGETS_UNLOCKED
 # undef fgets
@@ -107,18 +147,18 @@ struct alias_map
 };


-static char *string_space;
-static size_t string_space_act;
-static size_t string_space_max;
+static char *string_space = NULL;
+static size_t string_space_act = 0;
+static size_t string_space_max = 0;
 static struct alias_map *map;
-static size_t nmap;
-static size_t maxmap;
+static size_t nmap = 0;
+static size_t maxmap = 0;


 /* Prototypes for local functions.  */
 static size_t read_alias_file PARAMS ((const char *fname, int fname_len))
     internal_function;
-static int extend_alias_table PARAMS ((void));
+static void extend_alias_table PARAMS ((void));
 static int alias_compare PARAMS ((const struct alias_map *map1,
 				  const struct alias_map *map2));

@@ -164,12 +204,11 @@ _nl_expand_alias (name)
 	{
 	  const char *start;

-	  while (locale_alias_path[0] == PATH_SEPARATOR)
+	  while (locale_alias_path[0] == ':')
 	    ++locale_alias_path;
 	  start = locale_alias_path;

-	  while (locale_alias_path[0] != '\0'
-		 && locale_alias_path[0] != PATH_SEPARATOR)
+	  while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':')
 	    ++locale_alias_path;

 	  if (start < locale_alias_path)
@@ -192,12 +231,16 @@ read_alias_file (fname, fname_len)
     const char *fname;
     int fname_len;
 {
+#ifndef HAVE_ALLOCA
+  struct block_list *block_list = NULL;
+#endif
  FILE *fp;
  char *full_fname;
  size_t added;
  static const char aliasfile[] = "/locale.alias";

  full_fname = (char *) alloca (fname_len + sizeof aliasfile);
+  ADD_BLOCK (block_list, full_fname);
 #ifdef HAVE_MEMPCPY
  mempcpy (mempcpy (full_fname, fname, fname_len),
 	   aliasfile, sizeof aliasfile);
@@ -207,9 +250,11 @@ read_alias_file (fname, fname_len)
 #endif

  fp = fopen (full_fname, "r");
-  freea (full_fname);
  if (fp == NULL)
-    return 0;
+    {
+      FREE_BLOCKS (block_list);
+      return 0;
+    }

  added = 0;
  while (!feof (fp))
@@ -281,8 +326,7 @@ read_alias_file (fname, fname_len)
 		*cp++ = '\0';

 	      if (nmap >= maxmap)
-		if (__builtin_expect (extend_alias_table (), 0))
-		  return added;
+		extend_alias_table ();

 	      alias_len = strlen (alias) + 1;
 	      value_len = strlen (value) + 1;
@@ -295,19 +339,10 @@ read_alias_file (fname, fname_len)
 					? alias_len + value_len : 1024));
 		  char *new_pool = (char *) realloc (string_space, new_size);
 		  if (new_pool == NULL)
-		    return added;
-
-		  if (__builtin_expect (string_space != new_pool, 0))
 		    {
-		      size_t i;
-
-		      for (i = 0; i < nmap; i++)
-			{
-			  map[i].alias += new_pool - string_space;
-			  map[i].value += new_pool - string_space;
-			}
+		      FREE_BLOCKS (block_list);
+		      return added;
 		    }
-
 		  string_space = new_pool;
 		  string_space_max = new_size;
 		}
@@ -334,11 +369,12 @@ read_alias_file (fname, fname_len)
    qsort (map, nmap, sizeof (struct alias_map),
 	   (int (*) PARAMS ((const void *, const void *))) alias_compare);

+  FREE_BLOCKS (block_list);
  return added;
 }


-static int
+static void
 extend_alias_table ()
 {
  size_t new_size;
@@ -349,11 +385,10 @@ extend_alias_table ()
 						* sizeof (struct alias_map)));
  if (new_map == NULL)
    /* Simply don't extend: we don't have any more core.  */
-    return -1;
+    return;

  map = new_map;
  maxmap = new_size;
-  return 0;
 }


--- a/intl/ngettext.c
+++ b/intl/ngettext.c
@@ -1,67 +0,0 @@
-/* Implementation of ngettext(3) function.
-   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef _LIBC
-# define __need_NULL
-# include <stddef.h>
-#else
-# include <stdlib.h>		/* Just for NULL.  */
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-#include <locale.h>
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define NGETTEXT __ngettext
-# define DCNGETTEXT __dcngettext
-#else
-# define NGETTEXT ngettext__
-# define DCNGETTEXT dcngettext__
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-char *
-NGETTEXT (msgid1, msgid2, n)
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-{
-  return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__ngettext, ngettext);
-#endif
--- a/intl/plural.c
+++ b/intl/plural.c
--- a/intl/plural.y
+++ b/intl/plural.y
@@ -1,412 +0,0 @@
-%{
-/* Expression parsing for plural form selection.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* The bison generated parser uses alloca.  AIX 3 forces us to put this
-   declaration at the beginning of the file.  The declaration in bison's
-   skeleton file comes too late.  This must come before <config.h>
-   because <config.h> may include arbitrary system headers.  */
-#if defined _AIX && !defined __GNUC__
- #pragma alloca
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
-#include "gettextP.h"
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define FREE_EXPRESSION __gettext_free_exp
-#else
-# define FREE_EXPRESSION gettext_free_exp__
-# define __gettextparse gettextparse__
-#endif
-
-#define YYLEX_PARAM	&((struct parse_args *) arg)->cp
-#define YYPARSE_PARAM	arg
-%}
-%pure_parser
-%expect 10
-
-%union {
-  unsigned long int num;
-  enum operator op;
-  struct expression *exp;
-}
-
-%{
-/* Prototypes for local functions.  */
-static struct expression *new_exp PARAMS ((int nargs, enum operator op,
-					   struct expression * const *args));
-static inline struct expression *new_exp_0 PARAMS ((enum operator op));
-static inline struct expression *new_exp_1 PARAMS ((enum operator op,
-						   struct expression *right));
-static struct expression *new_exp_2 PARAMS ((enum operator op,
-					     struct expression *left,
-					     struct expression *right));
-static inline struct expression *new_exp_3 PARAMS ((enum operator op,
-						   struct expression *bexp,
-						   struct expression *tbranch,
-						   struct expression *fbranch));
-static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
-static void yyerror PARAMS ((const char *str));
-
-/* Allocation of expressions.  */
-
-static struct expression *
-new_exp (nargs, op, args)
-     int nargs;
-     enum operator op;
-     struct expression * const *args;
-{
-  int i;
-  struct expression *newp;
-
-  /* If any of the argument could not be malloc'ed, just return NULL.  */
-  for (i = nargs - 1; i >= 0; i--)
-    if (args[i] == NULL)
-      goto fail;
-
-  /* Allocate a new expression.  */
-  newp = (struct expression *) malloc (sizeof (*newp));
-  if (newp != NULL)
-    {
-      newp->nargs = nargs;
-      newp->operation = op;
-      for (i = nargs - 1; i >= 0; i--)
-	newp->val.args[i] = args[i];
-      return newp;
-    }
-
- fail:
-  for (i = nargs - 1; i >= 0; i--)
-    FREE_EXPRESSION (args[i]);
-
-  return NULL;
-}
-
-static inline struct expression *
-new_exp_0 (op)
-     enum operator op;
-{
-  return new_exp (0, op, NULL);
-}
-
-static inline struct expression *
-new_exp_1 (op, right)
-     enum operator op;
-     struct expression *right;
-{
-  struct expression *args[1];
-
-  args[0] = right;
-  return new_exp (1, op, args);
-}
-
-static struct expression *
-new_exp_2 (op, left, right)
-     enum operator op;
-     struct expression *left;
-     struct expression *right;
-{
-  struct expression *args[2];
-
-  args[0] = left;
-  args[1] = right;
-  return new_exp (2, op, args);
-}
-
-static inline struct expression *
-new_exp_3 (op, bexp, tbranch, fbranch)
-     enum operator op;
-     struct expression *bexp;
-     struct expression *tbranch;
-     struct expression *fbranch;
-{
-  struct expression *args[3];
-
-  args[0] = bexp;
-  args[1] = tbranch;
-  args[2] = fbranch;
-  return new_exp (3, op, args);
-}
-
-%}
-
-/* This declares that all operators have the same associativity and the
-   precedence order as in C.  See [Harbison, Steele: C, A Reference Manual].
-   There is no unary minus and no bitwise operators.
-   Operators with the same syntactic behaviour have been merged into a single
-   token, to save space in the array generated by bison.  */
-%right '?'		/*   ?		*/
-%left '|'		/*   ||		*/
-%left '&'		/*   &&		*/
-%left EQUOP2		/*   == !=	*/
-%left CMPOP2		/*   < > <= >=	*/
-%left ADDOP2		/*   + -	*/
-%left MULOP2		/*   * / %	*/
-%right '!'		/*   !		*/
-
-%token <op> EQUOP2 CMPOP2 ADDOP2 MULOP2
-%token <num> NUMBER
-%type <exp> exp
-
-%%
-
-start:	  exp
-	  {
-	    if ($1 == NULL)
-	      YYABORT;
-	    ((struct parse_args *) arg)->res = $1;
-	  }
-	;
-
-exp:	  exp '?' exp ':' exp
-	  {
-	    $$ = new_exp_3 (qmop, $1, $3, $5);
-	  }
-	| exp '|' exp
-	  {
-	    $$ = new_exp_2 (lor, $1, $3);
-	  }
-	| exp '&' exp
-	  {
-	    $$ = new_exp_2 (land, $1, $3);
-	  }
-	| exp EQUOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| exp CMPOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| exp ADDOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| exp MULOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| '!' exp
-	  {
-	    $$ = new_exp_1 (lnot, $2);
-	  }
-	| 'n'
-	  {
-	    $$ = new_exp_0 (var);
-	  }
-	| NUMBER
-	  {
-	    if (($$ = new_exp_0 (num)) != NULL)
-	      $$->val.num = $1;
-	  }
-	| '(' exp ')'
-	  {
-	    $$ = $2;
-	  }
-	;
-
-%%
-
-void
-internal_function
-FREE_EXPRESSION (exp)
-     struct expression *exp;
-{
-  if (exp == NULL)
-    return;
-
-  /* Handle the recursive case.  */
-  switch (exp->nargs)
-    {
-    case 3:
-      FREE_EXPRESSION (exp->val.args[2]);
-      /* FALLTHROUGH */
-    case 2:
-      FREE_EXPRESSION (exp->val.args[1]);
-      /* FALLTHROUGH */
-    case 1:
-      FREE_EXPRESSION (exp->val.args[0]);
-      /* FALLTHROUGH */
-    default:
-      break;
-    }
-
-  free (exp);
-}
-
-
-static int
-yylex (lval, pexp)
-     YYSTYPE *lval;
-     const char **pexp;
-{
-  const char *exp = *pexp;
-  int result;
-
-  while (1)
-    {
-      if (exp[0] == '\0')
-	{
-	  *pexp = exp;
-	  return YYEOF;
-	}
-
-      if (exp[0] != ' ' && exp[0] != '\t')
-	break;
-
-      ++exp;
-    }
-
-  result = *exp++;
-  switch (result)
-    {
-    case '0': case '1': case '2': case '3': case '4':
-    case '5': case '6': case '7': case '8': case '9':
-      {
-	unsigned long int n = result - '0';
-	while (exp[0] >= '0' && exp[0] <= '9')
-	  {
-	    n *= 10;
-	    n += exp[0] - '0';
-	    ++exp;
-	  }
-	lval->num = n;
-	result = NUMBER;
-      }
-      break;
-
-    case '=':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = equal;
-	  result = EQUOP2;
-	}
-      else
-	result = YYERRCODE;
-      break;
-
-    case '!':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = not_equal;
-	  result = EQUOP2;
-	}
-      break;
-
-    case '&':
-    case '|':
-      if (exp[0] == result)
-	++exp;
-      else
-	result = YYERRCODE;
-      break;
-
-    case '<':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = less_or_equal;
-	}
-      else
-	lval->op = less_than;
-      result = CMPOP2;
-      break;
-
-    case '>':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = greater_or_equal;
-	}
-      else
-	lval->op = greater_than;
-      result = CMPOP2;
-      break;
-
-    case '*':
-      lval->op = mult;
-      result = MULOP2;
-      break;
-
-    case '/':
-      lval->op = divide;
-      result = MULOP2;
-      break;
-
-    case '%':
-      lval->op = module;
-      result = MULOP2;
-      break;
-
-    case '+':
-      lval->op = plus;
-      result = ADDOP2;
-      break;
-
-    case '-':
-      lval->op = minus;
-      result = ADDOP2;
-      break;
-
-    case 'n':
-    case '?':
-    case ':':
-    case '(':
-    case ')':
-      /* Nothing, just return the character.  */
-      break;
-
-    case ';':
-    case '\n':
-    case '\0':
-      /* Be safe and let the user call this function again.  */
-      --exp;
-      result = YYEOF;
-      break;
-
-    default:
-      result = YYERRCODE;
-#if YYDEBUG != 0
-      --exp;
-#endif
-      break;
-    }
-
-  *pexp = exp;
-
-  return result;
-}
-
-
-static void
-yyerror (str)
-     const char *str;
-{
-  /* Do nothing.  We don't print error messages here.  */
-}
--- a/intl/ref-add.sin
+++ b/intl/ref-add.sin
@@ -1,31 +0,0 @@
-# Add this package to a list of references stored in a text file.
-#
-#   Copyright (C) 2000 Free Software Foundation, Inc.
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Library General Public License as published
-#   by the Free Software Foundation; either version 2, or (at your option)
-#   any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Library General Public License for more details.
-#
-#   You should have received a copy of the GNU Library General Public
-#   License along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-#   USA.
-#
-# Written by Bruno Haible <haible@clisp.cons.org>.
-#
-/^# Packages using this file: / {
-  s/# Packages using this file://
-  ta
-  :a
-  s/ @PACKAGE@ / @PACKAGE@ /
-  tb
-  s/ $/ @PACKAGE@ /
-  :b
-  s/^/# Packages using this file:/
-}
--- a/intl/ref-del.sin
+++ b/intl/ref-del.sin
@@ -1,26 +0,0 @@
-# Remove this package from a list of references stored in a text file.
-#
-#   Copyright (C) 2000 Free Software Foundation, Inc.
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Library General Public License as published
-#   by the Free Software Foundation; either version 2, or (at your option)
-#   any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Library General Public License for more details.
-#
-#   You should have received a copy of the GNU Library General Public
-#   License along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-#   USA.
-#
-# Written by Bruno Haible <haible@clisp.cons.org>.
-#
-/^# Packages using this file: / {
-  s/# Packages using this file://
-  s/ @PACKAGE@ / /
-  s/^/# Packages using this file:/
-}
--- a/intl/textdomain.c
+++ b/intl/textdomain.c
@@ -1,5 +1,6 @@
 /* Implementation of the textdomain(3) function.
-   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,32 +20,23 @@
 # include <config.h>
 #endif

-#include <stdlib.h>
-#include <string.h>
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#endif
+
+#if defined STDC_HEADERS || defined HAVE_STRING_H || defined _LIBC
+# include <string.h>
+#else
+# include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif

 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgnuintl.h"
-#endif
-#include "gettextP.h"
-
-#ifdef _LIBC
-/* We have to handle multi-threaded applications.  */
-# include <bits/libc-lock.h>
-#else
-/* Provide dummy implementation if this is outside glibc.  */
-# define __libc_rwlock_define(CLASS, NAME)
-# define __libc_rwlock_wrlock(NAME)
-# define __libc_rwlock_unlock(NAME)
-#endif
-
-/* The internal variables in the standalone libintl.a must have different
-   names than the internal variables in GNU libc, otherwise programs
-   using libintl.a cannot be linked statically.  */
-#if !defined _LIBC
-# define _nl_default_default_domain _nl_default_default_domain__
-# define _nl_current_default_domain _nl_current_default_domain__
+# include "libgettext.h"
 #endif

 /* @@ end of prolog @@ */
@@ -69,9 +61,6 @@ extern const char *_nl_current_default_domain;
 # define TEXTDOMAIN textdomain__
 #endif

-/* Lock variable to protect the global data in the gettext implementation.  */
-__libc_rwlock_define (extern, _nl_state_lock)
-
 /* Set the current default message catalog to DOMAINNAME.
   If DOMAINNAME is null, return the current default.
   If DOMAINNAME is "", reset to the default of "messages".  */
@@ -79,60 +68,38 @@ char *
 TEXTDOMAIN (domainname)
     const char *domainname;
 {
-  char *new_domain;
-  char *old_domain;
+  char *old;

  /* A NULL pointer requests the current setting.  */
  if (domainname == NULL)
    return (char *) _nl_current_default_domain;

-  __libc_rwlock_wrlock (_nl_state_lock);
-
-  old_domain = (char *) _nl_current_default_domain;
+  old = (char *) _nl_current_default_domain;

  /* If domain name is the null string set to default domain "messages".  */
  if (domainname[0] == '\0'
      || strcmp (domainname, _nl_default_default_domain) == 0)
-    {
-      _nl_current_default_domain = _nl_default_default_domain;
-      new_domain = (char *) _nl_current_default_domain;
-    }
-  else if (strcmp (domainname, old_domain) == 0)
-    /* This can happen and people will use it to signal that some
-       environment variable changed.  */
-    new_domain = old_domain;
+    _nl_current_default_domain = _nl_default_default_domain;
  else
    {
      /* If the following malloc fails `_nl_current_default_domain'
 	 will be NULL.  This value will be returned and so signals we
 	 are out of core.  */
 #if defined _LIBC || defined HAVE_STRDUP
-      new_domain = strdup (domainname);
+      _nl_current_default_domain = strdup (domainname);
 #else
      size_t len = strlen (domainname) + 1;
-      new_domain = (char *) malloc (len);
-      if (new_domain != NULL)
-	memcpy (new_domain, domainname, len);
+      char *cp = (char *) malloc (len);
+      if (cp != NULL)
+	memcpy (cp, domainname, len);
+      _nl_current_default_domain = cp;
 #endif
-
-      if (new_domain != NULL)
-	_nl_current_default_domain = new_domain;
    }

-  /* We use this possibility to signal a change of the loaded catalogs
-     since this is most likely the case and there is no other easy we
-     to do it.  Do it only when the call was successful.  */
-  if (new_domain != NULL)
-    {
-      ++_nl_msg_cat_cntr;
+  if (old != _nl_default_default_domain)
+    free (old);

-      if (old_domain != new_domain && old_domain != _nl_default_default_domain)
-	free (old_domain);
-    }
-
-  __libc_rwlock_unlock (_nl_state_lock);
-
-  return new_domain;
+  return (char *) _nl_current_default_domain;
 }

 #ifdef _LIBC
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -0,0 +1,329 @@
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper@cygnus.com>, 1995.
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+# serial 108
+
+AC_PREREQ(2.13)               dnl Minimum Autoconf version required.
+
+AC_DEFUN(NANO_AM_WITH_NLS,
+  [AC_MSG_CHECKING([whether NLS is requested])
+    dnl Default is enabled NLS
+    AC_ARG_ENABLE(nls,
+      [  --disable-nls           do not use Native Language Support],
+      USE_NLS=$enableval, USE_NLS=yes)
+    AC_MSG_RESULT($USE_NLS)
+    AC_SUBST(USE_NLS)
+
+    USE_INCLUDED_LIBINTL=no
+
+    AC_ARG_WITH(locale-dir,
+      [  --with-locale-dir=DIR   specify locale directory],
+      LOCALE_DIR=$withval)
+    test -z "$LOCALE_DIR" && LOCALE_DIR='$(datadir)/locale'
+    AC_SUBST(LOCALE_DIR)
+
+    AC_ARG_WITH(gnu-locale-dir,
+      [  --with-gnu-locale-dir=DIR specify GNU locale directory],
+      GNU_LOCALE_DIR=$withval)
+    test -z "$GNU_LOCALE_DIR" && GNU_LOCALE_DIR='$(prefix)/share/locale'
+    AC_SUBST(GNU_LOCALE_DIR)
+
+    dnl If we use NLS figure out what method
+    if test "$USE_NLS" = "yes"; then
+      AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS 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],
+        nls_cv_force_use_gnu_gettext=$withval,
+        nls_cv_force_use_gnu_gettext=no)
+      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
+
+      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=
+	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)])
+
+	   if test "$gt_cv_func_gettext_libc" != "yes"; then
+	     AC_CHECK_LIB(intl, bindtextdomain,
+	       [AC_CHECK_LIB(intl, gettext)])
+	   fi
+
+	   if test "$gt_cv_func_gettext_libc" = "yes" \
+	      || test "$ac_cv_lib_intl_gettext" = "yes"; then
+	      AC_DEFINE(HAVE_GETTEXT, 1,
+	  [Define to 1 if you have gettext and don't want to use GNU gettext.])
+	      NANO_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)
+		NANO_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
+	  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, 1,
+			 [Define as 1 if you have catgets and don't want to use GNU gettext.])
+	       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
+		   NANO_AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
+		    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
+		 fi
+		 NANO_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
+      fi
+
+      if test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions used to generate GNU NLS library.
+        INTLOBJS="\$(GETTOBJS)"
+        NANO_AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
+        AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+        NANO_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+        AC_SUBST(MSGFMT)
+	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
+      fi
+
+      dnl Test whether we really found GNU xgettext.
+      if test "$XGETTEXT" != ":"; then
+	dnl If it is no GNU xgettext we define it as : so that the
+	dnl Makefiles still can work.
+	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+	  : ;
+	else
+	  AC_MSG_RESULT(
+	    [found xgettext program is not GNU xgettext; ignore it])
+	  XGETTEXT=":"
+	fi
+      fi
+
+      # 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 -z "$nls_cv_header_intl"; then
+      # Clean out junk possibly left behind by a previous configuration.
+      rm -f intl/libintl.h
+    fi
+    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+    AC_OUTPUT_COMMANDS(
+     [case "$CONFIG_FILES" 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.
+    if test "$PACKAGE" = gettext; then
+      USE_NLS=yes
+      USE_INCLUDED_LIBINTL=yes
+    fi
+
+    dnl These rules are solely for the distribution goal.  While doing this
+    dnl we only have to keep exactly one list of the available catalogs
+    dnl in configure.in.
+    for lang in $ALL_LINGUAS; do
+      GMOFILES="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done
+
+    dnl Make all variables we use known to autoconf.
+    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)
+  ])
+
+AC_DEFUN(NANO_AM_GNU_GETTEXT,
+  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+   AC_REQUIRE([AC_PROG_CC])dnl
+   AC_REQUIRE([AC_PROG_RANLIB])dnl
+   AC_REQUIRE([AC_ISC_POSIX])dnl
+   AC_REQUIRE([AC_HEADER_STDC])dnl
+   AC_REQUIRE([AC_C_CONST])dnl
+   AC_REQUIRE([AC_C_INLINE])dnl
+   AC_REQUIRE([AC_TYPE_OFF_T])dnl
+   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+   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, 1, [Define to 1 if you have the stpcpy function.])
+   fi
+
+   NANO_AM_LC_MESSAGES
+   NANO_AM_WITH_NLS
+
+   if test "x$CATOBJEXT" != "x"; then
+     if test "x$ALL_LINGUAS" = "x"; then
+       LINGUAS=
+     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" ;;
+         esac
+       done
+       LINGUAS=$NEW_LINGUAS
+       AC_MSG_RESULT($LINGUAS)
+     fi
+
+     dnl Construct list of names of catalog files to be constructed.
+     if test -n "$LINGUAS"; then
+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+     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 Try to locate is.
+   MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+   AC_SUBST(MKINSTALLDIRS)
+
+   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.
+   test -d po || mkdir po
+   case "$srcdir" in
+   .)
+     posrcprefix="../" ;;
+   /* | [[A-Za-z]]:*)
+     posrcprefix="$srcdir/" ;;
+   *)
+     posrcprefix="../$srcdir/" ;;
+   esac
+   rm -f po/POTFILES
+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+	< $srcdir/po/POTFILES.in > po/POTFILES
+  ])
--- a/m4/largefile.m4
+++ b/m4/largefile.m4
@@ -0,0 +1,92 @@
+#serial 19
+
+dnl By default, many hosts won't let programs access large files;
+dnl one must use special compiler options to get large-file access to work.
+dnl For more details about this brain damage please see:
+dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
+
+dnl Written by Paul Eggert <eggert@twinsun.com>.
+
+dnl Internal subroutine of AC_SYS_LARGEFILE.
+dnl AC_SYS_LARGEFILE_TEST_INCLUDES
+AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES,
+  [[#include <sys/types.h>
+    /* Check that off_t can represent 2**63 - 1 correctly.
+       We can't simply "#define LARGE_OFF_T 9223372036854775807",
+       since some C++ compilers masquerading as C compilers
+       incorrectly reject 9223372036854775807.  */
+#   define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+			&& LARGE_OFF_T % 2147483647 == 1)
+		       ? 1 : -1];
+  ]])
+
+dnl Internal subroutine of AC_SYS_LARGEFILE.
+dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, COMMENT, INCLUDES, FUNCTION-BODY)
+AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
+  [AC_CACHE_CHECK([for $1 value needed for large files], $3,
+     [$3=no
+      AC_TRY_COMPILE([$5],
+	[$6], 
+	,
+	[AC_TRY_COMPILE([#define $1 $2]
+[$5]
+	   ,
+	   [$6],
+	   [$3=$2])])])
+   if test "[$]$3" != no; then
+     AC_DEFINE_UNQUOTED([$1], [$]$3, [$4])
+   fi])
+
+AC_DEFUN(NANO_AC_SYS_LARGEFILE,
+  [AC_REQUIRE([AC_PROG_CC])
+   AC_ARG_ENABLE(largefile,
+     [  --disable-largefile     omit support for large files])
+   if test "$enable_largefile" != no; then
+
+     AC_CACHE_CHECK([for special C compiler options needed for large files],
+       ac_cv_sys_largefile_CC,
+       [ac_cv_sys_largefile_CC=no
+        if test "$GCC" != yes; then
+	  # IRIX 6.2 and later do not support large files by default,
+	  # so use the C compiler's -n32 option if that helps.
+	  AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , ,
+	    [ac_save_CC="$CC"
+	     CC="$CC -n32"
+	     AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, ,
+	       ac_cv_sys_largefile_CC=' -n32')
+	     CC="$ac_save_CC"])
+        fi])
+     if test "$ac_cv_sys_largefile_CC" != no; then
+       CC="$CC$ac_cv_sys_largefile_CC"
+     fi
+
+     AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
+       ac_cv_sys_file_offset_bits,
+       [Number of bits in a file offset, on hosts where this is settable.],
+       AC_SYS_LARGEFILE_TEST_INCLUDES)
+     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1,
+       ac_cv_sys_large_files,
+       [Define for large files, on AIX-style hosts.],
+       AC_SYS_LARGEFILE_TEST_INCLUDES)
+   fi
+  ])
+
+AC_DEFUN(AC_FUNC_FSEEKO,
+  [AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1,
+     ac_cv_sys_largefile_source,
+     [Define to make fseeko visible on some hosts (e.g. glibc 2.2).],
+     [#include <stdio.h>], [return !fseeko;])
+   # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+   # in glibc 2.1.3, but that breaks too many other things.
+   # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+
+   AC_CACHE_CHECK([for fseeko], ac_cv_func_fseeko,
+     [ac_cv_func_fseeko=no
+      AC_TRY_LINK([#include <stdio.h>],
+        [return fseeko && fseeko (stdin, 0, 0);],
+	[ac_cv_func_fseeko=yes])])
+   if test $ac_cv_func_fseeko != no; then
+     AC_DEFINE(HAVE_FSEEKO, 1,
+       [Define if fseeko (and presumably ftello) exists and is declared.])
+   fi])
--- a/m4/lcmessage.m4
+++ b/m4/lcmessage.m4
@@ -0,0 +1,22 @@
+# Check whether LC_MESSAGES is available in <locale.h>.
+# Ulrich Drepper <drepper@cygnus.com>, 1995.
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+# serial 2
+
+AC_PREREQ(2.13)               dnl Minimum Autoconf version required.
+
+AC_DEFUN(NANO_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 contains LC_MESSAGES.])
+    fi
+  fi])
--- a/m4/progtest.m4
+++ b/m4/progtest.m4
@@ -0,0 +1,47 @@
+# Search path for a program which passes the given test.
+# Ulrich Drepper <drepper@cygnus.com>, 1996.
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+# serial 1
+
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN(NANO_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])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+  /*)
+  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if [$3]; then
+	ac_cv_path_$1="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+  ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test -n "[$]$1"; then
+  AC_MSG_RESULT([$]$1)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])
--- a/nano.c
+++ b/nano.c
@@ -608,6 +608,7 @@ int do_mark(void)
 	edit_refresh();
    }
 #endif
+    SET(DISABLE_CURPOS);
    return 1;
 }

@@ -2389,7 +2390,7 @@ int main(int argc, char *argv[])
 	{"tabsize", 1, 0, 'T'},

 #ifdef ENABLE_MULTIBUFFER
-	{"MULTIBUFFER", 0, 0, 'L'},
+	{"multibuffer", 0, 0, 'F'},
 #endif

 	{0, 0, 0, 0}
@@ -2412,17 +2413,17 @@ int main(int argc, char *argv[])
 #endif /* ENABLE_NANORC */

 #ifdef HAVE_GETOPT_LONG
-    while ((optchr = getopt_long(argc, argv, "h?LT:RVbcefgijklmpr:s:tvwxz",
+    while ((optchr = getopt_long(argc, argv, "h?FT:RVbcefgijklmpr:s:tvwxz",
 				 long_options, &option_index)) != EOF) {
 #else
    while ((optchr =
-	    getopt(argc, argv, "h?LT:RVbcefgijklmpr:s:tvwxz")) != EOF) {
+	    getopt(argc, argv, "h?FT:RVbcefgijklmpr:s:tvwxz")) != EOF) {
 #endif

 	switch (optchr) {

 #ifdef ENABLE_MULTIBUFFER
-	case 'L':
+	case 'F':
 	    SET(MULTIBUFFER);
 	    break;
 #endif
--- a/nano.h
+++ b/nano.h
@@ -276,28 +276,40 @@ know what you're doing */

 /* Toggle stuff, these static lengths need to go away RSN */

+#ifndef HAVE_REGEX_H
+#define NO_REGEX 1
+#else 
+#define NO_REGEX 0
+#endif
+
+#ifdef DISABLE_BROWSER
+#define NO_BROWSER 1
+#else
+#define NO_BROWSER 0
+#endif
+
+#ifdef NANO_SMALL
 #ifdef HAVE_REGEX_H
+#define NO_TOGGLES 3
+#else
+#define NO_TOGGLES 2
+#endif /* HAVE_REGEX_H */
+#else
+#define NO_TOGGLES 0
+#endif /* NANO_SMALL */

 #ifdef ENABLE_MULTIBUFFER
-#define TOGGLE_LEN 14
+#define MULTI_TOGGLES 3
 #else
-#define TOGGLE_LEN 11
-#endif
-
-#define WHEREIS_LIST_LEN 8
-#define REPLACE_LIST_LEN 8
-#else
-
-#ifdef ENABLE_MULTIBUFFER
-#define TOGGLE_LEN 13
-#else
-#define TOGGLE_LEN 10
-#endif
-
-#define WHEREIS_LIST_LEN 7
-#define REPLACE_LIST_LEN 7
+#define MULTI_TOGGLES 0
 #endif

+#define WHEREIS_LIST_LEN (8 - NO_REGEX - NO_TOGGLES)
+#define REPLACE_LIST_LEN (8 - NO_REGEX - NO_TOGGLES)
+#define TOGGLE_LEN (11 - NO_REGEX + MULTI_TOGGLES)
+#define WRITEFILE_LIST_LEN (3 - NO_BROWSER)
+#define INSERTFILE_LIST_LEN (2 - NO_BROWSER)
+#define BROWSER_LIST_LEN 4
 #define MAIN_LIST_LEN 26
 #define MAIN_VISIBLE 12
 #define REPLACE_LIST_2_LEN 3
@@ -306,14 +318,8 @@ know what you're doing */
 #define HELP_LIST_LEN 3
 #define SPELL_LIST_LEN 1

-#ifndef DISABLE_BROWSER
-#define WRITEFILE_LIST_LEN 3
-#define INSERTFILE_LIST_LEN 2
-#define BROWSER_LIST_LEN 4
-#else
-#define WRITEFILE_LIST_LEN 3
-#define IMSERTFILE_LIST_LEN 1
-#endif
+
+

 #define VIEW 1
 #define NOVIEW 0
--- a/nano.info
+++ b/nano.info
@@ -1,4 +1,4 @@
-This is nano.info, produced by makeinfo version 4.0 from nano.texi.
+This is nano.info, produced by makeinfo version 4.0b from nano.texi.

 INFO-DIR-SECTION Editors
 START-INFO-DIR-ENTRY
@@ -391,21 +391,21 @@ consider the following command line options:


 Tag Table:
-Node: Top199
-Node: Introduction507
-Node: Overview933
-Node: Command Line Options1513
-Ref: Expert Mode3405
-Node: Editor Basics4248
-Node: Entering Text4473
-Node: Special Functions4813
-Node: The Titlebar5668
-Node: The Statusbar6366
-Node: Shortcut Lists6947
-Node: Online Help7340
-Node: Feature Toggles7716
-Node: The File Browser8859
-Node: Pico Compatibility9568
-Node: Building and Configure Options11610
+Node: Top200
+Node: Introduction508
+Node: Overview934
+Node: Command Line Options1514
+Ref: Expert Mode3406
+Node: Editor Basics4249
+Node: Entering Text4474
+Node: Special Functions4814
+Node: The Titlebar5669
+Node: The Statusbar6367
+Node: Shortcut Lists6948
+Node: Online Help7341
+Node: Feature Toggles7717
+Node: The File Browser8860
+Node: Pico Compatibility9569
+Node: Building and Configure Options11611

 End Tag Table
--- a/nano.texi
+++ b/nano.texi
@@ -8,7 +8,7 @@
@c Run `makeinfo' rather than `texinfo-format-buffer'.
@smallbook
@set EDITION 0.1
-@set VERSION 1.1.0
+@set VERSION 1.1.1
@set UPDATED 12 Feb 2001

@dircategory Editors
@@ -23,7 +23,7 @@
@titlepage
@title GNU @code{nano}
@subtitle a small and friendly text editor.
-@subtitle version 1.1.0
+@subtitle version 1.1.1

@author Chris Allegretta
@page
--- a/nanorc.sample
+++ b/nanorc.sample
@@ -17,7 +17,7 @@
 # Don't follow symlinks when writing files
 # set nofollow

-# Use Pico Compatibility mode for ths shortcut lists and search text
+# Use Pico Compatibility mode for the shortcut lists and search text
 # set pico

 # Use this value instead of the default
@@ -38,10 +38,10 @@
 # Don't display the help lists at the bottom of the screen
 # set nohelp

-# Allow nano to be suepended with ^Z
+# Allow nano to be suspended with ^Z
 # set suspend

-# Load files upon inserting them, and allow switching between them
+# Allow multiple file buffers (using ^R inserts into separate buffer)
 # You must have configured with --enable-multibuffer or --enable-extra for
 # this to work
 #
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.0\n"
-"POT-Creation-Date: 2001-07-14 18:56-0400\n"
+"POT-Creation-Date: 2001-07-28 19:55-0400\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"
@@ -24,133 +24,133 @@ msgstr "add_to_cutbuffer cridat amb inptr->data = %s\n"
 msgid "Blew away cutbuffer =)\n"
 msgstr "Hem foragitat el cuttbuffer =)\n"

-#: files.c:134
+#: files.c:145
 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:196 files.c:214
+#: files.c:207 files.c:225
 #, c-format
 msgid "Read %d lines"
 msgstr "%d línies llegides"

-#: files.c:232 search.c:210
+#: files.c:243 search.c:215
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" no trobat"

 #. We have a new file
-#: files.c:236
+#: files.c:247
 msgid "New File"
 msgstr "Nou Fitxer"

-#: files.c:249
+#: files.c:260
 #, 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:252
+#: files.c:263
 #, c-format
 msgid "File \"%s\" is a device file"
 msgstr "El fitxer \"%s\" és un dispositiu"

-#: files.c:259
+#: files.c:270
 msgid "Reading File"
 msgstr "S'està llegint el Fitxer"

-#: files.c:279
+#: files.c:290
 msgid "File to insert [from ./] "
 msgstr "Fitxer a inserir [des de ./] "

-#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705
-#: files.c:716 files.c:1102
+#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716
+#: files.c:727 files.c:1113
 #, c-format
 msgid "filename is %s"
 msgstr "filename és %s"

-#: files.c:368 files.c:872 files.c:1187 nano.c:1629
+#: files.c:379 files.c:883 files.c:1198 nano.c:1630
 msgid "Cancelled"
 msgstr "Cancel·lat"

-#: files.c:642 files.c:697
+#: files.c:653 files.c:708
 msgid "No more open files"
 msgstr ""

-#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974
+#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "No he pogut obrir el fitxer per a escriure: %s"

-#: files.c:955
+#: files.c:966
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Escrites >%s\n"

-#: files.c:983
+#: files.c:994
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "No he pogut tancar %s: %s"

 #. Try a rename??
-#: files.c:1006 files.c:1015 files.c:1020
+#: files.c:1017 files.c:1026 files.c:1031
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "No he pogut obrir %s per a escriure: %s"

-#: files.c:1027
+#: files.c:1038
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "No he pogut establir permisos %o en %s: %s"

-#: files.c:1034
+#: files.c:1045
 #, c-format
 msgid "Wrote %d lines"
 msgstr "%d línies escrites"

-#: files.c:1074
+#: files.c:1085
 #, c-format
 msgid "%s Selection to File"
 msgstr ""

-#: files.c:1074 files.c:1078 global.c:496
+#: files.c:1085 files.c:1089 global.c:499
 #, fuzzy
 msgid "Append"
 msgstr "Suspendre"

-#: files.c:1074 files.c:1078
+#: files.c:1085 files.c:1089
 #, fuzzy
 msgid "Write"
 msgstr "Desar"

-#: files.c:1078
+#: files.c:1089
 #, fuzzy, c-format
 msgid "File Name to %s"
 msgstr "Nom de Fitxer a escriure"

-#: files.c:1116
+#: files.c:1127
 msgid "File exists, OVERWRITE ?"
 msgstr "El fitxer existeix, SOBREESCRIURE ?"

-#: files.c:1598
+#: files.c:1609
 msgid "(more)"
 msgstr "(més)"

-#: files.c:1911
+#: files.c:1922
 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:1921 files.c:1969
+#: files.c:1932 files.c:1980
 #, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "No es pot obrir \"%s\": %s"

-#: files.c:1949 global.c:277
+#: files.c:1960 global.c:275
 msgid "Goto Directory"
 msgstr "Anar a Directori"

-#: files.c:1954
+#: files.c:1965
 msgid "Goto Cancelled"
 msgstr "Anar a Cancel·lat"

@@ -211,300 +211,300 @@ msgstr ""
 msgid "Open next loaded file"
 msgstr ""

-#: global.c:238
+#: global.c:236
 msgid "Invoke the help menu"
 msgstr "Invocar el menú d'ajuda"

-#: global.c:239
+#: global.c:237
 msgid "Write the current file to disk"
 msgstr "Escriure el fitxer actual a disc"

-#: global.c:242
+#: global.c:240
 msgid "Close currently loaded file/Exit from nano"
 msgstr ""

-#: global.c:244
+#: global.c:242
 msgid "Exit from nano"
 msgstr "Sortir de nano"

-#: global.c:247
+#: global.c:245
 msgid "Goto a specific line number"
 msgstr "Anar a un número de línia específic"

-#: global.c:248
+#: global.c:246
 msgid "Justify the current paragraph"
 msgstr "Justificar el paràgraf actual"

-#: global.c:249
+#: global.c:247
 msgid "Unjustify after a justify"
 msgstr "Desjustificar després d'un justificar"

-#: global.c:250
+#: global.c:248
 msgid "Replace text within the editor"
 msgstr "Reemplaçar text al editor"

-#: global.c:251
+#: global.c:249
 msgid "Insert another file into the current one"
 msgstr "Inserir un altre fitxer dins del actual"

-#: global.c:252
+#: global.c:250
 msgid "Search for text within the editor"
 msgstr "Cercar un text al editor"

-#: global.c:253
+#: global.c:251
 msgid "Move to the previous screen"
 msgstr "Moure a la pàgina anterior"

-#: global.c:254
+#: global.c:252
 msgid "Move to the next screen"
 msgstr "Moure a la pàgina següent"

-#: global.c:255
+#: global.c:253
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Tallar la línia actual i desar-la al cutbuffer"

-#: global.c:256
+#: global.c:254
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Enganxar el cutbuffer a la línia actual"

-#: global.c:257
+#: global.c:255
 msgid "Show the position of the cursor"
 msgstr "Mostrar la posició del cursor"

-#: global.c:258
+#: global.c:256
 msgid "Invoke the spell checker (if available)"
 msgstr "Invocar el corrector ortogràfic (si està disponible)"

-#: global.c:259
+#: global.c:257
 msgid "Move up one line"
 msgstr "Moure una línia cap a dalt"

-#: global.c:260
+#: global.c:258
 msgid "Move down one line"
 msgstr "Moure una línia cap a baix"

-#: global.c:261
+#: global.c:259
 msgid "Move forward one character"
 msgstr "Moure endavant un caràcter"

-#: global.c:262
+#: global.c:260
 msgid "Move back one character"
 msgstr "Moure endarrere un caràcter"

-#: global.c:263
+#: global.c:261
 msgid "Move to the beginning of the current line"
 msgstr "Moure al principi de la línia actual"

-#: global.c:264
+#: global.c:262
 msgid "Move to the end of the current line"
 msgstr "Moure al final de la línia actual"

-#: global.c:265
+#: global.c:263
 msgid "Go to the first line of the file"
 msgstr "Anar a la primera línia del fitxer"

-#: global.c:266
+#: global.c:264
 msgid "Go to the last line of the file"
 msgstr "Anar a la darrera línia del fitxer"

-#: global.c:267
+#: global.c:265
 msgid "Refresh (redraw) the current screen"
 msgstr "Redibuixar la pantalla actual"

-#: global.c:268
+#: global.c:266
 msgid "Mark text at the current cursor location"
 msgstr "Marcar text a la posició actual del cursor"

-#: global.c:269
+#: global.c:267
 msgid "Delete the character under the cursor"
 msgstr "Suprimir el caràcter sota el cursor"

-#: global.c:271
+#: global.c:269
 msgid "Delete the character to the left of the cursor"
 msgstr "Suprimir el caràcter a l'esquerra del cursor"

-#: global.c:272
+#: global.c:270
 msgid "Insert a tab character"
 msgstr "Inserir un caràcter tab"

-#: global.c:273
+#: global.c:271
 msgid "Insert a carriage return at the cursor position"
 msgstr "Inserir un retorn a la posició del cursor"

-#: global.c:275
+#: global.c:273
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Fer que la recerca actual siga sensible a majúscules"

-#: global.c:276
+#: global.c:274
 msgid "Go to file browser"
 msgstr "Anar a l'explorador de fitxers"

-#: global.c:278
+#: global.c:276
 msgid "Cancel the current function"
 msgstr "Cancel·lar la funció actual"

-#: global.c:279
+#: global.c:277
 #, fuzzy
 msgid "Append to the current file"
 msgstr "Moure al final de la línia actual"

-#: global.c:280
+#: global.c:278
 #, fuzzy
 msgid "Search Backwards"
 msgstr "Recerca Cancel·lada"

-#: global.c:281
+#: global.c:279
 #, fuzzy
 msgid "Use Regular Expressions"
 msgstr "Expressions regulars"

-#: global.c:284
+#: global.c:282
 msgid "Get Help"
 msgstr "Veure Ajuda"

-#: global.c:289
+#: global.c:287
 msgid "Close"
 msgstr ""

-#: global.c:293 global.c:487 global.c:525
+#: global.c:291 global.c:490 global.c:528
 msgid "Exit"
 msgstr "Sortir"

-#: global.c:296
+#: global.c:294
 msgid "WriteOut"
 msgstr "Desar"

-#: global.c:301 global.c:390
+#: global.c:299 global.c:388
 msgid "Justify"
 msgstr "Justificar"

-#: global.c:305 global.c:311
+#: global.c:303 global.c:309
 msgid "Read File"
 msgstr "L. Fitxer"

-#: global.c:315 global.c:386 global.c:410
+#: global.c:313 global.c:384 global.c:408
 msgid "Replace"
 msgstr "Reemplaçar"

-#: global.c:319
+#: global.c:317
 msgid "Where Is"
 msgstr "Cercar"

-#: global.c:323 global.c:479 global.c:514
+#: global.c:321 global.c:482 global.c:517
 msgid "Prev Page"
 msgstr "Pàg Ant"

-#: global.c:327 global.c:483 global.c:518
+#: global.c:325 global.c:486 global.c:521
 msgid "Next Page"
 msgstr "Pàg Seg"

-#: global.c:331
+#: global.c:329
 msgid "Cut Text"
 msgstr "TallarTxt"

-#: global.c:335
+#: global.c:333
 msgid "UnJustify"
 msgstr "Desjustificar"

-#: global.c:338
+#: global.c:336
 msgid "UnCut Txt"
 msgstr "EnganTxt"

-#: global.c:342
+#: global.c:340
 msgid "Cur Pos"
 msgstr "Pos Act"

-#: global.c:346
+#: global.c:344
 msgid "To Spell"
 msgstr "Ortografia"

-#: global.c:350
+#: global.c:348
 msgid "Up"
 msgstr "Dalt"

-#: global.c:353
+#: global.c:351
 msgid "Down"
 msgstr "Baix"

-#: global.c:356
+#: global.c:354
 msgid "Forward"
 msgstr "Endavant"

-#: global.c:359
+#: global.c:357
 msgid "Back"
 msgstr "Endarrere"

-#: global.c:362
+#: global.c:360
 msgid "Home"
 msgstr "Inici"

-#: global.c:365
+#: global.c:363
 msgid "End"
 msgstr "Fi"

-#: global.c:368
+#: global.c:366
 msgid "Refresh"
 msgstr "Refrescar"

-#: global.c:371
+#: global.c:369
 msgid "Mark Text"
 msgstr "MarcarTxt"

-#: global.c:374
+#: global.c:372
 msgid "Delete"
 msgstr "Suprimir"

-#: global.c:378
+#: global.c:376
 msgid "Backspace"
 msgstr "Retrocés"

-#: global.c:382
+#: global.c:380
 msgid "Tab"
 msgstr "Tab"

-#: global.c:394
+#: global.c:392
 msgid "Enter"
 msgstr "Retorn"

-#: global.c:398 global.c:414 global.c:441
+#: global.c:396 global.c:412 global.c:442
 msgid "Goto Line"
 msgstr "Anar a Línia"

-#: global.c:404 global.c:431 global.c:459 global.c:469
+#: global.c:402 global.c:432 global.c:462 global.c:472
 msgid "First Line"
 msgstr "Primera Línia"

-#: global.c:407 global.c:434 global.c:462 global.c:472
+#: global.c:405 global.c:435 global.c:465 global.c:475
 msgid "Last Line"
 msgstr "Última Línia"

-#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499
-#: global.c:507 global.c:510 global.c:528 winio.c:1239
-msgid "Cancel"
-msgstr "Cancel·lar"
-
-#: global.c:420 global.c:447
+#: global.c:416 global.c:446
 msgid "Case Sens"
 msgstr "Maj/Min"

-#: global.c:423 global.c:450
+#: global.c:419 global.c:449
 #, fuzzy
 msgid "Backward"
 msgstr "Endarrere"

-#: global.c:427 global.c:454
+#: global.c:424 global.c:454
 msgid "Regexp"
 msgstr ""

-#: global.c:437
+#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502
+#: global.c:510 global.c:513 global.c:531 winio.c:1239
+msgid "Cancel"
+msgstr "Cancel·lar"
+
+#: global.c:438
 msgid "No Replace"
 msgstr "No Reemplaçar"

-#: global.c:492 global.c:503
+#: global.c:495 global.c:506
 msgid "To Files"
 msgstr "A Fitxers"

-#: global.c:522
+#: global.c:525
 msgid "Goto"
 msgstr "Anar a"

@@ -784,129 +784,129 @@ msgstr "Marca Establida"
 msgid "Mark UNset"
 msgstr "Marca Esborrada"

-#: nano.c:1105
+#: nano.c:1106
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap cridat amb inptr->data=\"%s\"\n"

-#: nano.c:1157
+#: nano.c:1158
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data ara = \"%d\"\n"

-#: nano.c:1209
+#: nano.c:1210
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Després, data = \"%s\"\n"

-#: nano.c:1310
+#: nano.c:1311
 msgid "Edit a replacement"
 msgstr "Editar un reemplaçament"

-#: nano.c:1548
+#: nano.c:1549
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "No s'ha pogut crear un fitxer temporal: %s"

-#: nano.c:1554
+#: nano.c:1555
 msgid "Spell checking failed: unable to write temp file!"
 msgstr "Revisió d'ortografia fallida: no s'ha pogut escriure fitxer temporal!"

-#: nano.c:1566
+#: nano.c:1567
 msgid "Finished checking spelling"
 msgstr "Revisió d'ortografia finalitzada"

-#: nano.c:1568
+#: nano.c:1569
 msgid "Spell checking failed"
 msgstr "Revisió d'ortografia fallida"

-#: nano.c:1597
+#: nano.c:1598
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Desar el buffer modificat (RESPONDRE \"No\" DESTRUIRÀ ELS CAMVIS) ?"

-#: nano.c:1733
+#: nano.c:1734
 msgid "Received SIGHUP"
 msgstr "SIGHUP rebut"

-#: nano.c:1797
+#: nano.c:1798
 msgid "Cannot resize top win"
 msgstr "No es pot canviar la mida de la finestra superior"

-#: nano.c:1799
+#: nano.c:1800
 msgid "Cannot move top win"
 msgstr "No es pot moure la finestra superior"

-#: nano.c:1801
+#: nano.c:1802
 msgid "Cannot resize edit win"
 msgstr "No es pot canviar la mida de la finestra d'edició"

-#: nano.c:1803
+#: nano.c:1804
 msgid "Cannot move edit win"
 msgstr "No es pot moure la finestra d'edició"

-#: nano.c:1805
+#: nano.c:1806
 msgid "Cannot resize bottom win"
 msgstr "No es pot canviar la mida de la finestra inferior"

-#: nano.c:1807
+#: nano.c:1808
 msgid "Cannot move bottom win"
 msgstr "No es pot moure la finestra inferior"

-#: nano.c:2132
+#: nano.c:2133
 msgid "Can now UnJustify!"
 msgstr "Ara pots desjustificar!"

-#: nano.c:2248
+#: nano.c:2249
 #, c-format
 msgid "%s enable/disable"
 msgstr "%s habilitar/inhabilitar"

-#: nano.c:2267
+#: nano.c:2268
 msgid "enabled"
 msgstr "habilitat"

-#: nano.c:2268
+#: nano.c:2269
 msgid "disabled"
 msgstr "inhabilitat"

-#: nano.c:2321
+#: nano.c:2322
 msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 msgstr ""
 "Detectat NumLock trencat.  El tecl. numèric funcionarà amb NumLock activat"

-#: nano.c:2576
+#: nano.c:2577
 msgid "Main: set up windows\n"
 msgstr "Main: configurar les finestres\n"

-#: nano.c:2587
+#: nano.c:2588
 msgid "Main: bottom win\n"
 msgstr "Main: finestra inferior\n"

-#: nano.c:2593
+#: nano.c:2594
 msgid "Main: open file\n"
 msgstr "Main: obrir fitxer\n"

-#: nano.c:2651
+#: nano.c:2652
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "He agafat Alt-O-%c! (%d)\n"

-#: nano.c:2678
+#: nano.c:2679
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "He agafat Alt-[-1-%c! (%d)\n"

-#: nano.c:2716
+#: nano.c:2717
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "He agafat Alt-[-2-%c! (%d)\n"

-#: nano.c:2770
+#: nano.c:2771
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "He agafat Alt-[-%c! (%d)\n"

-#: nano.c:2805
+#: nano.c:2806
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "He agafat Alt-%c! (%d)\n"
@@ -960,92 +960,92 @@ msgstr ""
 msgid "Unable to open ~/.nanorc file, %s"
 msgstr ""

-#: search.c:126
+#: search.c:129
 #, fuzzy
 msgid "Case Sensitive "
 msgstr "Maj/Min"

-#: search.c:127
+#: search.c:130
 msgid "Regexp "
 msgstr ""

-#: search.c:128
+#: search.c:131
 #, fuzzy
 msgid "Search"
 msgstr "Cercar%s%s"

-#: search.c:129
+#: search.c:132
 msgid " Backwards"
 msgstr ""

-#: search.c:130
+#: search.c:133
 msgid " (to replace)"
 msgstr " (a reemplaçar)"

-#: search.c:135 search.c:399
+#: search.c:138 search.c:404
 msgid "Search Cancelled"
 msgstr "Recerca Cancel·lada"

-#: search.c:216
+#: search.c:221
 #, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s...\" no trobat"

-#: search.c:265 search.c:321
+#: search.c:270 search.c:326
 msgid "Search Wrapped"
 msgstr "Recerca Recomençada"

-#: search.c:421
+#: search.c:426
 #, c-format
 msgid "Replaced %d occurrences"
 msgstr "%d ocurrències reemplaçadas"

-#: search.c:423
+#: search.c:428
 msgid "Replaced 1 occurrence"
 msgstr "1 ocurrència reemplaçada"

-#: search.c:561 search.c:671 search.c:687
+#: search.c:566 search.c:676 search.c:692
 msgid "Replace Cancelled"
 msgstr "Reemplaçar Cancel·lat"

-#: search.c:611
+#: search.c:616
 msgid "Replace this instance?"
 msgstr "Reemplaçar aquesta instància?"

-#: search.c:623
+#: search.c:628
 msgid "Replace failed: unknown subexpression!"
 msgstr "Impossible de reemplaçar: subexpressió desconeguda!"

-#: search.c:712
+#: search.c:717
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Reemplaçar amb [%s]"

-#: search.c:716 search.c:720
+#: search.c:721 search.c:725
 msgid "Replace with"
 msgstr "Reemplaçar amb"

-#: search.c:754
+#: search.c:759
 msgid "Enter line number"
 msgstr "Introdueix número de línia"

-#: search.c:756
+#: search.c:761
 msgid "Aborted"
 msgstr "Avortat"

-#: search.c:765
+#: search.c:770
 msgid "Come on, be reasonable"
 msgstr "Au vinga, sigues assenyat"

-#: utils.c:146
+#: utils.c:159
 msgid "nano: malloc: out of memory!"
 msgstr "nano: malloc: memòria insuficient!"

-#: utils.c:160
+#: utils.c:173
 msgid "nano: calloc: out of memory!"
 msgstr "nano: calloc: memòria insuficient!"

-#: utils.c:170
+#: utils.c:183
 msgid "nano: realloc: out of memory!"
 msgstr "nano: realloc: memòria insuficient!"

--- 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-07-14 18:56-0400\n"
+"POT-Creation-Date: 2001-07-28 19:55-0400\n"
 "Last-Translator: Václav Haisman <V.Haisman@sh.cvut.cz>\n"
 "Language-Team: N/A\n"
 "MIME-Version: 1.0\n"
@@ -22,133 +22,133 @@ msgstr "add_to_cutbuffer vol
 msgid "Blew away cutbuffer =)\n"
 msgstr "Blew away cutbuffer =)\n"

-#: files.c:134
+#: files.c:145
 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:196 files.c:214
+#: files.c:207 files.c:225
 #, c-format
 msgid "Read %d lines"
 msgstr "Pøeèteno %d øádek"

-#: files.c:232 search.c:210
+#: files.c:243 search.c:215
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" nenalezen"

 #. We have a new file
-#: files.c:236
+#: files.c:247
 msgid "New File"
 msgstr "Nový Soubor"

-#: files.c:249
+#: files.c:260
 #, 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:252
+#: files.c:263
 #, fuzzy, c-format
 msgid "File \"%s\" is a device file"
 msgstr "Soubor \"%s\" je soubor zaøízení"

-#: files.c:259
+#: files.c:270
 msgid "Reading File"
 msgstr "Ètu Soubor"

-#: files.c:279
+#: files.c:290
 msgid "File to insert [from ./] "
 msgstr "Soubor pro vlo¾ení [z ./] "

-#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705
-#: files.c:716 files.c:1102
+#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716
+#: files.c:727 files.c:1113
 #, c-format
 msgid "filename is %s"
 msgstr "jméno souboru je %s"

-#: files.c:368 files.c:872 files.c:1187 nano.c:1629
+#: files.c:379 files.c:883 files.c:1198 nano.c:1630
 msgid "Cancelled"
 msgstr "Zru¹eno"

-#: files.c:642 files.c:697
+#: files.c:653 files.c:708
 msgid "No more open files"
 msgstr ""

-#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974
+#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Nemohu otevøít soubor pro zápis: %s"

-#: files.c:955
+#: files.c:966
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Zapsáno >%s\n"

-#: files.c:983
+#: files.c:994
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Nemohu zavøít %s: %s"

 #. Try a rename??
-#: files.c:1006 files.c:1015 files.c:1020
+#: files.c:1017 files.c:1026 files.c:1031
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Nemohu otevøít %s pro zápis: %s"

-#: files.c:1027
+#: files.c:1038
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Nemohu nastavit pøístupvá práva %o na %s: %s"

-#: files.c:1034
+#: files.c:1045
 #, c-format
 msgid "Wrote %d lines"
 msgstr "Zapsáno %d øádek"

-#: files.c:1074
+#: files.c:1085
 #, c-format
 msgid "%s Selection to File"
 msgstr ""

-#: files.c:1074 files.c:1078 global.c:496
+#: files.c:1085 files.c:1089 global.c:499
 #, fuzzy
 msgid "Append"
 msgstr "Zastavit"

-#: files.c:1074 files.c:1078
+#: files.c:1085 files.c:1089
 #, fuzzy
 msgid "Write"
 msgstr "Zapi¹"

-#: files.c:1078
+#: files.c:1089
 #, fuzzy, c-format
 msgid "File Name to %s"
 msgstr "Jméno Souboru pro zapsání"

-#: files.c:1116
+#: files.c:1127
 msgid "File exists, OVERWRITE ?"
 msgstr "Soubor existuje, PØEPSAT ?"

-#: files.c:1598
+#: files.c:1609
 msgid "(more)"
 msgstr "(více)"

-#: files.c:1911
+#: files.c:1922
 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:1921 files.c:1969
+#: files.c:1932 files.c:1980
 #, fuzzy, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "Nemohu zavøít %s: %s"

-#: files.c:1949 global.c:277
+#: files.c:1960 global.c:275
 #, fuzzy
 msgid "Goto Directory"
 msgstr "Jdi na Øádku"

-#: files.c:1954
+#: files.c:1965
 #, fuzzy
 msgid "Goto Cancelled"
 msgstr "Zru¹eno"
@@ -211,306 +211,306 @@ msgstr ""
 msgid "Open next loaded file"
 msgstr ""

-#: global.c:238
+#: global.c:236
 msgid "Invoke the help menu"
 msgstr "Vyvolat menu nápovìdy"

-#: global.c:239
+#: global.c:237
 msgid "Write the current file to disk"
 msgstr "Zapsat aktuální soubor na disk"

-#: global.c:242
+#: global.c:240
 msgid "Close currently loaded file/Exit from nano"
 msgstr ""

-#: global.c:244
+#: global.c:242
 msgid "Exit from nano"
 msgstr "Ukonèit nano"

-#: global.c:247
+#: global.c:245
 #, fuzzy
 msgid "Goto a specific line number"
 msgstr "Jdi na øádku"

-#: global.c:248
+#: global.c:246
 msgid "Justify the current paragraph"
 msgstr "Zarovnej aktuální odstavec"

-#: global.c:249
+#: global.c:247
 msgid "Unjustify after a justify"
 msgstr "Zru¹ pøedchozí zarovnání"

-#: global.c:250
+#: global.c:248
 msgid "Replace text within the editor"
 msgstr "Zamìn text v editoru"

-#: global.c:251
+#: global.c:249
 msgid "Insert another file into the current one"
 msgstr "Vlo¾ soubor do aktuálního souboru"

-#: global.c:252
+#: global.c:250
 msgid "Search for text within the editor"
 msgstr "Hledej text v editoru"

-#: global.c:253
+#: global.c:251
 msgid "Move to the previous screen"
 msgstr "Pøesuò se na pøedchozí obrazovku"

-#: global.c:254
+#: global.c:252
 msgid "Move to the next screen"
 msgstr "Pøesuò se na dal¹í obrazovku"

-#: global.c:255
+#: global.c:253
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Vyjmi aktuální øádku a ulo¾ ji v cutbufferu"

-#: global.c:256
+#: global.c:254
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Vlo¾ z cutbufferu do aktuální øádky"

-#: global.c:257
+#: global.c:255
 msgid "Show the position of the cursor"
 msgstr "Uka¾ pozici kurzoru"

-#: global.c:258
+#: global.c:256
 msgid "Invoke the spell checker (if available)"
 msgstr "Vyvolej kontrolu pravopisu (pokud je k dispozici)"

-#: global.c:259
+#: global.c:257
 msgid "Move up one line"
 msgstr "Pøesun o rádek nahoru"

-#: global.c:260
+#: global.c:258
 msgid "Move down one line"
 msgstr "Pøesun o øádek dolu"

-#: global.c:261
+#: global.c:259
 msgid "Move forward one character"
 msgstr "Pøesun o znak dopøedu"

-#: global.c:262
+#: global.c:260
 msgid "Move back one character"
 msgstr "Pøesun o znak zpìt"

-#: global.c:263
+#: global.c:261
 msgid "Move to the beginning of the current line"
 msgstr "Pøesun na zaèátek aktuální øádky"

-#: global.c:264
+#: global.c:262
 msgid "Move to the end of the current line"
 msgstr "Pøesun na konec aktuální øádky"

-#: global.c:265
+#: global.c:263
 msgid "Go to the first line of the file"
 msgstr "Pøesun na první øádku souboru"

-#: global.c:266
+#: global.c:264
 msgid "Go to the last line of the file"
 msgstr "Pøesun na poslední øádku souboru"

-#: global.c:267
+#: global.c:265
 msgid "Refresh (redraw) the current screen"
 msgstr "Obnov (pøekresli) obrazovku"

-#: global.c:268
+#: global.c:266
 msgid "Mark text at the current cursor location"
 msgstr "Oznaè text na souèasné pozici kurzoru"

-#: global.c:269
+#: global.c:267
 msgid "Delete the character under the cursor"
 msgstr "Sma¾ znak pod kurzorem"

-#: global.c:271
+#: global.c:269
 msgid "Delete the character to the left of the cursor"
 msgstr "Sma¾ znak nalevo od kurzoru"

-#: global.c:272
+#: global.c:270
 msgid "Insert a tab character"
 msgstr "Vlo¾ znak tabulátoru"

-#: global.c:273
+#: global.c:271
 msgid "Insert a carriage return at the cursor position"
 msgstr "Vlo¾ konec øádky na pozici kurzoru"

-#: global.c:275
+#: global.c:273
 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:276
+#: global.c:274
 msgid "Go to file browser"
 msgstr "Jdi do prohlí¾eè souborù"

-#: global.c:278
+#: global.c:276
 msgid "Cancel the current function"
 msgstr "Zru¹ aktuální funkci"

-#: global.c:279
+#: global.c:277
 #, fuzzy
 msgid "Append to the current file"
 msgstr "Pøesun na konec aktuální øádky"

-#: global.c:280
+#: global.c:278
 #, fuzzy
 msgid "Search Backwards"
 msgstr "Hledání Zru¹eno"

-#: global.c:281
+#: global.c:279
 #, fuzzy
 msgid "Use Regular Expressions"
 msgstr "Regulární výrazy"

-#: global.c:284
+#: global.c:282
 msgid "Get Help"
 msgstr "Nápovìda"

-#: global.c:289
+#: global.c:287
 msgid "Close"
 msgstr ""

-#: global.c:293 global.c:487 global.c:525
+#: global.c:291 global.c:490 global.c:528
 msgid "Exit"
 msgstr "Konec"

-#: global.c:296
+#: global.c:294
 msgid "WriteOut"
 msgstr "Zapi¹"

-#: global.c:301 global.c:390
+#: global.c:299 global.c:388
 msgid "Justify"
 msgstr "Zarovnání"

-#: global.c:305 global.c:311
+#: global.c:303 global.c:309
 #, fuzzy
 msgid "Read File"
 msgstr "Èíst Soubor"

-#: global.c:315 global.c:386 global.c:410
+#: global.c:313 global.c:384 global.c:408
 #, fuzzy
 msgid "Replace"
 msgstr "Zámìna"

-#: global.c:319
+#: global.c:317
 msgid "Where Is"
 msgstr "Kde Je"

-#: global.c:323 global.c:479 global.c:514
+#: global.c:321 global.c:482 global.c:517
 msgid "Prev Page"
 msgstr "Pøedchozí Strana"

-#: global.c:327 global.c:483 global.c:518
+#: global.c:325 global.c:486 global.c:521
 msgid "Next Page"
 msgstr "Dal¹í Strana"

-#: global.c:331
+#: global.c:329
 msgid "Cut Text"
 msgstr "Vyjmi Text"

-#: global.c:335
+#: global.c:333
 msgid "UnJustify"
 msgstr "OdZarovnej"

-#: global.c:338
+#: global.c:336
 msgid "UnCut Txt"
 msgstr "Zru¹ vyjmutí textu"

-#: global.c:342
+#: global.c:340
 msgid "Cur Pos"
 msgstr "Pozice Kurzoru"

-#: global.c:346
+#: global.c:344
 msgid "To Spell"
 msgstr "Pravopis"

-#: global.c:350
+#: global.c:348
 msgid "Up"
 msgstr "Nahoru"

-#: global.c:353
+#: global.c:351
 msgid "Down"
 msgstr "Dolu"

-#: global.c:356
+#: global.c:354
 msgid "Forward"
 msgstr "Dopøedu"

-#: global.c:359
+#: global.c:357
 msgid "Back"
 msgstr "Zpìt"

-#: global.c:362
+#: global.c:360
 msgid "Home"
 msgstr "Domù"

-#: global.c:365
+#: global.c:363
 msgid "End"
 msgstr "Konec"

-#: global.c:368
+#: global.c:366
 msgid "Refresh"
 msgstr "Obnov"

-#: global.c:371
+#: global.c:369
 #, fuzzy
 msgid "Mark Text"
 msgstr "Oznaè Text"

-#: global.c:374
+#: global.c:372
 msgid "Delete"
 msgstr "Zma¾"

-#: global.c:378
+#: global.c:376
 msgid "Backspace"
 msgstr "Backspace"

-#: global.c:382
+#: global.c:380
 msgid "Tab"
 msgstr "Tab"

-#: global.c:394
+#: global.c:392
 msgid "Enter"
 msgstr "Enter"

-#: global.c:398 global.c:414 global.c:441
+#: global.c:396 global.c:412 global.c:442
 msgid "Goto Line"
 msgstr "Jdi na Øádku"

-#: global.c:404 global.c:431 global.c:459 global.c:469
+#: global.c:402 global.c:432 global.c:462 global.c:472
 msgid "First Line"
 msgstr "První Øádka"

-#: global.c:407 global.c:434 global.c:462 global.c:472
+#: global.c:405 global.c:435 global.c:465 global.c:475
 msgid "Last Line"
 msgstr "Poslední Øádka"

-#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499
-#: global.c:507 global.c:510 global.c:528 winio.c:1239
-msgid "Cancel"
-msgstr "Storno"
-
-#: global.c:420 global.c:447
+#: global.c:416 global.c:446
 msgid "Case Sens"
 msgstr "Case Sens"

-#: global.c:423 global.c:450
+#: global.c:419 global.c:449
 #, fuzzy
 msgid "Backward"
 msgstr "Zpìt"

-#: global.c:427 global.c:454
+#: global.c:424 global.c:454
 msgid "Regexp"
 msgstr ""

-#: global.c:437
+#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502
+#: global.c:510 global.c:513 global.c:531 winio.c:1239
+msgid "Cancel"
+msgstr "Storno"
+
+#: global.c:438
 #, fuzzy
 msgid "No Replace"
 msgstr "Bez zámìny"

-#: global.c:492 global.c:503
+#: global.c:495 global.c:506
 #, fuzzy
 msgid "To Files"
 msgstr "K Souborùm"

-#: global.c:522
+#: global.c:525
 #, fuzzy
 msgid "Goto"
 msgstr "Jdi na Øádku"
@@ -792,130 +792,130 @@ msgstr "Zna
 msgid "Mark UNset"
 msgstr "Znaèka OdNastavena"

-#: nano.c:1105
+#: nano.c:1106
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap zavoláno s inptr->data=\"%s\"\n"

-#: nano.c:1157
+#: nano.c:1158
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data nyní = \"%s\"\n"

-#: nano.c:1209
+#: nano.c:1210
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Poté, data = \"%s\"\n"

-#: nano.c:1310
+#: nano.c:1311
 msgid "Edit a replacement"
 msgstr "Edituj náhradu"

-#: nano.c:1548
+#: nano.c:1549
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Nemohu vytvoøit doèasný soubor: %s"

-#: nano.c:1554
+#: nano.c:1555
 msgid "Spell checking failed: unable to write temp file!"
 msgstr "Kontrola pravopisu selhala: nemohu zapisovat do doèasného souboru!"

-#: nano.c:1566
+#: nano.c:1567
 msgid "Finished checking spelling"
 msgstr "Kontrola pravopisu dokonèena"

-#: nano.c:1568
+#: nano.c:1569
 msgid "Spell checking failed"
 msgstr "Kontrola pravopisu selhala"

-#: nano.c:1597
+#: nano.c:1598
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Ulo¾ zmìnìný buffer (ODPOVÌÏÍ \"Ne\" ZTRATÍTE ZMÌNY) ? "

-#: nano.c:1733
+#: nano.c:1734
 msgid "Received SIGHUP"
 msgstr "Pøijat signál SIGHUP"

-#: nano.c:1797
+#: nano.c:1798
 msgid "Cannot resize top win"
 msgstr "Nemohu zmìnit velikost vrchního okna"

-#: nano.c:1799
+#: nano.c:1800
 msgid "Cannot move top win"
 msgstr "Nemohu pøesunout vrchní okno"

-#: nano.c:1801
+#: nano.c:1802
 msgid "Cannot resize edit win"
 msgstr "Nemohu zmìnit velikost editovacího okna"

-#: nano.c:1803
+#: nano.c:1804
 msgid "Cannot move edit win"
 msgstr "Nemohu pøesunout editovací okno"

-#: nano.c:1805
+#: nano.c:1806
 msgid "Cannot resize bottom win"
 msgstr "Nemohu zmìnit velikost spodního okna"

-#: nano.c:1807
+#: nano.c:1808
 msgid "Cannot move bottom win"
 msgstr "Nemohu pøesunout spodní okno"

-#: nano.c:2132
+#: nano.c:2133
 msgid "Can now UnJustify!"
 msgstr "Mù¾e nyní OdZarovnat!"

-#: nano.c:2248
+#: nano.c:2249
 #, c-format
 msgid "%s enable/disable"
 msgstr "%s povol/zaka¾"

-#: nano.c:2267
+#: nano.c:2268
 msgid "enabled"
 msgstr "povoleno"

-#: nano.c:2268
+#: nano.c:2269
 msgid "disabled"
 msgstr "zakázáno"

-#: nano.c:2321
+#: nano.c:2322
 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:2576
+#: nano.c:2577
 msgid "Main: set up windows\n"
 msgstr "Main: nastav okna\n"

-#: nano.c:2587
+#: nano.c:2588
 msgid "Main: bottom win\n"
 msgstr "Main: spodní okno\n"

-#: nano.c:2593
+#: nano.c:2594
 msgid "Main: open file\n"
 msgstr "Main: otevøi soubor\n"

-#: nano.c:2651
+#: nano.c:2652
 #, fuzzy, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "Mám Alt-O-%c! (%d)\n"

-#: nano.c:2678
+#: nano.c:2679
 #, fuzzy, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "Mám Alt-[-1-%c! (%d)\n"

-#: nano.c:2716
+#: nano.c:2717
 #, fuzzy, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "Mám Alt-[-2-%c! (%d)\n"

-#: nano.c:2770
+#: nano.c:2771
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Mám Alt-[-%c! (%d)\n"

-#: nano.c:2805
+#: nano.c:2806
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Mám Alt-%c! (%d)\n"
@@ -969,94 +969,94 @@ msgstr ""
 msgid "Unable to open ~/.nanorc file, %s"
 msgstr ""

-#: search.c:126
+#: search.c:129
 #, fuzzy
 msgid "Case Sensitive "
 msgstr "Case Sens"

-#: search.c:127
+#: search.c:130
 msgid "Regexp "
 msgstr ""

-#: search.c:128
+#: search.c:131
 #, fuzzy
 msgid "Search"
 msgstr "Hledání"

-#: search.c:129
+#: search.c:132
 msgid " Backwards"
 msgstr ""

-#: search.c:130
+#: search.c:133
 msgid " (to replace)"
 msgstr " (k zámìnì)"

-#: search.c:135 search.c:399
+#: search.c:138 search.c:404
 msgid "Search Cancelled"
 msgstr "Hledání Zru¹eno"

-#: search.c:216
+#: search.c:221
 #, fuzzy, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s...\" nenalezen"

-#: search.c:265 search.c:321
+#: search.c:270 search.c:326
 msgid "Search Wrapped"
 msgstr "Hledání Zalomeno"

-#: search.c:421
+#: search.c:426
 #, fuzzy, c-format
 msgid "Replaced %d occurrences"
 msgstr "Zamìnìno %d výskytù"

-#: search.c:423
+#: search.c:428
 #, fuzzy
 msgid "Replaced 1 occurrence"
 msgstr "Zamìnìn 1 výskyt"

-#: search.c:561 search.c:671 search.c:687
+#: search.c:566 search.c:676 search.c:692
 msgid "Replace Cancelled"
 msgstr "Zámìna Zru¹ena"

-#: search.c:611
+#: search.c:616
 msgid "Replace this instance?"
 msgstr "Zamìnit tuto instanci?"

-#: search.c:623
+#: search.c:628
 msgid "Replace failed: unknown subexpression!"
 msgstr "Zámìna selhala: neznámý podvýraz!"

-#: search.c:712
+#: search.c:717
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Zamìn s [%s]"

-#: search.c:716 search.c:720
+#: search.c:721 search.c:725
 msgid "Replace with"
 msgstr "Zamìn s"

-#: search.c:754
+#: search.c:759
 msgid "Enter line number"
 msgstr "Zadej èíslo øádky"

-#: search.c:756
+#: search.c:761
 msgid "Aborted"
 msgstr "Pøeru¹eno"

-#: search.c:765
+#: search.c:770
 msgid "Come on, be reasonable"
 msgstr "Notak, buï rozumný."

-#: utils.c:146
+#: utils.c:159
 msgid "nano: malloc: out of memory!"
 msgstr "nano: malloc: nedostatek pamìti!"

-#: utils.c:160
+#: utils.c:173
 #, fuzzy
 msgid "nano: calloc: out of memory!"
 msgstr "nano: malloc: nedostatek pamìti!"

-#: utils.c:170
+#: utils.c:183
 #, fuzzy
 msgid "nano: realloc: out of memory!"
 msgstr "nano: malloc: nedostatek pamìti!"
--- 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-07-14 18:56-0400\n"
+"POT-Creation-Date: 2001-07-28 19:55-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"
@@ -24,133 +24,133 @@ msgstr "add_to_cutbuffer aufgerufen mit inptr->data = %s\n"
 msgid "Blew away cutbuffer =)\n"
 msgstr "Inhalt der Zwischenablage verworfen\n"

-#: files.c:134
+#: files.c:145
 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:196 files.c:214
+#: files.c:207 files.c:225
 #, c-format
 msgid "Read %d lines"
 msgstr "%d Zeilen gelesen"

-#: files.c:232 search.c:210
+#: files.c:243 search.c:215
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" nicht gefunden"

 #. We have a new file
-#: files.c:236
+#: files.c:247
 msgid "New File"
 msgstr "Neue Datei"

-#: files.c:249
+#: files.c:260
 #, 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:252
+#: files.c:263
 #, c-format
 msgid "File \"%s\" is a device file"
 msgstr "Datei \"%s\" ist eine Gerätedatei"

-#: files.c:259
+#: files.c:270
 msgid "Reading File"
 msgstr "Lese Datei"

-#: files.c:279
+#: files.c:290
 msgid "File to insert [from ./] "
 msgstr "Datei einfügen [von ./] "

-#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705
-#: files.c:716 files.c:1102
+#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716
+#: files.c:727 files.c:1113
 #, c-format
 msgid "filename is %s"
 msgstr "Dateiname ist %s"

-#: files.c:368 files.c:872 files.c:1187 nano.c:1629
+#: files.c:379 files.c:883 files.c:1198 nano.c:1630
 msgid "Cancelled"
 msgstr "Abgebrochen"

-#: files.c:642 files.c:697
+#: files.c:653 files.c:708
 msgid "No more open files"
 msgstr ""

-#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974
+#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Konnte nicht in Datei schreiben: %s"

-#: files.c:955
+#: files.c:966
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Schrieb >%s\n"

-#: files.c:983
+#: files.c:994
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Konnte %s nicht schließen: %s"

 #. Try a rename??
-#: files.c:1006 files.c:1015 files.c:1020
+#: files.c:1017 files.c:1026 files.c:1031
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Konnte %s nicht zum Schreiben öffnen: %s"

-#: files.c:1027
+#: files.c:1038
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Konnte Rechte %o für %s nicht setzen: %s"

-#: files.c:1034
+#: files.c:1045
 #, c-format
 msgid "Wrote %d lines"
 msgstr "%d Zeilen geschrieben"

-#: files.c:1074
+#: files.c:1085
 #, c-format
 msgid "%s Selection to File"
 msgstr ""

-#: files.c:1074 files.c:1078 global.c:496
+#: files.c:1085 files.c:1089 global.c:499
 #, fuzzy
 msgid "Append"
 msgstr "Suspend"

-#: files.c:1074 files.c:1078
+#: files.c:1085 files.c:1089
 #, fuzzy
 msgid "Write"
 msgstr "Speichern"

-#: files.c:1078
+#: files.c:1089
 #, fuzzy, c-format
 msgid "File Name to %s"
 msgstr "Dateiname zum Speichern"

-#: files.c:1116
+#: files.c:1127
 msgid "File exists, OVERWRITE ?"
 msgstr "Datei exisitiert, ÜBERSCHREIBEN ?"

-#: files.c:1598
+#: files.c:1609
 msgid "(more)"
 msgstr "(mehr)"

-#: files.c:1911
+#: files.c:1922
 msgid "Can't move up a directory"
 msgstr "Konnte nicht in <20>bergeordnetes Verzeichnis wechseln"

 #. We can't open this dir for some reason.  Complain
-#: files.c:1921 files.c:1969
+#: files.c:1932 files.c:1980
 #, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "Konnte \"%s\" nicht öffnen: %s"

-#: files.c:1949 global.c:277
+#: files.c:1960 global.c:275
 #, fuzzy
 msgid "Goto Directory"
 msgstr "Zu Zeile"

-#: files.c:1954
+#: files.c:1965
 #, fuzzy
 msgid "Goto Cancelled"
 msgstr "Abgebrochen"
@@ -212,303 +212,303 @@ msgstr ""
 msgid "Open next loaded file"
 msgstr ""

-#: global.c:238
+#: global.c:236
 msgid "Invoke the help menu"
 msgstr "Hilfe-Menü anzeigen"

-#: global.c:239
+#: global.c:237
 msgid "Write the current file to disk"
 msgstr "Datei speichern"

-#: global.c:242
+#: global.c:240
 msgid "Close currently loaded file/Exit from nano"
 msgstr ""

-#: global.c:244
+#: global.c:242
 msgid "Exit from nano"
 msgstr "nano beenden"

-#: global.c:247
+#: global.c:245
 msgid "Goto a specific line number"
 msgstr "Zu einer Zeile springen"

-#: global.c:248
+#: global.c:246
 msgid "Justify the current paragraph"
 msgstr "Absatz ausrichten"

-#: global.c:249
+#: global.c:247
 msgid "Unjustify after a justify"
 msgstr "Absatzausrochtung rückgängig machen"

-#: global.c:250
+#: global.c:248
 msgid "Replace text within the editor"
 msgstr "Text im Editor ersetzen"

-#: global.c:251
+#: global.c:249
 msgid "Insert another file into the current one"
 msgstr "Datei einfügen"

-#: global.c:252
+#: global.c:250
 msgid "Search for text within the editor"
 msgstr "Im Editor nach Text suchen"

-#: global.c:253
+#: global.c:251
 msgid "Move to the previous screen"
 msgstr "Zu der vorhergehenden Seite springen"

-#: global.c:254
+#: global.c:252
 msgid "Move to the next screen"
 msgstr "Zu der folgenden Seite springen"

-#: global.c:255
+#: global.c:253
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Zeile ausschneiden und in dir Zwischenablage speichern"

-#: global.c:256
+#: global.c:254
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Aus der Zwischenablage einfügen"

-#: global.c:257
+#: global.c:255
 msgid "Show the position of the cursor"
 msgstr "Cursoposition anzeigen"

-#: global.c:258
+#: global.c:256
 msgid "Invoke the spell checker (if available)"
 msgstr "Rechtschreibprüfung aufrufen (wenn verfügbar)"

-#: global.c:259
+#: global.c:257
 msgid "Move up one line"
 msgstr "Zur vorhergehenden Zeile springen"

-#: global.c:260
+#: global.c:258
 msgid "Move down one line"
 msgstr "Zur folgenden Zeile springen"

-#: global.c:261
+#: global.c:259
 msgid "Move forward one character"
 msgstr "Zum folgenden Zeichen springen"

-#: global.c:262
+#: global.c:260
 msgid "Move back one character"
 msgstr "Zum vorhergehenden Zeichen springen"

-#: global.c:263
+#: global.c:261
 msgid "Move to the beginning of the current line"
 msgstr "Zum Zeilenanfang springen"

-#: global.c:264
+#: global.c:262
 msgid "Move to the end of the current line"
 msgstr "Zum Zeilenende springen"

-#: global.c:265
+#: global.c:263
 msgid "Go to the first line of the file"
 msgstr "Zur ersten Zeile springen"

-#: global.c:266
+#: global.c:264
 msgid "Go to the last line of the file"
 msgstr "Zur letzten Zeile springen"

-#: global.c:267
+#: global.c:265
 msgid "Refresh (redraw) the current screen"
 msgstr "Bildschirm auffrischen (neu zeichnen)"

-#: global.c:268
+#: global.c:266
 msgid "Mark text at the current cursor location"
 msgstr "Text an der derzeitigen Cursorposition markieren"

-#: global.c:269
+#: global.c:267
 msgid "Delete the character under the cursor"
 msgstr "Zeichen an der Cursorposition löschen"

-#: global.c:271
+#: global.c:269
 msgid "Delete the character to the left of the cursor"
 msgstr "Zeichen links vom Cursor löschen"

-#: global.c:272
+#: global.c:270
 msgid "Insert a tab character"
 msgstr "Tabulator einfügen"

-#: global.c:273
+#: global.c:271
 msgid "Insert a carriage return at the cursor position"
 msgstr "Zeilenumbruch an der Cursorposition einfügen"

-#: global.c:275
+#: global.c:273
 msgid "Make the current search or replace case (in)sensitive"
 msgstr ""
 "Groß- und Kleinschreibung bei Suche oder Erstzen (nicht) berücksichtigen"

-#: global.c:276
+#: global.c:274
 msgid "Go to file browser"
 msgstr "Zum Dateibrowser"

-#: global.c:278
+#: global.c:276
 msgid "Cancel the current function"
 msgstr "Funktion abbrechen"

-#: global.c:279
+#: global.c:277
 #, fuzzy
 msgid "Append to the current file"
 msgstr "Zum Zeilenende springen"

-#: global.c:280
+#: global.c:278
 #, fuzzy
 msgid "Search Backwards"
 msgstr "Suche abgebrochen"

-#: global.c:281
+#: global.c:279
 #, fuzzy
 msgid "Use Regular Expressions"
 msgstr "Reguläre Ausdrücke"

-#: global.c:284
+#: global.c:282
 msgid "Get Help"
 msgstr "Hilfe"

-#: global.c:289
+#: global.c:287
 #, fuzzy
 msgid "Close"
 msgstr "mouse"

-#: global.c:293 global.c:487 global.c:525
+#: global.c:291 global.c:490 global.c:528
 msgid "Exit"
 msgstr "Beenden"

-#: global.c:296
+#: global.c:294
 msgid "WriteOut"
 msgstr "Speichern"

-#: global.c:301 global.c:390
+#: global.c:299 global.c:388
 msgid "Justify"
 msgstr "Ausrichten"

-#: global.c:305 global.c:311
+#: global.c:303 global.c:309
 msgid "Read File"
 msgstr "Datei öffnen"

-#: global.c:315 global.c:386 global.c:410
+#: global.c:313 global.c:384 global.c:408
 msgid "Replace"
 msgstr "Ersetzen"

-#: global.c:319
+#: global.c:317
 msgid "Where Is"
 msgstr "Wo ist"

-#: global.c:323 global.c:479 global.c:514
+#: global.c:321 global.c:482 global.c:517
 msgid "Prev Page"
 msgstr "Seite zurück"

-#: global.c:327 global.c:483 global.c:518
+#: global.c:325 global.c:486 global.c:521
 msgid "Next Page"
 msgstr "Seite vor"

-#: global.c:331
+#: global.c:329
 msgid "Cut Text"
 msgstr "Ausschneiden"

-#: global.c:335
+#: global.c:333
 msgid "UnJustify"
 msgstr "Ausrichten rückgängig"

-#: global.c:338
+#: global.c:336
 msgid "UnCut Txt"
 msgstr "Ausschneiden rückgängig"

-#: global.c:342
+#: global.c:340
 msgid "Cur Pos"
 msgstr "Cursor"

-#: global.c:346
+#: global.c:344
 msgid "To Spell"
 msgstr "Rechtschr."

-#: global.c:350
+#: global.c:348
 msgid "Up"
 msgstr "Hoch"

-#: global.c:353
+#: global.c:351
 msgid "Down"
 msgstr "Runter"

-#: global.c:356
+#: global.c:354
 msgid "Forward"
 msgstr "Vorwärts"

-#: global.c:359
+#: global.c:357
 msgid "Back"
 msgstr "Zurück"

-#: global.c:362
+#: global.c:360
 msgid "Home"
 msgstr "Pos 1"

-#: global.c:365
+#: global.c:363
 msgid "End"
 msgstr "Ende"

-#: global.c:368
+#: global.c:366
 msgid "Refresh"
 msgstr "Auffrischen"

-#: global.c:371
+#: global.c:369
 msgid "Mark Text"
 msgstr "Text markieren"

-#: global.c:374
+#: global.c:372
 msgid "Delete"
 msgstr "Löschen"

-#: global.c:378
+#: global.c:376
 msgid "Backspace"
 msgstr "Rücktaste"

-#: global.c:382
+#: global.c:380
 msgid "Tab"
 msgstr "Tab"

-#: global.c:394
+#: global.c:392
 msgid "Enter"
 msgstr "Enter"

-#: global.c:398 global.c:414 global.c:441
+#: global.c:396 global.c:412 global.c:442
 msgid "Goto Line"
 msgstr "Zu Zeile"

-#: global.c:404 global.c:431 global.c:459 global.c:469
+#: global.c:402 global.c:432 global.c:462 global.c:472
 msgid "First Line"
 msgstr "Erste Zeile"

-#: global.c:407 global.c:434 global.c:462 global.c:472
+#: global.c:405 global.c:435 global.c:465 global.c:475
 msgid "Last Line"
 msgstr "Letzte Zeile"

-#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499
-#: global.c:507 global.c:510 global.c:528 winio.c:1239
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: global.c:420 global.c:447
+#: global.c:416 global.c:446
 msgid "Case Sens"
 msgstr "GROSZ/klein"

-#: global.c:423 global.c:450
+#: global.c:419 global.c:449
 #, fuzzy
 msgid "Backward"
 msgstr "Zurück"

-#: global.c:427 global.c:454
+#: global.c:424 global.c:454
 #, fuzzy
 msgid "Regexp"
 msgstr "regulärer Ausdruck"

-#: global.c:437
+#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502
+#: global.c:510 global.c:513 global.c:531 winio.c:1239
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: global.c:438
 msgid "No Replace"
 msgstr "Keine Ersetzung"

-#: global.c:492 global.c:503
+#: global.c:495 global.c:506
 msgid "To Files"
 msgstr "In Dateien"

-#: global.c:522
+#: global.c:525
 #, fuzzy
 msgid "Goto"
 msgstr "Zu Zeile"
@@ -796,132 +796,132 @@ msgstr "Markierung gesetzt"
 msgid "Mark UNset"
 msgstr "Markierung gelöscht"

-#: nano.c:1105
+#: nano.c:1106
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap aufgerufen mit inptr->data=\"%s\"\n"

-#: nano.c:1157
+#: nano.c:1158
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data jetzt = \"%s\"\n"

-#: nano.c:1209
+#: nano.c:1210
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Nachher, data = \"%s\"\n"

-#: nano.c:1310
+#: nano.c:1311
 msgid "Edit a replacement"
 msgstr "Ersetzung editieren"

-#: nano.c:1548
+#: nano.c:1549
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Konnte keine temporäre Datei erzeugen: %s"

-#: nano.c:1554
+#: nano.c:1555
 msgid "Spell checking failed: unable to write temp file!"
 msgstr ""
 "Rechtschreibprüfung fehlgeschlagen: konnte nicht in temporäre Datei schreiben"

-#: nano.c:1566
+#: nano.c:1567
 msgid "Finished checking spelling"
 msgstr "Rechtschreibprüfung abgeschlossen"

-#: nano.c:1568
+#: nano.c:1569
 msgid "Spell checking failed"
 msgstr "Rechtschreibprüfung fehlgeschlagen"

-#: nano.c:1597
+#: nano.c:1598
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Veränderten Puffer speichern (\"Nein\" VERWIRFT DIE ÄNDERUGNEN) ? "

-#: nano.c:1733
+#: nano.c:1734
 msgid "Received SIGHUP"
 msgstr "SIGHUP empfangen"

-#: nano.c:1797
+#: nano.c:1798
 msgid "Cannot resize top win"
 msgstr "Kann die Größe des oberen Fensters nicht verändern"

-#: nano.c:1799
+#: nano.c:1800
 msgid "Cannot move top win"
 msgstr "Kann oberes Fenster nicht verschieben"

-#: nano.c:1801
+#: nano.c:1802
 msgid "Cannot resize edit win"
 msgstr "Kann Größe des Bearbeitungsfensters nicht verändern"

-#: nano.c:1803
+#: nano.c:1804
 msgid "Cannot move edit win"
 msgstr "Kann Bearbeitungsfenster nicht verschieben"

-#: nano.c:1805
+#: nano.c:1806
 msgid "Cannot resize bottom win"
 msgstr "Kann Größe des unteren Fensters nicht verändern"

-#: nano.c:1807
+#: nano.c:1808
 msgid "Cannot move bottom win"
 msgstr "Kann unteres Fenster nicht verschieben"

-#: nano.c:2132
+#: nano.c:2133
 msgid "Can now UnJustify!"
 msgstr "Kann Absatzausrichtung nicht rückgängig machen"

-#: nano.c:2248
+#: nano.c:2249
 #, c-format
 msgid "%s enable/disable"
 msgstr "%s aktivieren/deaktivieren"

-#: nano.c:2267
+#: nano.c:2268
 msgid "enabled"
 msgstr "aktiviert"

-#: nano.c:2268
+#: nano.c:2269
 msgid "disabled"
 msgstr "deaktiviert"

-#: nano.c:2321
+#: nano.c:2322
 #, fuzzy
 msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 msgstr ""
 "NumLock Problem entdeckt. | Tastenblock funktioniert nicht, wenn NumLock "
 "ausgeschaltet ist"

-#: nano.c:2576
+#: nano.c:2577
 msgid "Main: set up windows\n"
 msgstr "Hauptprogramm: Fenster konfigurieren\n"

-#: nano.c:2587
+#: nano.c:2588
 msgid "Main: bottom win\n"
 msgstr "Hauptprogramm: unteres Fenster\n"

-#: nano.c:2593
+#: nano.c:2594
 msgid "Main: open file\n"
 msgstr "Hauptprogramm: Datei öffnen\n"

-#: nano.c:2651
+#: nano.c:2652
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "Erhielt Alt-0-%c! (%d)\n"

-#: nano.c:2678
+#: nano.c:2679
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "Erhielt Alt-[-1-%c! (%d)\n"

-#: nano.c:2716
+#: nano.c:2717
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "Erhielt Alt-[-2-%c! (%d)\n"

-#: nano.c:2770
+#: nano.c:2771
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Erhielt Alt-[-%c! (%d)\n"

-#: nano.c:2805
+#: nano.c:2806
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Erhielt Alt-%c! (%d)\n"
@@ -975,95 +975,95 @@ msgstr ""
 msgid "Unable to open ~/.nanorc file, %s"
 msgstr ""

-#: search.c:126
+#: search.c:129
 #, fuzzy
 msgid "Case Sensitive "
 msgstr "GROSZ/klein"

-#: search.c:127
+#: search.c:130
 #, fuzzy
 msgid "Regexp "
 msgstr "regulärer Ausdruck"

-#: search.c:128
+#: search.c:131
 #, fuzzy
 msgid "Search"
 msgstr "Suche"

-#: search.c:129
+#: search.c:132
 msgid " Backwards"
 msgstr ""

-#: search.c:130
+#: search.c:133
 msgid " (to replace)"
 msgstr " (zu ersetzen)"

-#: search.c:135 search.c:399
+#: search.c:138 search.c:404
 msgid "Search Cancelled"
 msgstr "Suche abgebrochen"

-#: search.c:216
+#: search.c:221
 #, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s...\" nicht gefunden"

-#: search.c:265 search.c:321
+#: search.c:270 search.c:326
 msgid "Search Wrapped"
 msgstr "Suche in neue Zeile umgebrochen"

-#: search.c:421
+#: search.c:426
 #, fuzzy, c-format
 msgid "Replaced %d occurrences"
 msgstr "%d Ersetzungen vorgenommen"

-#: search.c:423
+#: search.c:428
 #, fuzzy
 msgid "Replaced 1 occurrence"
 msgstr "1 Ersetzung vorgenommen"

-#: search.c:561 search.c:671 search.c:687
+#: search.c:566 search.c:676 search.c:692
 msgid "Replace Cancelled"
 msgstr "Ersetzung abgebrochen"

-#: search.c:611
+#: search.c:616
 msgid "Replace this instance?"
 msgstr "Fundstelle ersetzen?"

-#: search.c:623
+#: search.c:628
 msgid "Replace failed: unknown subexpression!"
 msgstr "Ersetzung gescheitert: unbekannter Unterausdruck"

-#: search.c:712
+#: search.c:717
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Ersetzen mit [%s]"

-#: search.c:716 search.c:720
+#: search.c:721 search.c:725
 msgid "Replace with"
 msgstr "Ersetzen mit"

-#: search.c:754
+#: search.c:759
 msgid "Enter line number"
 msgstr "Zeilennummer eingeben"

-#: search.c:756
+#: search.c:761
 msgid "Aborted"
 msgstr "Abgebrochen"

-#: search.c:765
+#: search.c:770
 msgid "Come on, be reasonable"
 msgstr "Komm schon, sei vernünftig"

-#: utils.c:146
+#: utils.c:159
 msgid "nano: malloc: out of memory!"
 msgstr "nano: malloc: Kein Speicher verfügbar!"

-#: utils.c:160
+#: utils.c:173
 #, fuzzy
 msgid "nano: calloc: out of memory!"
 msgstr "nano: malloc: Kein Speicher verfügbar!"

-#: utils.c:170
+#: utils.c:183
 msgid "nano: realloc: out of memory!"
 msgstr "nano: realloc: Kein Speicher verfügbar!"

--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.0\n"
-"POT-Creation-Date: 2001-07-14 18:56-0400\n"
+"POT-Creation-Date: 2001-07-28 19:55-0400\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"
@@ -24,131 +24,131 @@ msgstr "add_to_cutbuffer llamado con inptr->data = %s\n"
 msgid "Blew away cutbuffer =)\n"
 msgstr "Nos hemos cargado el cutbuffer =)\n"

-#: files.c:134
+#: files.c:145
 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:196 files.c:214
+#: files.c:207 files.c:225
 #, c-format
 msgid "Read %d lines"
 msgstr "%d líneas leídas"

-#: files.c:232 search.c:210
+#: files.c:243 search.c:215
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" no encontrado"

 #. We have a new file
-#: files.c:236
+#: files.c:247
 msgid "New File"
 msgstr "Nuevo Fichero"

-#: files.c:249
+#: files.c:260
 #, 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:252
+#: files.c:263
 #, c-format
 msgid "File \"%s\" is a device file"
 msgstr "El fichero \"%s\" es un dispositivo"

-#: files.c:259
+#: files.c:270
 msgid "Reading File"
 msgstr "Leyendo Fichero"

-#: files.c:279
+#: files.c:290
 msgid "File to insert [from ./] "
 msgstr "Fichero a insertar [desde ./] "

-#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705
-#: files.c:716 files.c:1102
+#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716
+#: files.c:727 files.c:1113
 #, c-format
 msgid "filename is %s"
 msgstr "filename es %s"

-#: files.c:368 files.c:872 files.c:1187 nano.c:1629
+#: files.c:379 files.c:883 files.c:1198 nano.c:1630
 msgid "Cancelled"
 msgstr "Cancelado"

-#: files.c:642 files.c:697
+#: files.c:653 files.c:708
 msgid "No more open files"
 msgstr ""

-#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974
+#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "No pude abrir el fichero para escribir: %s"

-#: files.c:955
+#: files.c:966
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Escribí >%s\n"

-#: files.c:983
+#: files.c:994
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "No pude cerrar %s: %s"

 #. Try a rename??
-#: files.c:1006 files.c:1015 files.c:1020
+#: files.c:1017 files.c:1026 files.c:1031
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "No pude abrir %s para escribir: %s"

-#: files.c:1027
+#: files.c:1038
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "No pude establecer permisos %o en %s: %s"

-#: files.c:1034
+#: files.c:1045
 #, c-format
 msgid "Wrote %d lines"
 msgstr "%d líneas escritas"

-#: files.c:1074
+#: files.c:1085
 #, c-format
 msgid "%s Selection to File"
 msgstr "%s Selección a Fichero"

-#: files.c:1074 files.c:1078 global.c:496
+#: files.c:1085 files.c:1089 global.c:499
 msgid "Append"
 msgstr "Añadir"

-#: files.c:1074 files.c:1078
+#: files.c:1085 files.c:1089
 msgid "Write"
 msgstr "Escribir"

-#: files.c:1078
+#: files.c:1089
 #, c-format
 msgid "File Name to %s"
 msgstr "Nombre de Fichero a %s"

-#: files.c:1116
+#: files.c:1127
 msgid "File exists, OVERWRITE ?"
 msgstr "El fichero existe, ¿ SOBREESCRIBIR ?"

-#: files.c:1598
+#: files.c:1609
 msgid "(more)"
 msgstr "(más)"

-#: files.c:1911
+#: files.c:1922
 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:1921 files.c:1969
+#: files.c:1932 files.c:1980
 #, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "No se puede abrir \"%s\": %s"

-#: files.c:1949 global.c:277
+#: files.c:1960 global.c:275
 msgid "Goto Directory"
 msgstr "Ir a Directorio"

-#: files.c:1954
+#: files.c:1965
 msgid "Goto Cancelled"
 msgstr "Ir a Cancelado"

@@ -208,296 +208,296 @@ msgstr ""
 msgid "Open next loaded file"
 msgstr ""

-#: global.c:238
+#: global.c:236
 msgid "Invoke the help menu"
 msgstr "Invocar el menú de ayuda"

-#: global.c:239
+#: global.c:237
 msgid "Write the current file to disk"
 msgstr "Escribir el fichero actual a disco"

-#: global.c:242
+#: global.c:240
 msgid "Close currently loaded file/Exit from nano"
 msgstr ""

-#: global.c:244
+#: global.c:242
 msgid "Exit from nano"
 msgstr "Salir de nano"

-#: global.c:247
+#: global.c:245
 msgid "Goto a specific line number"
 msgstr "Ir a un número de línea en concreto"

-#: global.c:248
+#: global.c:246
 msgid "Justify the current paragraph"
 msgstr "Justificar el párrafo actual"

-#: global.c:249
+#: global.c:247
 msgid "Unjustify after a justify"
 msgstr "Desjustificar después de un justificar"

-#: global.c:250
+#: global.c:248
 msgid "Replace text within the editor"
 msgstr "Reemplazar texto en el editor"

-#: global.c:251
+#: global.c:249
 msgid "Insert another file into the current one"
 msgstr "Insertar otro fichero en el actual"

-#: global.c:252
+#: global.c:250
 msgid "Search for text within the editor"
 msgstr "Buscar un texto en el editor"

-#: global.c:253
+#: global.c:251
 msgid "Move to the previous screen"
 msgstr "Moverse a la página anterior"

-#: global.c:254
+#: global.c:252
 msgid "Move to the next screen"
 msgstr "Moverse a la página siguiente"

-#: global.c:255
+#: global.c:253
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Cortar la línea actual y guardarla en el cutbuffer"

-#: global.c:256
+#: global.c:254
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Pegar el cutbuffer en la línea actual"

-#: global.c:257
+#: global.c:255
 msgid "Show the position of the cursor"
 msgstr "Mostrar la posición del cursor"

-#: global.c:258
+#: global.c:256
 msgid "Invoke the spell checker (if available)"
 msgstr "Invocar el corrector ortográfico (si está disponible)"

-#: global.c:259
+#: global.c:257
 msgid "Move up one line"
 msgstr "Moverse una línea hacia arriba"

-#: global.c:260
+#: global.c:258
 msgid "Move down one line"
 msgstr "Moverse una línea hacia abajo"

-#: global.c:261
+#: global.c:259
 msgid "Move forward one character"
 msgstr "Moverse hacia adelante un carácter"

-#: global.c:262
+#: global.c:260
 msgid "Move back one character"
 msgstr "Moverse hacia atrás un carácter"

-#: global.c:263
+#: global.c:261
 msgid "Move to the beginning of the current line"
 msgstr "Moverse al principio de la línea actual"

-#: global.c:264
+#: global.c:262
 msgid "Move to the end of the current line"
 msgstr "Moverse al final de la línea actual"

-#: global.c:265
+#: global.c:263
 msgid "Go to the first line of the file"
 msgstr "Ir a la primera línea del fichero"

-#: global.c:266
+#: global.c:264
 msgid "Go to the last line of the file"
 msgstr "Ir a la última línea del fichero"

-#: global.c:267
+#: global.c:265
 msgid "Refresh (redraw) the current screen"
 msgstr "Redibujar la pantalla actual"

-#: global.c:268
+#: global.c:266
 msgid "Mark text at the current cursor location"
 msgstr "Marcar texto en la posición actual del cursor"

-#: global.c:269
+#: global.c:267
 msgid "Delete the character under the cursor"
 msgstr "Borrar el carácter bajo el cursor"

-#: global.c:271
+#: global.c:269
 msgid "Delete the character to the left of the cursor"
 msgstr "Borrar el carácter a la izquierda del cursor"

-#: global.c:272
+#: global.c:270
 msgid "Insert a tab character"
 msgstr "Insertar un carácter tab"

-#: global.c:273
+#: global.c:271
 msgid "Insert a carriage return at the cursor position"
 msgstr "Insertar un retorno de carro en la posición del cursor"

-#: global.c:275
+#: global.c:273
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Hacer que la búsqueda actual sea sensible a mayúsculas"

-#: global.c:276
+#: global.c:274
 msgid "Go to file browser"
 msgstr "Ir al navegador de ficheros"

-#: global.c:278
+#: global.c:276
 msgid "Cancel the current function"
 msgstr "Cancelar la función actual"

-#: global.c:279
+#: global.c:277
 msgid "Append to the current file"
 msgstr "Añadir al fichero actual"

-#: global.c:280
+#: global.c:278
 msgid "Search Backwards"
 msgstr "Buscar hacia atrás"

-#: global.c:281
+#: global.c:279
 msgid "Use Regular Expressions"
 msgstr "Usar Expresiones regulares"

-#: global.c:284
+#: global.c:282
 msgid "Get Help"
 msgstr "Ver Ayuda"

-#: global.c:289
+#: global.c:287
 msgid "Close"
 msgstr ""

-#: global.c:293 global.c:487 global.c:525
+#: global.c:291 global.c:490 global.c:528
 msgid "Exit"
 msgstr "Salir"

-#: global.c:296
+#: global.c:294
 msgid "WriteOut"
 msgstr "Guardar"

-#: global.c:301 global.c:390
+#: global.c:299 global.c:388
 msgid "Justify"
 msgstr "Justificar"

-#: global.c:305 global.c:311
+#: global.c:303 global.c:309
 msgid "Read File"
 msgstr "L Fichero"

-#: global.c:315 global.c:386 global.c:410
+#: global.c:313 global.c:384 global.c:408
 msgid "Replace"
 msgstr "Reemplazar"

-#: global.c:319
+#: global.c:317
 msgid "Where Is"
 msgstr "Buscar"

-#: global.c:323 global.c:479 global.c:514
+#: global.c:321 global.c:482 global.c:517
 msgid "Prev Page"
 msgstr "Pág Ant"

-#: global.c:327 global.c:483 global.c:518
+#: global.c:325 global.c:486 global.c:521
 msgid "Next Page"
 msgstr "Pág Sig"

-#: global.c:331
+#: global.c:329
 msgid "Cut Text"
 msgstr "CortarTxt"

-#: global.c:335
+#: global.c:333
 msgid "UnJustify"
 msgstr "Desjustificar"

-#: global.c:338
+#: global.c:336
 msgid "UnCut Txt"
 msgstr "PegarTxt"

-#: global.c:342
+#: global.c:340
 msgid "Cur Pos"
 msgstr "Pos Act"

-#: global.c:346
+#: global.c:344
 msgid "To Spell"
 msgstr "Ortografía"

-#: global.c:350
+#: global.c:348
 msgid "Up"
 msgstr "Arriba"

-#: global.c:353
+#: global.c:351
 msgid "Down"
 msgstr "Abajo"

-#: global.c:356
+#: global.c:354
 msgid "Forward"
 msgstr "Adelante"

-#: global.c:359
+#: global.c:357
 msgid "Back"
 msgstr "Atrás"

-#: global.c:362
+#: global.c:360
 msgid "Home"
 msgstr "Inicio"

-#: global.c:365
+#: global.c:363
 msgid "End"
 msgstr "Fin"

-#: global.c:368
+#: global.c:366
 msgid "Refresh"
 msgstr "Refrescar"

-#: global.c:371
+#: global.c:369
 msgid "Mark Text"
 msgstr "MarcarTxt"

-#: global.c:374
+#: global.c:372
 msgid "Delete"
 msgstr "Suprimir"

-#: global.c:378
+#: global.c:376
 msgid "Backspace"
 msgstr "Borrar"

-#: global.c:382
+#: global.c:380
 msgid "Tab"
 msgstr "Tab"

-#: global.c:394
+#: global.c:392
 msgid "Enter"
 msgstr "Enter"

-#: global.c:398 global.c:414 global.c:441
+#: global.c:396 global.c:412 global.c:442
 msgid "Goto Line"
 msgstr "Ir a Línea"

-#: global.c:404 global.c:431 global.c:459 global.c:469
+#: global.c:402 global.c:432 global.c:462 global.c:472
 msgid "First Line"
 msgstr "Primera Línea"

-#: global.c:407 global.c:434 global.c:462 global.c:472
+#: global.c:405 global.c:435 global.c:465 global.c:475
 msgid "Last Line"
 msgstr "Última Línea"

-#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499
-#: global.c:507 global.c:510 global.c:528 winio.c:1239
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: global.c:420 global.c:447
+#: global.c:416 global.c:446
 msgid "Case Sens"
 msgstr "May/Min"

-#: global.c:423 global.c:450
+#: global.c:419 global.c:449
 msgid "Backward"
 msgstr "Hacia Atrás"

-#: global.c:427 global.c:454
+#: global.c:424 global.c:454
 msgid "Regexp"
 msgstr "Expreg"

-#: global.c:437
+#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502
+#: global.c:510 global.c:513 global.c:531 winio.c:1239
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: global.c:438
 msgid "No Replace"
 msgstr "No Reemplazar"

-#: global.c:492 global.c:503
+#: global.c:495 global.c:506
 msgid "To Files"
 msgstr "A Ficheros"

-#: global.c:522
+#: global.c:525
 msgid "Goto"
 msgstr "Ir a"

@@ -776,131 +776,131 @@ msgstr "Marca Establecida"
 msgid "Mark UNset"
 msgstr "Marca Borrada"

-#: nano.c:1105
+#: nano.c:1106
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap llamada con inptr->data=\"%s\"\n"

-#: nano.c:1157
+#: nano.c:1158
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data ahora = \"%d\"\n"

-#: nano.c:1209
+#: nano.c:1210
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Después, data = \"%s\"\n"

-#: nano.c:1310
+#: nano.c:1311
 msgid "Edit a replacement"
 msgstr "Editar un reemplazo"

-#: nano.c:1548
+#: nano.c:1549
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "No pude crear un fichero temporal: %s"

-#: nano.c:1554
+#: nano.c:1555
 msgid "Spell checking failed: unable to write temp file!"
 msgstr ""
 "Comprobación de ortografía fallida: ¡no se pudo escribir fichero temporal!"

-#: nano.c:1566
+#: nano.c:1567
 msgid "Finished checking spelling"
 msgstr "Revisión de ortografía finalizada"

-#: nano.c:1568
+#: nano.c:1569
 msgid "Spell checking failed"
 msgstr "Comprobación de ortografía fallida"

-#: nano.c:1597
+#: nano.c:1598
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "¿ Salvar el buffer modificado (RESPONDER \"No\" DESTRUIRÁ LOS CAMBIOS) ?"

-#: nano.c:1733
+#: nano.c:1734
 msgid "Received SIGHUP"
 msgstr "SIGHUP recibido"

-#: nano.c:1797
+#: nano.c:1798
 msgid "Cannot resize top win"
 msgstr "No se puede cambiar el tamaño de la ventana superior"

-#: nano.c:1799
+#: nano.c:1800
 msgid "Cannot move top win"
 msgstr "No se puede mover la ventana superior"

-#: nano.c:1801
+#: nano.c:1802
 msgid "Cannot resize edit win"
 msgstr "No se puede cambiar el tamaño de la ventana de edición"

-#: nano.c:1803
+#: nano.c:1804
 msgid "Cannot move edit win"
 msgstr "No se puede mover la ventana de edición"

-#: nano.c:1805
+#: nano.c:1806
 msgid "Cannot resize bottom win"
 msgstr "No se puede cambiar el tamaño de la ventana inferior"

-#: nano.c:1807
+#: nano.c:1808
 msgid "Cannot move bottom win"
 msgstr "No se puede mover la ventana inferior"

-#: nano.c:2132
+#: nano.c:2133
 msgid "Can now UnJustify!"
 msgstr "¡Ahora puedes desjustificar!"

-#: nano.c:2248
+#: nano.c:2249
 #, c-format
 msgid "%s enable/disable"
 msgstr "%s habilitar/deshabilitar"

-#: nano.c:2267
+#: nano.c:2268
 msgid "enabled"
 msgstr "habilitado"

-#: nano.c:2268
+#: nano.c:2269
 msgid "disabled"
 msgstr "deshabilitado"

-#: nano.c:2321
+#: nano.c:2322
 msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 msgstr ""
 "Detectado NumLock roto.  El tecl. numérico funcionará con NumLock activado"

-#: nano.c:2576
+#: nano.c:2577
 msgid "Main: set up windows\n"
 msgstr "Main: configurar las ventanas\n"

-#: nano.c:2587
+#: nano.c:2588
 msgid "Main: bottom win\n"
 msgstr "Main: ventana inferior\n"

-#: nano.c:2593
+#: nano.c:2594
 msgid "Main: open file\n"
 msgstr "Main: abrir fichero\n"

-#: nano.c:2651
+#: nano.c:2652
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "¡Pillé Alt-O-%c! (%d)\n"

-#: nano.c:2678
+#: nano.c:2679
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "¡Pillé Alt-[-1-%c! (%d)\n"

-#: nano.c:2716
+#: nano.c:2717
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "¡Pillé Alt-[-2-%c! (%d)\n"

-#: nano.c:2770
+#: nano.c:2771
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "¡Pillé Alt-[-%c! (%d)\n"

-#: nano.c:2805
+#: nano.c:2806
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "¡Pillé Alt-%c! (%d)\n"
@@ -956,90 +956,90 @@ msgstr "Errores encontrados en fichero .nanorc"
 msgid "Unable to open ~/.nanorc file, %s"
 msgstr "Imposible abrir fichero ~/.nanorc, %s"

-#: search.c:126
+#: search.c:129
 msgid "Case Sensitive "
 msgstr "May/Min "

-#: search.c:127
+#: search.c:130
 msgid "Regexp "
 msgstr "Expreg "

-#: search.c:128
+#: search.c:131
 msgid "Search"
 msgstr "Buscar"

-#: search.c:129
+#: search.c:132
 msgid " Backwards"
 msgstr " Hacia Atrás"

-#: search.c:130
+#: search.c:133
 msgid " (to replace)"
 msgstr " (a reemplazar)"

-#: search.c:135 search.c:399
+#: search.c:138 search.c:404
 msgid "Search Cancelled"
 msgstr "Búsqueda Cancelada"

-#: search.c:216
+#: search.c:221
 #, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s...\" no encontrado"

-#: search.c:265 search.c:321
+#: search.c:270 search.c:326
 msgid "Search Wrapped"
 msgstr "Búsqueda Recomenzada"

-#: search.c:421
+#: search.c:426
 #, c-format
 msgid "Replaced %d occurrences"
 msgstr "%d ocurrencias reemplazadas"

-#: search.c:423
+#: search.c:428
 msgid "Replaced 1 occurrence"
 msgstr "1 ocurrencia reemplazada"

-#: search.c:561 search.c:671 search.c:687
+#: search.c:566 search.c:676 search.c:692
 msgid "Replace Cancelled"
 msgstr "Reemplazar Cancelado"

-#: search.c:611
+#: search.c:616
 msgid "Replace this instance?"
 msgstr "¿Reemplazar esta instancia?"

-#: search.c:623
+#: search.c:628
 msgid "Replace failed: unknown subexpression!"
 msgstr "Fallo en reemplazar: ¡subexpresión desconocida!"

-#: search.c:712
+#: search.c:717
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Reemplazar con [%s]"

-#: search.c:716 search.c:720
+#: search.c:721 search.c:725
 msgid "Replace with"
 msgstr "Reemplazar con"

-#: search.c:754
+#: search.c:759
 msgid "Enter line number"
 msgstr "Introduce número de línea"

-#: search.c:756
+#: search.c:761
 msgid "Aborted"
 msgstr "Abortado"

-#: search.c:765
+#: search.c:770
 msgid "Come on, be reasonable"
 msgstr "Venga ya, se razonable"

-#: utils.c:146
+#: utils.c:159
 msgid "nano: malloc: out of memory!"
 msgstr "nano: malloc: memoria insuficiente!"

-#: utils.c:160
+#: utils.c:173
 msgid "nano: calloc: out of memory!"
 msgstr "nano: calloc: memoria insuficiente!"

-#: utils.c:170
+#: utils.c:183
 msgid "nano: realloc: out of memory!"
 msgstr "nano: realloc: memoria insuficiente!"

--- 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-07-14 18:56-0400\n"
+"POT-Creation-Date: 2001-07-28 19:55-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"
@@ -22,133 +22,133 @@ msgstr "add_to_cutbuffer funktion parametri inptr->data = %s\n"
 msgid "Blew away cutbuffer =)\n"
 msgstr "Leiketila katosi =)\n"

-#: files.c:134
+#: files.c:145
 msgid "read_line: not on first line and prev is NULL"
 msgstr "read_line: ei ensimmäisellä rivillä ja prev on NULL"

-#: files.c:196 files.c:214
+#: files.c:207 files.c:225
 #, c-format
 msgid "Read %d lines"
 msgstr "%d riviä luettu"

-#: files.c:232 search.c:210
+#: files.c:243 search.c:215
 #, c-format
 msgid "\"%s\" not found"
 msgstr "Ei löytynyt: \"%s\""

 #. We have a new file
-#: files.c:236
+#: files.c:247
 msgid "New File"
 msgstr "Uusi tiedosto"

-#: files.c:249
+#: files.c:260
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr "\"%s\" on hakemisto"

 #. Don't open character or block files.  Sorry, /dev/sndstat!
-#: files.c:252
+#: files.c:263
 #, c-format
 msgid "File \"%s\" is a device file"
 msgstr "\"%s\" on laitetiedosto"

-#: files.c:259
+#: files.c:270
 msgid "Reading File"
 msgstr "Lukee tiedostoa"

-#: files.c:279
+#: files.c:290
 msgid "File to insert [from ./] "
 msgstr "Lisättävä tiedosto [hakemistossa ./]"

-#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705
-#: files.c:716 files.c:1102
+#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716
+#: files.c:727 files.c:1113
 #, c-format
 msgid "filename is %s"
 msgstr "tiedoston nimi on %s"

-#: files.c:368 files.c:872 files.c:1187 nano.c:1629
+#: files.c:379 files.c:883 files.c:1198 nano.c:1630
 msgid "Cancelled"
 msgstr "Peruttu"

-#: files.c:642 files.c:697
+#: files.c:653 files.c:708
 msgid "No more open files"
 msgstr ""

-#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974
+#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Tiedostoa ei voitu avata luettavaksi: %s"

-#: files.c:955
+#: files.c:966
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Kirjoitettu: >%s\n"

-#: files.c:983
+#: files.c:994
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Tiedostoa %s ei voitu sulkea: %s"

 #. Try a rename??
-#: files.c:1006 files.c:1015 files.c:1020
+#: files.c:1017 files.c:1026 files.c:1031
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Tiedostoa %s ei voitu avata kirjoittamista varten: %s"

-#: files.c:1027
+#: files.c:1038
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Oikeuksia %o ei voitu asettaa tiedostolle %s: %s"

-#: files.c:1034
+#: files.c:1045
 #, c-format
 msgid "Wrote %d lines"
 msgstr "%d riviä kirjoitettu"

-#: files.c:1074
+#: files.c:1085
 #, c-format
 msgid "%s Selection to File"
 msgstr ""

-#: files.c:1074 files.c:1078 global.c:496
+#: files.c:1085 files.c:1089 global.c:499
 #, fuzzy
 msgid "Append"
 msgstr "Keskeytä"

-#: files.c:1074 files.c:1078
+#: files.c:1085 files.c:1089
 #, fuzzy
 msgid "Write"
 msgstr "Kirjoita"

-#: files.c:1078
+#: files.c:1089
 #, fuzzy, c-format
 msgid "File Name to %s"
 msgstr "Kirjoitettavan tiedoston nimi"

-#: files.c:1116
+#: files.c:1127
 msgid "File exists, OVERWRITE ?"
 msgstr "Tiedosto on jo olemassa, korvataanko?"

-#: files.c:1598
+#: files.c:1609
 msgid "(more)"
 msgstr "(lisää)"

-#: files.c:1911
+#: files.c:1922
 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:1921 files.c:1969
+#: files.c:1932 files.c:1980
 #, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "Hakemistoa \"%s\" ei voi avata: %s"

-#: files.c:1949 global.c:277
+#: files.c:1960 global.c:275
 #, fuzzy
 msgid "Goto Directory"
 msgstr "Siirry"

-#: files.c:1954
+#: files.c:1965
 #, fuzzy
 msgid "Goto Cancelled"
 msgstr "Peruttu"
@@ -210,300 +210,300 @@ msgstr ""
 msgid "Open next loaded file"
 msgstr ""

-#: global.c:238
+#: global.c:236
 msgid "Invoke the help menu"
 msgstr "Avaa ohjevalikko"

-#: global.c:239
+#: global.c:237
 msgid "Write the current file to disk"
 msgstr "Kirjoita nykyinen tiedosto levylle"

-#: global.c:242
+#: global.c:240
 msgid "Close currently loaded file/Exit from nano"
 msgstr ""

-#: global.c:244
+#: global.c:242
 msgid "Exit from nano"
 msgstr "Poistu Nanosta"

-#: global.c:247
+#: global.c:245
 msgid "Goto a specific line number"
 msgstr "Siirry tietylle riville"

-#: global.c:248
+#: global.c:246
 msgid "Justify the current paragraph"
 msgstr "Tasaa nykyinen kappale"

-#: global.c:249
+#: global.c:247
 msgid "Unjustify after a justify"
 msgstr "Poista tasaus tasauksen jälkeen"

-#: global.c:250
+#: global.c:248
 msgid "Replace text within the editor"
 msgstr "Etsi ja korvaa tekstiä"

-#: global.c:251
+#: global.c:249
 msgid "Insert another file into the current one"
 msgstr "Lisää toinen tiedosto nykyiseen tiedostoon"

-#: global.c:252
+#: global.c:250
 msgid "Search for text within the editor"
 msgstr "Etsi tekstiä"

-#: global.c:253
+#: global.c:251
 msgid "Move to the previous screen"
 msgstr "Siirry edelliseen ruutuun"

-#: global.c:254
+#: global.c:252
 msgid "Move to the next screen"
 msgstr "Siirry seuraavaan ruutuun"

-#: global.c:255
+#: global.c:253
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Leikkaa nykyinen rivi leiketilaan"

-#: global.c:256
+#: global.c:254
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Kopioi rivi leiketilasta nykyiselle riville"

-#: global.c:257
+#: global.c:255
 msgid "Show the position of the cursor"
 msgstr "Näytä kohdistimen sijainti"

-#: global.c:258
+#: global.c:256
 msgid "Invoke the spell checker (if available)"
 msgstr "Käynnistä oikoluin (jos saatavilla)"

-#: global.c:259
+#: global.c:257
 msgid "Move up one line"
 msgstr "Siirry yksi rivi ylöspäin"

-#: global.c:260
+#: global.c:258
 msgid "Move down one line"
 msgstr "Siirry yksi rivi alaspäin"

-#: global.c:261
+#: global.c:259
 msgid "Move forward one character"
 msgstr "Siirry yksi merkki eteenpäin"

-#: global.c:262
+#: global.c:260
 msgid "Move back one character"
 msgstr "Siirry yksi merkki taaksepäin"

-#: global.c:263
+#: global.c:261
 msgid "Move to the beginning of the current line"
 msgstr "Siirry nykyisen rivin alkuun"

-#: global.c:264
+#: global.c:262
 msgid "Move to the end of the current line"
 msgstr "Siirry nykyisen rivin loppuun"

-#: global.c:265
+#: global.c:263
 msgid "Go to the first line of the file"
 msgstr "Siirry tiedoston ensimmäiselle riville"

-#: global.c:266
+#: global.c:264
 msgid "Go to the last line of the file"
 msgstr "Siirry tiedoston viimeiselle riville"

-#: global.c:267
+#: global.c:265
 msgid "Refresh (redraw) the current screen"
 msgstr "Piirrä ruutu uudestaan"

-#: global.c:268
+#: global.c:266
 msgid "Mark text at the current cursor location"
 msgstr "Merkitse kohdistimen kohdalla oleva teksti"

-#: global.c:269
+#: global.c:267
 msgid "Delete the character under the cursor"
 msgstr "Poista kohdistimen kohdalla oleva merkki"

-#: global.c:271
+#: global.c:269
 msgid "Delete the character to the left of the cursor"
 msgstr "Poista kohdistimesta vasemmalle oleva merkki"

-#: global.c:272
+#: global.c:270
 msgid "Insert a tab character"
 msgstr "Lisää sarkainmerkki"

-#: global.c:273
+#: global.c:271
 msgid "Insert a carriage return at the cursor position"
 msgstr "Lisää rivinvaihto kohdistimen kohdalle"

-#: global.c:275
+#: global.c:273
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Muuta etsintä- tai korvaustoiminnon kirjainkoosta piittaamista."

-#: global.c:276
+#: global.c:274
 msgid "Go to file browser"
 msgstr "Siirry tiedostoselaimeen"

-#: global.c:278
+#: global.c:276
 msgid "Cancel the current function"
 msgstr "Peru nykyinen toiminto."

-#: global.c:279
+#: global.c:277
 #, fuzzy
 msgid "Append to the current file"
 msgstr "Siirry nykyisen rivin loppuun"

-#: global.c:280
+#: global.c:278
 #, fuzzy
 msgid "Search Backwards"
 msgstr "Etsintä peruttu"

-#: global.c:281
+#: global.c:279
 #, fuzzy
 msgid "Use Regular Expressions"
 msgstr "Säännölliset lausekkeet"

-#: global.c:284
+#: global.c:282
 msgid "Get Help"
 msgstr "Ohjeita"

-#: global.c:289
+#: global.c:287
 msgid "Close"
 msgstr ""

-#: global.c:293 global.c:487 global.c:525
+#: global.c:291 global.c:490 global.c:528
 msgid "Exit"
 msgstr "Lopeta"

-#: global.c:296
+#: global.c:294
 msgid "WriteOut"
 msgstr "Kirjoita"

-#: global.c:301 global.c:390
+#: global.c:299 global.c:388
 msgid "Justify"
 msgstr "Tasaa"

-#: global.c:305 global.c:311
+#: global.c:303 global.c:309
 msgid "Read File"
 msgstr "Lue tied."

-#: global.c:315 global.c:386 global.c:410
+#: global.c:313 global.c:384 global.c:408
 msgid "Replace"
 msgstr "Korvaa"

-#: global.c:319
+#: global.c:317
 msgid "Where Is"
 msgstr "Etsi"

-#: global.c:323 global.c:479 global.c:514
+#: global.c:321 global.c:482 global.c:517
 msgid "Prev Page"
 msgstr "Ed. sivu"

-#: global.c:327 global.c:483 global.c:518
+#: global.c:325 global.c:486 global.c:521
 msgid "Next Page"
 msgstr "Seur. sivu"

-#: global.c:331
+#: global.c:329
 msgid "Cut Text"
 msgstr "Leikkaa"

-#: global.c:335
+#: global.c:333
 msgid "UnJustify"
 msgstr "Poista tasaus"

-#: global.c:338
+#: global.c:336
 msgid "UnCut Txt"
 msgstr "Liitä"

-#: global.c:342
+#: global.c:340
 msgid "Cur Pos"
 msgstr "Sijainti"

-#: global.c:346
+#: global.c:344
 msgid "To Spell"
 msgstr "Oikolue"

-#: global.c:350
+#: global.c:348
 msgid "Up"
 msgstr "Ylös"

-#: global.c:353
+#: global.c:351
 msgid "Down"
 msgstr "Alas"

-#: global.c:356
+#: global.c:354
 msgid "Forward"
 msgstr "Eteenpäin"

-#: global.c:359
+#: global.c:357
 msgid "Back"
 msgstr "Takaisin"

-#: global.c:362
+#: global.c:360
 msgid "Home"
 msgstr "Home"

-#: global.c:365
+#: global.c:363
 msgid "End"
 msgstr "End"

-#: global.c:368
+#: global.c:366
 msgid "Refresh"
 msgstr "Piirrä uudelleen"

-#: global.c:371
+#: global.c:369
 msgid "Mark Text"
 msgstr "Merkitse tekstiä"

-#: global.c:374
+#: global.c:372
 msgid "Delete"
 msgstr "Poista"

-#: global.c:378
+#: global.c:376
 msgid "Backspace"
 msgstr "Askelpalautin"

-#: global.c:382
+#: global.c:380
 msgid "Tab"
 msgstr "Sarkain"

-#: global.c:394
+#: global.c:392
 msgid "Enter"
 msgstr "Enter"

-#: global.c:398 global.c:414 global.c:441
+#: global.c:396 global.c:412 global.c:442
 msgid "Goto Line"
 msgstr "Siirry"

-#: global.c:404 global.c:431 global.c:459 global.c:469
+#: global.c:402 global.c:432 global.c:462 global.c:472
 msgid "First Line"
 msgstr "1. rivi"

-#: global.c:407 global.c:434 global.c:462 global.c:472
+#: global.c:405 global.c:435 global.c:465 global.c:475
 msgid "Last Line"
 msgstr "Viim. rivi"

-#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499
-#: global.c:507 global.c:510 global.c:528 winio.c:1239
-msgid "Cancel"
-msgstr "Peru"
-
-#: global.c:420 global.c:447
+#: global.c:416 global.c:446
 msgid "Case Sens"
 msgstr "Kirj. koko"

-#: global.c:423 global.c:450
+#: global.c:419 global.c:449
 #, fuzzy
 msgid "Backward"
 msgstr "Takaisin"

-#: global.c:427 global.c:454
+#: global.c:424 global.c:454
 msgid "Regexp"
 msgstr ""

-#: global.c:437
+#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502
+#: global.c:510 global.c:513 global.c:531 winio.c:1239
+msgid "Cancel"
+msgstr "Peru"
+
+#: global.c:438
 msgid "No Replace"
 msgstr "Älä korvaa"

-#: global.c:492 global.c:503
+#: global.c:495 global.c:506
 msgid "To Files"
 msgstr "Tiedosto"

-#: global.c:522
+#: global.c:525
 #, fuzzy
 msgid "Goto"
 msgstr "Siirry"
@@ -783,129 +783,129 @@ msgstr "Merkint
 msgid "Mark UNset"
 msgstr "Merkintä loppui"

-#: nano.c:1105
+#: nano.c:1106
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap -funktion parametri inptr->data=\"%s\"\n"

-#: nano.c:1157
+#: nano.c:1158
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data nyt = \"%s\"\n"

-#: nano.c:1209
+#: nano.c:1210
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Jälkeenpäin, data = \"%s\"\n"

-#: nano.c:1310
+#: nano.c:1311
 msgid "Edit a replacement"
 msgstr "Muokkaa korvausta"

-#: nano.c:1548
+#: nano.c:1549
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Väliaikaista tiedostonnimeä ei voitu luoda: %s"

-#: nano.c:1554
+#: nano.c:1555
 msgid "Spell checking failed: unable to write temp file!"
 msgstr "Oikaisuluku epäonnistui: väliaikaistiedostoa ei voitu kirjoittaa"

-#: nano.c:1566
+#: nano.c:1567
 msgid "Finished checking spelling"
 msgstr "Oikoluku on valmis"

-#: nano.c:1568
+#: nano.c:1569
 msgid "Spell checking failed"
 msgstr "Oikaisuluku epäonnistui"

-#: nano.c:1597
+#: nano.c:1598
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Tallenna muutettu teksti (Muutokset häviävät, jos vastaat \"ei\") ? "

-#: nano.c:1733
+#: nano.c:1734
 msgid "Received SIGHUP"
 msgstr "Vastaanotettiin SIGHUP"

-#: nano.c:1797
+#: nano.c:1798
 msgid "Cannot resize top win"
 msgstr "Yläikkunan kokoa ei voi muuttaa"

-#: nano.c:1799
+#: nano.c:1800
 msgid "Cannot move top win"
 msgstr "Yläikkunaa ei voi siirtää"

-#: nano.c:1801
+#: nano.c:1802
 msgid "Cannot resize edit win"
 msgstr "Muokkausikkunan kokoa ei voi muuttaa"

-#: nano.c:1803
+#: nano.c:1804
 msgid "Cannot move edit win"
 msgstr "Muokkausikkunaa ei voi siirtää"

-#: nano.c:1805
+#: nano.c:1806
 msgid "Cannot resize bottom win"
 msgstr "Alaikkunan kokoa ei voi muuttaa"

-#: nano.c:1807
+#: nano.c:1808
 msgid "Cannot move bottom win"
 msgstr "Alaikkunaa ei voi siirtää"

-#: nano.c:2132
+#: nano.c:2133
 msgid "Can now UnJustify!"
 msgstr "Tasaamisen voi perua nyt."

-#: nano.c:2248
+#: nano.c:2249
 #, c-format
 msgid "%s enable/disable"
 msgstr "%s käytössä/ei käytössä"

-#: nano.c:2267
+#: nano.c:2268
 msgid "enabled"
 msgstr "käytössä"

-#: nano.c:2268
+#: nano.c:2269
 msgid "disabled"
 msgstr "ei käytössä"

-#: nano.c:2321
+#: nano.c:2322
 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:2576
+#: nano.c:2577
 msgid "Main: set up windows\n"
 msgstr "Päätila: ikkunoiden asettelu\n"

-#: nano.c:2587
+#: nano.c:2588
 msgid "Main: bottom win\n"
 msgstr "Päätila: alaikkuna\n"

-#: nano.c:2593
+#: nano.c:2594
 msgid "Main: open file\n"
 msgstr "Päätila: avaa tiedosto\n"

-#: nano.c:2651
+#: nano.c:2652
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "Vastaanotettu Alt-O-%c! (%d)\n"

-#: nano.c:2678
+#: nano.c:2679
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "Vastaanotettu Alt-[-1-%c! (%d)\n"

-#: nano.c:2716
+#: nano.c:2717
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "Vastaanotettu Alt-[-2-%c! (%d)\n"

-#: nano.c:2770
+#: nano.c:2771
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Vastaanotettu Alt-[-%c! (%d)\n"

-#: nano.c:2805
+#: nano.c:2806
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Vastaanotettu Alt-%c! (%d)\n"
@@ -959,93 +959,93 @@ msgstr ""
 msgid "Unable to open ~/.nanorc file, %s"
 msgstr ""

-#: search.c:126
+#: search.c:129
 #, fuzzy
 msgid "Case Sensitive "
 msgstr "Kirj. koko"

-#: search.c:127
+#: search.c:130
 msgid "Regexp "
 msgstr ""

-#: search.c:128
+#: search.c:131
 #, fuzzy
 msgid "Search"
 msgstr "Etsintä%s%s"

-#: search.c:129
+#: search.c:132
 msgid " Backwards"
 msgstr ""

-#: search.c:130
+#: search.c:133
 msgid " (to replace)"
 msgstr " (korvattava)"

-#: search.c:135 search.c:399
+#: search.c:138 search.c:404
 msgid "Search Cancelled"
 msgstr "Etsintä peruttu"

-#: search.c:216
+#: search.c:221
 #, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s...\" ei löytynyt"

-#: search.c:265 search.c:321
+#: search.c:270 search.c:326
 msgid "Search Wrapped"
 msgstr "Etsintä jatkuu"

-#: search.c:421
+#: search.c:426
 #, fuzzy, c-format
 msgid "Replaced %d occurrences"
 msgstr "%d kohtaa korvattu"

-#: search.c:423
+#: search.c:428
 #, fuzzy
 msgid "Replaced 1 occurrence"
 msgstr "1 kohta korvattu"

-#: search.c:561 search.c:671 search.c:687
+#: search.c:566 search.c:676 search.c:692
 msgid "Replace Cancelled"
 msgstr "Korvaus peruttu"

-#: search.c:611
+#: search.c:616
 msgid "Replace this instance?"
 msgstr "Korvataanko tämä kohta?"

-#: search.c:623
+#: search.c:628
 msgid "Replace failed: unknown subexpression!"
 msgstr "Korvaus epäonnistui: tuntematon alilauseke!"

-#: search.c:712
+#: search.c:717
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Korvaa merkkijonolla [%s]"

-#: search.c:716 search.c:720
+#: search.c:721 search.c:725
 msgid "Replace with"
 msgstr "Korvaa merkkijonolla"

-#: search.c:754
+#: search.c:759
 msgid "Enter line number"
 msgstr "Kirjoita rivin numero"

-#: search.c:756
+#: search.c:761
 msgid "Aborted"
 msgstr "Keskeytetty"

-#: search.c:765
+#: search.c:770
 msgid "Come on, be reasonable"
 msgstr "Jotakin järkevää, kiitos?"

-#: utils.c:146
+#: utils.c:159
 msgid "nano: malloc: out of memory!"
 msgstr ""

-#: utils.c:160
+#: utils.c:173
 msgid "nano: calloc: out of memory!"
 msgstr ""

-#: utils.c:170
+#: utils.c:183
 msgid "nano: realloc: out of memory!"
 msgstr ""

--- 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-07-14 18:56-0400\n"
+"POT-Creation-Date: 2001-07-28 19:55-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"
@@ -24,134 +24,134 @@ msgstr "add_to_cutbuffer appel
 msgid "Blew away cutbuffer =)\n"
 msgstr "cutbuffer annihilé -)\n"

-#: files.c:134
+#: files.c:145
 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:196 files.c:214
+#: files.c:207 files.c:225
 #, c-format
 msgid "Read %d lines"
 msgstr "%d lignes lues"

-#: files.c:232 search.c:210
+#: files.c:243 search.c:215
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" non trouvé"

 #. We have a new file
-#: files.c:236
+#: files.c:247
 msgid "New File"
 msgstr "Nouveau fichier"

-#: files.c:249
+#: files.c:260
 #, 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:252
+#: files.c:263
 #, fuzzy, c-format
 msgid "File \"%s\" is a device file"
 msgstr "Le fichier \"%s\" est un répertoire"

-#: files.c:259
+#: files.c:270
 msgid "Reading File"
 msgstr "Lecture du fichier"

-#: files.c:279
+#: files.c:290
 msgid "File to insert [from ./] "
 msgstr "Fichier à insérer [depuis ./] "

-#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705
-#: files.c:716 files.c:1102
+#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716
+#: files.c:727 files.c:1113
 #, c-format
 msgid "filename is %s"
 msgstr "Le nom du fichier est %s"

-#: files.c:368 files.c:872 files.c:1187 nano.c:1629
+#: files.c:379 files.c:883 files.c:1198 nano.c:1630
 msgid "Cancelled"
 msgstr "Annulé"

-#: files.c:642 files.c:697
+#: files.c:653 files.c:708
 msgid "No more open files"
 msgstr ""

-#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974
+#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Impossible d'ouvrir le fichier en écriture: %s"

-#: files.c:955
+#: files.c:966
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Écrit >%s\n"

-#: files.c:983
+#: files.c:994
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Impossible de fermer %s: %s"

 #. Try a rename??
-#: files.c:1006 files.c:1015 files.c:1020
+#: files.c:1017 files.c:1026 files.c:1031
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Impossible d'ouvrir %s en écriture: %s"

-#: files.c:1027
+#: files.c:1038
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Impossible de donner les permissions %o à %s: %s"

-#: files.c:1034
+#: files.c:1045
 #, c-format
 msgid "Wrote %d lines"
 msgstr "%d lignes écrites"

-#: files.c:1074
+#: files.c:1085
 #, c-format
 msgid "%s Selection to File"
 msgstr ""

-#: files.c:1074 files.c:1078 global.c:496
+#: files.c:1085 files.c:1089 global.c:499
 msgid "Append"
 msgstr ""

-#: files.c:1074 files.c:1078
+#: files.c:1085 files.c:1089
 #, fuzzy
 msgid "Write"
 msgstr "Sauvegarde"

-#: files.c:1078
+#: files.c:1089
 #, fuzzy, c-format
 msgid "File Name to %s"
 msgstr "Nom du fichier dans lequel écrire"

-#: files.c:1116
+#: files.c:1127
 msgid "File exists, OVERWRITE ?"
 msgstr "Fichier existant, écrire par-dessus ?"

-#: files.c:1598
+#: files.c:1609
 msgid "(more)"
 msgstr ""

-#: files.c:1911
+#: files.c:1922
 msgid "Can't move up a directory"
 msgstr ""

 #. We can't open this dir for some reason.  Complain
-#: files.c:1921 files.c:1969
+#: files.c:1932 files.c:1980
 #, fuzzy, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "Impossible de fermer %s: %s"

-#: files.c:1949 global.c:277
+#: files.c:1960 global.c:275
 #, fuzzy
 msgid "Goto Directory"
 msgstr "-> ligne"

-#: files.c:1954
+#: files.c:1965
 #, fuzzy
 msgid "Goto Cancelled"
 msgstr "Annulé"
@@ -216,307 +216,307 @@ msgstr ""
 msgid "Open next loaded file"
 msgstr ""

-#: global.c:238
+#: global.c:236
 msgid "Invoke the help menu"
 msgstr "Appelle le menu d'aide"

-#: global.c:239
+#: global.c:237
 msgid "Write the current file to disk"
 msgstr "Ecrit le fichier en cours sur le disque"

-#: global.c:242
+#: global.c:240
 msgid "Close currently loaded file/Exit from nano"
 msgstr ""

-#: global.c:244
+#: global.c:242
 msgid "Exit from nano"
 msgstr "Quitte Nano"

-#: global.c:247
+#: global.c:245
 #, fuzzy
 msgid "Goto a specific line number"
 msgstr "Entrer le numéro de ligne"

-#: global.c:248
+#: global.c:246
 msgid "Justify the current paragraph"
 msgstr "Justifie le paragraphe courant"

-#: global.c:249
+#: global.c:247
 msgid "Unjustify after a justify"
 msgstr ""

-#: global.c:250
+#: global.c:248
 msgid "Replace text within the editor"
 msgstr "Remplace le texte dans l'éditeur"

-#: global.c:251
+#: global.c:249
 msgid "Insert another file into the current one"
 msgstr "Insère un autre fichier dans le fichier courant"

-#: global.c:252
+#: global.c:250
 msgid "Search for text within the editor"
 msgstr "Recherche d'une chaîne dans l'éditeur"

-#: global.c:253
+#: global.c:251
 msgid "Move to the previous screen"
 msgstr "Retourne a l'écran précèdent"

-#: global.c:254
+#: global.c:252
 msgid "Move to the next screen"
 msgstr "Aller au prochain écran"

-#: global.c:255
+#: global.c:253
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Supprime la ligne courante et la stocke en mémoire"

-#: global.c:256
+#: global.c:254
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Copie la chaîne en mémoire vers la ligne courante"

-#: global.c:257
+#: global.c:255
 msgid "Show the position of the cursor"
 msgstr "Affiche la position du curseur"

-#: global.c:258
+#: global.c:256
 msgid "Invoke the spell checker (if available)"
 msgstr "Appel du correcteur orthographique (s'il est disponible)"

-#: global.c:259
+#: global.c:257
 msgid "Move up one line"
 msgstr "Déplace d'une ligne vers le haut"

-#: global.c:260
+#: global.c:258
 msgid "Move down one line"
 msgstr "Déplace d'une ligne vers le bas"

-#: global.c:261
+#: global.c:259
 msgid "Move forward one character"
 msgstr "Déplace d'un caractère en avant"

-#: global.c:262
+#: global.c:260
 msgid "Move back one character"
 msgstr "Déplace d'un caractère en arriere"

-#: global.c:263
+#: global.c:261
 msgid "Move to the beginning of the current line"
 msgstr "Déplace vers le début de la ligne courante"

-#: global.c:264
+#: global.c:262
 msgid "Move to the end of the current line"
 msgstr "Déplace vers la fin de la ligne courante"

-#: global.c:265
+#: global.c:263
 msgid "Go to the first line of the file"
 msgstr "Va à la première ligne du fichier"

-#: global.c:266
+#: global.c:264
 msgid "Go to the last line of the file"
 msgstr "Va à la dernière ligne du fichier"

-#: global.c:267
+#: global.c:265
 msgid "Refresh (redraw) the current screen"
 msgstr "Rafraichit (redessine) l'ecran courant"

-#: global.c:268
+#: global.c:266
 msgid "Mark text at the current cursor location"
 msgstr "Marquer le texte à la position actuelle du curseur"

-#: global.c:269
+#: global.c:267
 msgid "Delete the character under the cursor"
 msgstr "Supprime le caractère où se trouve le curseur"

-#: global.c:271
+#: global.c:269
 msgid "Delete the character to the left of the cursor"
 msgstr "Supprime le caractère à la gauche du curseur"

-#: global.c:272
+#: global.c:270
 msgid "Insert a tab character"
 msgstr "Insère une tabulation"

-#: global.c:273
+#: global.c:271
 msgid "Insert a carriage return at the cursor position"
 msgstr "Insère un retour-chariot à la position du curseur"

-#: global.c:275
+#: global.c:273
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Exécuter rechercher/remplacer avec/sans rspect de la casse"

-#: global.c:276
+#: global.c:274
 msgid "Go to file browser"
 msgstr ""

-#: global.c:278
+#: global.c:276
 msgid "Cancel the current function"
 msgstr "Annule la fonction courante"

-#: global.c:279
+#: global.c:277
 #, fuzzy
 msgid "Append to the current file"
 msgstr "Déplace vers la fin de la ligne courante"

-#: global.c:280
+#: global.c:278
 #, fuzzy
 msgid "Search Backwards"
 msgstr "Recherche annulée"

-#: global.c:281
+#: global.c:279
 #, fuzzy
 msgid "Use Regular Expressions"
 msgstr "-R\t\tUtilisation des expressions régulières pour la recherche\n"

-#: global.c:284
+#: global.c:282
 msgid "Get Help"
 msgstr "Appelle l'aide"

-#: global.c:289
+#: global.c:287
 msgid "Close"
 msgstr ""

-#: global.c:293 global.c:487 global.c:525
+#: global.c:291 global.c:490 global.c:528
 msgid "Exit"
 msgstr "Quitte"

-#: global.c:296
+#: global.c:294
 msgid "WriteOut"
 msgstr "Sauvegarde"

-#: global.c:301 global.c:390
+#: global.c:299 global.c:388
 msgid "Justify"
 msgstr "Justifier"

-#: global.c:305 global.c:311
+#: global.c:303 global.c:309
 #, fuzzy
 msgid "Read File"
 msgstr "Lect. fichier"

-#: global.c:315 global.c:386 global.c:410
+#: global.c:313 global.c:384 global.c:408
 #, fuzzy
 msgid "Replace"
 msgstr "Remplacer par"

-#: global.c:319
+#: global.c:317
 msgid "Where Is"
 msgstr "Recherche"

-#: global.c:323 global.c:479 global.c:514
+#: global.c:321 global.c:482 global.c:517
 msgid "Prev Page"
 msgstr "Page préc."

-#: global.c:327 global.c:483 global.c:518
+#: global.c:325 global.c:486 global.c:521
 msgid "Next Page"
 msgstr "Page suiv."

-#: global.c:331
+#: global.c:329
 msgid "Cut Text"
 msgstr "Couper"

-#: global.c:335
+#: global.c:333
 #, fuzzy
 msgid "UnJustify"
 msgstr "Justifier"

-#: global.c:338
+#: global.c:336
 msgid "UnCut Txt"
 msgstr "Annul. Coup"

-#: global.c:342
+#: global.c:340
 msgid "Cur Pos"
 msgstr "Pos. curseur"

-#: global.c:346
+#: global.c:344
 msgid "To Spell"
 msgstr "Corriger"

-#: global.c:350
+#: global.c:348
 msgid "Up"
 msgstr "Haut"

-#: global.c:353
+#: global.c:351
 msgid "Down"
 msgstr "Bas"

-#: global.c:356
+#: global.c:354
 msgid "Forward"
 msgstr "En avant"

-#: global.c:359
+#: global.c:357
 msgid "Back"
 msgstr "En arrière"

-#: global.c:362
+#: global.c:360
 msgid "Home"
 msgstr "Debut Doc."

-#: global.c:365
+#: global.c:363
 msgid "End"
 msgstr "Fin Doc0"

-#: global.c:368
+#: global.c:366
 msgid "Refresh"
 msgstr "Rafraîchir"

-#: global.c:371
+#: global.c:369
 #, fuzzy
 msgid "Mark Text"
 msgstr "Marque enregistrée"

-#: global.c:374
+#: global.c:372
 msgid "Delete"
 msgstr "Supprimer"

-#: global.c:378
+#: global.c:376
 msgid "Backspace"
 msgstr "Backspace"

 # No translation...
-#: global.c:382
+#: global.c:380
 msgid "Tab"
 msgstr "Tabulation"

-#: global.c:394
+#: global.c:392
 msgid "Enter"
 msgstr "Entrée"

-#: global.c:398 global.c:414 global.c:441
+#: global.c:396 global.c:412 global.c:442
 msgid "Goto Line"
 msgstr "-> ligne"

-#: global.c:404 global.c:431 global.c:459 global.c:469
+#: global.c:402 global.c:432 global.c:462 global.c:472
 msgid "First Line"
 msgstr "Première ligne"

-#: global.c:407 global.c:434 global.c:462 global.c:472
+#: global.c:405 global.c:435 global.c:465 global.c:475
 msgid "Last Line"
 msgstr "Dernière Ligne"

-#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499
-#: global.c:507 global.c:510 global.c:528 winio.c:1239
-msgid "Cancel"
-msgstr "Annuler"
-
-#: global.c:420 global.c:447
+#: global.c:416 global.c:446
 msgid "Case Sens"
 msgstr "Casse respectée"

-#: global.c:423 global.c:450
+#: global.c:419 global.c:449
 #, fuzzy
 msgid "Backward"
 msgstr "En arrière"

-#: global.c:427 global.c:454
+#: global.c:424 global.c:454
 msgid "Regexp"
 msgstr ""

-#: global.c:437
+#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502
+#: global.c:510 global.c:513 global.c:531 winio.c:1239
+msgid "Cancel"
+msgstr "Annuler"
+
+#: global.c:438
 msgid "No Replace"
 msgstr "Pas de remplacement"

-#: global.c:492 global.c:503
+#: global.c:495 global.c:506
 #, fuzzy
 msgid "To Files"
 msgstr "Nouveau fichier"

-#: global.c:522
+#: global.c:525
 #, fuzzy
 msgid "Goto"
 msgstr "-> ligne"
@@ -806,128 +806,128 @@ msgstr "Marque enregistr
 msgid "Mark UNset"
 msgstr "Marque effacée"

-#: nano.c:1105
+#: nano.c:1106
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap appelée avec inptr->data=\"%s\"\n"

-#: nano.c:1157
+#: nano.c:1158
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data vaut maintenant \"%s\"\n"

-#: nano.c:1209
+#: nano.c:1210
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Après, data = \"%s\"\n"

-#: nano.c:1310
+#: nano.c:1311
 msgid "Edit a replacement"
 msgstr ""

-#: nano.c:1548
+#: nano.c:1549
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Impossible de créer un nom de fichier temporaire: %s"

-#: nano.c:1554
+#: nano.c:1555
 msgid "Spell checking failed: unable to write temp file!"
 msgstr ""

-#: nano.c:1566
+#: nano.c:1567
 msgid "Finished checking spelling"
 msgstr "Vérification orthographique terminée"

-#: nano.c:1568
+#: nano.c:1569
 msgid "Spell checking failed"
 msgstr ""

-#: nano.c:1597
+#: nano.c:1598
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Sauver le buffer modifié (RÉPONDRE \"No\" EFFACERA LES CHANGEMENTS"

-#: nano.c:1733
+#: nano.c:1734
 msgid "Received SIGHUP"
 msgstr ""

-#: nano.c:1797
+#: nano.c:1798
 msgid "Cannot resize top win"
 msgstr "Impossible de redimensionner la fenêtre du haut"

-#: nano.c:1799
+#: nano.c:1800
 msgid "Cannot move top win"
 msgstr "Impossible de bouger la fenêtre du haut"

-#: nano.c:1801
+#: nano.c:1802
 msgid "Cannot resize edit win"
 msgstr "Impossible de redimensionner la fenêtre d'édition"

-#: nano.c:1803
+#: nano.c:1804
 msgid "Cannot move edit win"
 msgstr "Impossible de bouger la fenêtre d'édition"

-#: nano.c:1805
+#: nano.c:1806
 msgid "Cannot resize bottom win"
 msgstr "Impossible de redimensionner la fenêtre du bas"

-#: nano.c:1807
+#: nano.c:1808
 msgid "Cannot move bottom win"
 msgstr "Impossible de bouger la fenêtre du bas"

-#: nano.c:2132
+#: nano.c:2133
 msgid "Can now UnJustify!"
 msgstr ""

-#: nano.c:2248
+#: nano.c:2249
 #, c-format
 msgid "%s enable/disable"
 msgstr ""

-#: nano.c:2267
+#: nano.c:2268
 msgid "enabled"
 msgstr ""

-#: nano.c:2268
+#: nano.c:2269
 msgid "disabled"
 msgstr ""

-#: nano.c:2321
+#: nano.c:2322
 msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 msgstr ""

-#: nano.c:2576
+#: nano.c:2577
 msgid "Main: set up windows\n"
 msgstr "Main: configuration des fenêtres\n"

-#: nano.c:2587
+#: nano.c:2588
 msgid "Main: bottom win\n"
 msgstr "Main: fenêtre du bas\n"

-#: nano.c:2593
+#: nano.c:2594
 msgid "Main: open file\n"
 msgstr "Main: ouvrir fichier\n"

-#: nano.c:2651
+#: nano.c:2652
 #, fuzzy, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "J'ai reçu Alt-[-%c! (%d)\n"

-#: nano.c:2678
+#: nano.c:2679
 #, fuzzy, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "J'ai reçu Alt-[-%c! (%d)\n"

-#: nano.c:2716
+#: nano.c:2717
 #, fuzzy, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "J'ai reçu Alt-[-%c! (%d)\n"

-#: nano.c:2770
+#: nano.c:2771
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "J'ai reçu Alt-[-%c! (%d)\n"

-#: nano.c:2805
+#: nano.c:2806
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "J'ai reçu Alt-%c! (%d)\n"
@@ -981,95 +981,95 @@ msgstr ""
 msgid "Unable to open ~/.nanorc file, %s"
 msgstr ""

-#: search.c:126
+#: search.c:129
 #, fuzzy
 msgid "Case Sensitive "
 msgstr "Casse respectée"

-#: search.c:127
+#: search.c:130
 msgid "Regexp "
 msgstr ""

-#: search.c:128
+#: search.c:131
 #, fuzzy
 msgid "Search"
 msgstr "Recherche%s%s"

-#: search.c:129
+#: search.c:132
 msgid " Backwards"
 msgstr ""

-#: search.c:130
+#: search.c:133
 #, fuzzy
 msgid " (to replace)"
 msgstr " (remplacer par)"

-#: search.c:135 search.c:399
+#: search.c:138 search.c:404
 msgid "Search Cancelled"
 msgstr "Recherche annulée"

-#: search.c:216
+#: search.c:221
 #, fuzzy, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s\" non trouvé"

-#: search.c:265 search.c:321
+#: search.c:270 search.c:326
 msgid "Search Wrapped"
 msgstr "La recherche a bouclé"

-#: search.c:421
+#: search.c:426
 #, fuzzy, c-format
 msgid "Replaced %d occurrences"
 msgstr "%d occurences remplacées"

-#: search.c:423
+#: search.c:428
 #, fuzzy
 msgid "Replaced 1 occurrence"
 msgstr "1 occurence remplacée"

-#: search.c:561 search.c:671 search.c:687
+#: search.c:566 search.c:676 search.c:692
 msgid "Replace Cancelled"
 msgstr "Remplacement annulé"

-#: search.c:611
+#: search.c:616
 msgid "Replace this instance?"
 msgstr "Remplacer cette occurence?"

-#: search.c:623
+#: search.c:628
 msgid "Replace failed: unknown subexpression!"
 msgstr ""

-#: search.c:712
+#: search.c:717
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Remplacer par [%s]"

-#: search.c:716 search.c:720
+#: search.c:721 search.c:725
 msgid "Replace with"
 msgstr "Rempacer par"

-#: search.c:754
+#: search.c:759
 msgid "Enter line number"
 msgstr "Entrer le numéro de ligne"

-#: search.c:756
+#: search.c:761
 msgid "Aborted"
 msgstr "Annulé"

-#: search.c:765
+#: search.c:770
 msgid "Come on, be reasonable"
 msgstr "Allez, soyez raisonnable"

-#: utils.c:146
+#: utils.c:159
 msgid "nano: malloc: out of memory!"
 msgstr "nano: malloc: plus de mémoire!"

-#: utils.c:160
+#: utils.c:173
 #, fuzzy
 msgid "nano: calloc: out of memory!"
 msgstr "nano: malloc: plus de mémoire!"

-#: utils.c:170
+#: utils.c:183
 #, fuzzy
 msgid "nano: realloc: out of memory!"
 msgstr "nano: malloc: plus de mémoire!"
--- 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-07-14 18:56-0400\n"
+"POT-Creation-Date: 2001-07-28 19:55-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"
@@ -22,132 +22,132 @@ msgstr "chamouse a add_to_cutbuffer con inptr->data = %s\n"
 msgid "Blew away cutbuffer =)\n"
 msgstr "Borrouse o buffer de cortado =)\n"

-#: files.c:134
+#: files.c:145
 msgid "read_line: not on first line and prev is NULL"
 msgstr "read_line: non se está na primeira liña, e prev é NULL"

-#: files.c:196 files.c:214
+#: files.c:207 files.c:225
 #, c-format
 msgid "Read %d lines"
 msgstr "Léronse %d liñas"

-#: files.c:232 search.c:210
+#: files.c:243 search.c:215
 #, c-format
 msgid "\"%s\" not found"
 msgstr "Non se atopou \"%s\""

 #. We have a new file
-#: files.c:236
+#: files.c:247
 msgid "New File"
 msgstr "Ficheiro Novo"

-#: files.c:249
+#: files.c:260
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr "O ficheiro \"%s\" é un directorio"

 #. Don't open character or block files.  Sorry, /dev/sndstat!
-#: files.c:252
+#: files.c:263
 #, c-format
 msgid "File \"%s\" is a device file"
 msgstr "O ficheiro \"%s\" é un ficheiro de dispositivo"

-#: files.c:259
+#: files.c:270
 msgid "Reading File"
 msgstr "Lendo o Ficheiro"

-#: files.c:279
+#: files.c:290
 msgid "File to insert [from ./] "
 msgstr "Ficheiro a inserir [dende ./]"

-#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705
-#: files.c:716 files.c:1102
+#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716
+#: files.c:727 files.c:1113
 #, c-format
 msgid "filename is %s"
 msgstr "filename é %s"

-#: files.c:368 files.c:872 files.c:1187 nano.c:1629
+#: files.c:379 files.c:883 files.c:1198 nano.c:1630
 msgid "Cancelled"
 msgstr "Cancelado"

-#: files.c:642 files.c:697
+#: files.c:653 files.c:708
 msgid "No more open files"
 msgstr ""

-#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974
+#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Non se puido abri-lo ficheiro para escribir: %s"

-#: files.c:955
+#: files.c:966
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Escribíuse >%s\n"

-#: files.c:983
+#: files.c:994
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Non se puido pechar %s: %s"

 #. Try a rename??
-#: files.c:1006 files.c:1015 files.c:1020
+#: files.c:1017 files.c:1026 files.c:1031
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Non se puido abrir %s para escribir: %s"

-#: files.c:1027
+#: files.c:1038
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Non se puideron estabrece-los permisos %o en %s: %s"

-#: files.c:1034
+#: files.c:1045
 #, c-format
 msgid "Wrote %d lines"
 msgstr "Escribíronse %d liñas"

-#: files.c:1074
+#: files.c:1085
 #, c-format
 msgid "%s Selection to File"
 msgstr ""

-#: files.c:1074 files.c:1078 global.c:496
+#: files.c:1085 files.c:1089 global.c:499
 #, fuzzy
 msgid "Append"
 msgstr "Suspender"

-#: files.c:1074 files.c:1078
+#: files.c:1085 files.c:1089
 #, fuzzy
 msgid "Write"
 msgstr "Gravar"

-#: files.c:1078
+#: files.c:1089
 #, fuzzy, c-format
 msgid "File Name to %s"
 msgstr "Nome do Ficheiro a escribir"

-#: files.c:1116
+#: files.c:1127
 msgid "File exists, OVERWRITE ?"
 msgstr "O ficheiro xa existe, ¿SOBRESCRIBIR?"

-#: files.c:1598
+#: files.c:1609
 msgid "(more)"
 msgstr "(máis)"

-#: files.c:1911
+#: files.c:1922
 msgid "Can't move up a directory"
 msgstr "Non se pode ascender por un directorio"

 #. We can't open this dir for some reason.  Complain
-#: files.c:1921 files.c:1969
+#: files.c:1932 files.c:1980
 #, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "Non se puido abrir \"%s\": %s"

-#: files.c:1949 global.c:277
+#: files.c:1960 global.c:275
 msgid "Goto Directory"
 msgstr "Ir a un Directorio"

-#: files.c:1954
+#: files.c:1965
 msgid "Goto Cancelled"
 msgstr "Ir-A Cancelado"

@@ -208,300 +208,300 @@ msgstr ""
 msgid "Open next loaded file"
 msgstr ""

-#: global.c:238
+#: global.c:236
 msgid "Invoke the help menu"
 msgstr "Chamar ao menú de axuda"

-#: global.c:239
+#: global.c:237
 msgid "Write the current file to disk"
 msgstr "Grava-lo ficheiro actual no disco"

-#: global.c:242
+#: global.c:240
 msgid "Close currently loaded file/Exit from nano"
 msgstr ""

-#: global.c:244
+#: global.c:242
 msgid "Exit from nano"
 msgstr "Saír de nano"

-#: global.c:247
+#: global.c:245
 msgid "Goto a specific line number"
 msgstr "Ir a un determinado número de liña"

-#: global.c:248
+#: global.c:246
 msgid "Justify the current paragraph"
 msgstr "Xustifica-lo parágrafo actual"

-#: global.c:249
+#: global.c:247
 msgid "Unjustify after a justify"
 msgstr "Des-xustificar despois de xustificar"

-#: global.c:250
+#: global.c:248
 msgid "Replace text within the editor"
 msgstr "Substituír texto no editor"

-#: global.c:251
+#: global.c:249
 msgid "Insert another file into the current one"
 msgstr "Inserir outro ficheiro no actual"

-#: global.c:252
+#: global.c:250
 msgid "Search for text within the editor"
 msgstr "Buscar texto no editor"

-#: global.c:253
+#: global.c:251
 msgid "Move to the previous screen"
 msgstr "Pasar á pantalla anterior"

-#: global.c:254
+#: global.c:252
 msgid "Move to the next screen"
 msgstr "Pasar á seguinte pantalla"

-#: global.c:255
+#: global.c:253
 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:256
+#: global.c:254
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Pegar do buffer de cortado na liña actual"

-#: global.c:257
+#: global.c:255
 msgid "Show the position of the cursor"
 msgstr "Amosa-la posición do cursor"

-#: global.c:258
+#: global.c:256
 msgid "Invoke the spell checker (if available)"
 msgstr "Chamar ao corrector ortográfico (se hai un)"

-#: global.c:259
+#: global.c:257
 msgid "Move up one line"
 msgstr "Subir unha liña"

-#: global.c:260
+#: global.c:258
 msgid "Move down one line"
 msgstr "Baixar unha liña"

-#: global.c:261
+#: global.c:259
 msgid "Move forward one character"
 msgstr "Avanzar un carácter"

-#: global.c:262
+#: global.c:260
 msgid "Move back one character"
 msgstr "Recuar un carácter"

-#: global.c:263
+#: global.c:261
 msgid "Move to the beginning of the current line"
 msgstr "Ir ao principio da liña actual"

-#: global.c:264
+#: global.c:262
 msgid "Move to the end of the current line"
 msgstr "Ir á fin da liña actual"

-#: global.c:265
+#: global.c:263
 msgid "Go to the first line of the file"
 msgstr "Ir á primeira liña do ficheiro"

-#: global.c:266
+#: global.c:264
 msgid "Go to the last line of the file"
 msgstr "Ir á derradeira liña do ficheiro"

-#: global.c:267
+#: global.c:265
 msgid "Refresh (redraw) the current screen"
 msgstr "Actualiza-la pantalla actual"

-#: global.c:268
+#: global.c:266
 msgid "Mark text at the current cursor location"
 msgstr "Marca-lo texto da posición actual do cursor"

-#: global.c:269
+#: global.c:267
 msgid "Delete the character under the cursor"
 msgstr "Borra-lo carácter de embaixo do cursor"

-#: global.c:271
+#: global.c:269
 msgid "Delete the character to the left of the cursor"
 msgstr "Borra-lo carácter á esquerda do cursor"

-#: global.c:272
+#: global.c:270
 msgid "Insert a tab character"
 msgstr "Inserir unha tabulación"

-#: global.c:273
+#: global.c:271
 msgid "Insert a carriage return at the cursor position"
 msgstr "Inserir un retorno de carro na posición do cursor"

-#: global.c:275
+#: global.c:273
 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:276
+#: global.c:274
 msgid "Go to file browser"
 msgstr "Ir ao navegador de ficheiros"

-#: global.c:278
+#: global.c:276
 msgid "Cancel the current function"
 msgstr "Cancela-la función actual"

-#: global.c:279
+#: global.c:277
 #, fuzzy
 msgid "Append to the current file"
 msgstr "Ir á fin da liña actual"

-#: global.c:280
+#: global.c:278
 #, fuzzy
 msgid "Search Backwards"
 msgstr "Busca Cancelada"

-#: global.c:281
+#: global.c:279
 #, fuzzy
 msgid "Use Regular Expressions"
 msgstr "Expresións regulares"

-#: global.c:284
+#: global.c:282
 msgid "Get Help"
 msgstr "Axuda"

-#: global.c:289
+#: global.c:287
 msgid "Close"
 msgstr ""

-#: global.c:293 global.c:487 global.c:525
+#: global.c:291 global.c:490 global.c:528
 msgid "Exit"
 msgstr "Saír"

-#: global.c:296
+#: global.c:294
 msgid "WriteOut"
 msgstr "Gravar"

-#: global.c:301 global.c:390
+#: global.c:299 global.c:388
 msgid "Justify"
 msgstr "Xustif."

-#: global.c:305 global.c:311
+#: global.c:303 global.c:309
 msgid "Read File"
 msgstr "Ler Fich."

-#: global.c:315 global.c:386 global.c:410
+#: global.c:313 global.c:384 global.c:408
 msgid "Replace"
 msgstr "Substit."

-#: global.c:319
+#: global.c:317
 msgid "Where Is"
 msgstr "Buscar"

-#: global.c:323 global.c:479 global.c:514
+#: global.c:321 global.c:482 global.c:517
 msgid "Prev Page"
 msgstr "Páx. Ant."

-#: global.c:327 global.c:483 global.c:518
+#: global.c:325 global.c:486 global.c:521
 msgid "Next Page"
 msgstr "Páx. Seg."

-#: global.c:331
+#: global.c:329
 msgid "Cut Text"
 msgstr "Cortar"

-#: global.c:335
+#: global.c:333
 msgid "UnJustify"
 msgstr "Des-Xust."

-#: global.c:338
+#: global.c:336
 msgid "UnCut Txt"
 msgstr "Pegar"

-#: global.c:342
+#: global.c:340
 msgid "Cur Pos"
 msgstr "Pos. Act."

-#: global.c:346
+#: global.c:344
 msgid "To Spell"
 msgstr "Ortograf."

-#: global.c:350
+#: global.c:348
 msgid "Up"
 msgstr "Arriba"

-#: global.c:353
+#: global.c:351
 msgid "Down"
 msgstr "Abaixo"

-#: global.c:356
+#: global.c:354
 msgid "Forward"
 msgstr "Adiante"

-#: global.c:359
+#: global.c:357
 msgid "Back"
 msgstr "Atrás"

-#: global.c:362
+#: global.c:360
 msgid "Home"
 msgstr "Inicio"

-#: global.c:365
+#: global.c:363
 msgid "End"
 msgstr "Fin"

-#: global.c:368
+#: global.c:366
 msgid "Refresh"
 msgstr "Actualizar"

-#: global.c:371
+#: global.c:369
 msgid "Mark Text"
 msgstr "Marcar"

-#: global.c:374
+#: global.c:372
 msgid "Delete"
 msgstr "Borrar"

-#: global.c:378
+#: global.c:376
 msgid "Backspace"
 msgstr "Retroceso"

-#: global.c:382
+#: global.c:380
 msgid "Tab"
 msgstr "Tabulador"

-#: global.c:394
+#: global.c:392
 msgid "Enter"
 msgstr "Enter"

-#: global.c:398 global.c:414 global.c:441
+#: global.c:396 global.c:412 global.c:442
 msgid "Goto Line"
 msgstr "Ir á Liña"

-#: global.c:404 global.c:431 global.c:459 global.c:469
+#: global.c:402 global.c:432 global.c:462 global.c:472
 msgid "First Line"
 msgstr "Pri. Liña"

-#: global.c:407 global.c:434 global.c:462 global.c:472
+#: global.c:405 global.c:435 global.c:465 global.c:475
 msgid "Last Line"
 msgstr "Der. Liña"

-#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499
-#: global.c:507 global.c:510 global.c:528 winio.c:1239
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: global.c:420 global.c:447
+#: global.c:416 global.c:446
 msgid "Case Sens"
 msgstr "Maiú./Min."

-#: global.c:423 global.c:450
+#: global.c:419 global.c:449
 #, fuzzy
 msgid "Backward"
 msgstr "Atrás"

-#: global.c:427 global.c:454
+#: global.c:424 global.c:454
 msgid "Regexp"
 msgstr ""

-#: global.c:437
+#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502
+#: global.c:510 global.c:513 global.c:531 winio.c:1239
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: global.c:438
 msgid "No Replace"
 msgstr "Non Subst."

-#: global.c:492 global.c:503
+#: global.c:495 global.c:506
 msgid "To Files"
 msgstr "A Ficheiros"

-#: global.c:522
+#: global.c:525
 msgid "Goto"
 msgstr "Ir-A"

@@ -779,130 +779,130 @@ msgstr "Marca Posta"
 msgid "Mark UNset"
 msgstr "Marca Quitada"

-#: nano.c:1105
+#: nano.c:1106
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "chamouse a check_wrap con inptr->data=\"%s\"\n"

-#: nano.c:1157
+#: nano.c:1158
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data agora = \"%s\"\n"

-#: nano.c:1209
+#: nano.c:1210
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Despois, data = \"%s\"\n"

-#: nano.c:1310
+#: nano.c:1311
 msgid "Edit a replacement"
 msgstr "Editar unha substitución"

-#: nano.c:1548
+#: nano.c:1549
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Non se puido crear un ficheiro temporal: %s"

-#: nano.c:1554
+#: nano.c:1555
 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:1566
+#: nano.c:1567
 msgid "Finished checking spelling"
 msgstr "Rematou a corrección ortográfica"

-#: nano.c:1568
+#: nano.c:1569
 msgid "Spell checking failed"
 msgstr "Fallou a corrección ortográfica"

-#: nano.c:1597
+#: nano.c:1598
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "¿Grava-lo buffer modificado (SE RESPOSTA \"Non\" HANSE PERDE-LOS CAMBIOS)? "

-#: nano.c:1733
+#: nano.c:1734
 msgid "Received SIGHUP"
 msgstr "Recibiuse SIGHUP"

-#: nano.c:1797
+#: nano.c:1798
 msgid "Cannot resize top win"
 msgstr "Non se pode cambia-lo tamaño da fiestra superior"

-#: nano.c:1799
+#: nano.c:1800
 msgid "Cannot move top win"
 msgstr "Non se pode move-la fiestra superior"

-#: nano.c:1801
+#: nano.c:1802
 msgid "Cannot resize edit win"
 msgstr "Non se pode cambia-lo tamaño da fiestra de edición"

-#: nano.c:1803
+#: nano.c:1804
 msgid "Cannot move edit win"
 msgstr "Non se pode move-la fiestra de edición"

-#: nano.c:1805
+#: nano.c:1806
 msgid "Cannot resize bottom win"
 msgstr "Non se pode cambia-lo tamaño da fiestra inferior"

-#: nano.c:1807
+#: nano.c:1808
 msgid "Cannot move bottom win"
 msgstr "Non se pode move-la fiestra inferior"

-#: nano.c:2132
+#: nano.c:2133
 msgid "Can now UnJustify!"
 msgstr "¡Agora pode Des-Xustificar!"

-#: nano.c:2248
+#: nano.c:2249
 #, c-format
 msgid "%s enable/disable"
 msgstr "Activar/desactivar %s"

-#: nano.c:2267
+#: nano.c:2268
 msgid "enabled"
 msgstr "activado"

-#: nano.c:2268
+#: nano.c:2269
 msgid "disabled"
 msgstr "desactivado"

-#: nano.c:2321
+#: nano.c:2322
 msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 msgstr "Detectouse un fallo en BloqNum. BloqNum ha estar activado sempre."

-#: nano.c:2576
+#: nano.c:2577
 msgid "Main: set up windows\n"
 msgstr "Main: configura-las fiestras\n"

-#: nano.c:2587
+#: nano.c:2588
 msgid "Main: bottom win\n"
 msgstr "Main: fiestra inferior\n"

-#: nano.c:2593
+#: nano.c:2594
 msgid "Main: open file\n"
 msgstr "Main: abrir ficheiro\n"

-#: nano.c:2651
+#: nano.c:2652
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "¡Recibiuse Alt-O-%c! (%d)\n"

-#: nano.c:2678
+#: nano.c:2679
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "¡Recibiuse Alt-[-1-%c! (%d)\n"

-#: nano.c:2716
+#: nano.c:2717
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "¡Recibiuse Alt-[-2-%c! (%d)\n"

-#: nano.c:2770
+#: nano.c:2771
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "¡Recibiuse Alt-[-%c! (%d)\n"

-#: nano.c:2805
+#: nano.c:2806
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "¡Recibiuse Alt-%c! (%d)\n"
@@ -956,92 +956,92 @@ msgstr ""
 msgid "Unable to open ~/.nanorc file, %s"
 msgstr ""

-#: search.c:126
+#: search.c:129
 #, fuzzy
 msgid "Case Sensitive "
 msgstr "Maiú./Min."

-#: search.c:127
+#: search.c:130
 msgid "Regexp "
 msgstr ""

-#: search.c:128
+#: search.c:131
 #, fuzzy
 msgid "Search"
 msgstr "Busca%s%s"

-#: search.c:129
+#: search.c:132
 msgid " Backwards"
 msgstr ""

-#: search.c:130
+#: search.c:133
 msgid " (to replace)"
 msgstr " (para substituír)"

-#: search.c:135 search.c:399
+#: search.c:138 search.c:404
 msgid "Search Cancelled"
 msgstr "Busca Cancelada"

-#: search.c:216
+#: search.c:221
 #, c-format
 msgid "\"%s...\" not found"
 msgstr "Non se atopou \"%s...\""

-#: search.c:265 search.c:321
+#: search.c:270 search.c:326
 msgid "Search Wrapped"
 msgstr "Buscando dende o Principio"

-#: search.c:421
+#: search.c:426
 #, c-format
 msgid "Replaced %d occurrences"
 msgstr "Fixéronse %d substitucións"

-#: search.c:423
+#: search.c:428
 msgid "Replaced 1 occurrence"
 msgstr "Fíxose 1 substitución"

-#: search.c:561 search.c:671 search.c:687
+#: search.c:566 search.c:676 search.c:692
 msgid "Replace Cancelled"
 msgstr "Substitución Cancelada"

-#: search.c:611
+#: search.c:616
 msgid "Replace this instance?"
 msgstr "¿Substituír?"

-#: search.c:623
+#: search.c:628
 msgid "Replace failed: unknown subexpression!"
 msgstr "Fallou a substitución: subexpresión descoñecida"

-#: search.c:712
+#: search.c:717
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Substituír por [%s]"

-#: search.c:716 search.c:720
+#: search.c:721 search.c:725
 msgid "Replace with"
 msgstr "Substituír por"

-#: search.c:754
+#: search.c:759
 msgid "Enter line number"
 msgstr "Introduza o número de liña"

-#: search.c:756
+#: search.c:761
 msgid "Aborted"
 msgstr "Abortado"

-#: search.c:765
+#: search.c:770
 msgid "Come on, be reasonable"
 msgstr "Vamos, sexa razonable"

-#: utils.c:146
+#: utils.c:159
 msgid "nano: malloc: out of memory!"
 msgstr ""

-#: utils.c:160
+#: utils.c:173
 msgid "nano: calloc: out of memory!"
 msgstr ""

-#: utils.c:170
+#: utils.c:183
 msgid "nano: realloc: out of memory!"
 msgstr ""

--- 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-07-14 18:56-0400\n"
+"POT-Creation-Date: 2001-07-28 19:55-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"
@@ -23,133 +23,133 @@ msgstr "add_to_cutbuffer az inptr->data-val lett megh
 msgid "Blew away cutbuffer =)\n"
 msgstr "a cutbuffert elfújta a szél =)\n"

-#: files.c:134
+#: files.c:145
 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:196 files.c:214
+#: files.c:207 files.c:225
 #, c-format
 msgid "Read %d lines"
 msgstr "%d sort beolvastam"

-#: files.c:232 search.c:210
+#: files.c:243 search.c:215
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" nem található"

 #. We have a new file
-#: files.c:236
+#: files.c:247
 msgid "New File"
 msgstr "Új fájl"

-#: files.c:249
+#: files.c:260
 #, 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:252
+#: files.c:263
 #, c-format
 msgid "File \"%s\" is a device file"
 msgstr "A fájl \"%s\" egy eszközfájl"

-#: files.c:259
+#: files.c:270
 msgid "Reading File"
 msgstr "Fájl beolvasása"

-#: files.c:279
+#: files.c:290
 msgid "File to insert [from ./] "
 msgstr "Fájl beszúrása [a ./-ból] "

-#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705
-#: files.c:716 files.c:1102
+#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716
+#: files.c:727 files.c:1113
 #, c-format
 msgid "filename is %s"
 msgstr "a fájl neve %s"

-#: files.c:368 files.c:872 files.c:1187 nano.c:1629
+#: files.c:379 files.c:883 files.c:1198 nano.c:1630
 msgid "Cancelled"
 msgstr "Megszakítva"

-#: files.c:642 files.c:697
+#: files.c:653 files.c:708
 msgid "No more open files"
 msgstr ""

-#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974
+#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Nem tudom a fájlt írásra megnyitni: %s"

-#: files.c:955
+#: files.c:966
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Írtam >%s\n"

-#: files.c:983
+#: files.c:994
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Nem tudom lezárni %s: %s."

 #. Try a rename??
-#: files.c:1006 files.c:1015 files.c:1020
+#: files.c:1017 files.c:1026 files.c:1031
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Nem tudom %s-t megnyitni írásra: %s"

-#: files.c:1027
+#: files.c:1038
 #, 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:1034
+#: files.c:1045
 #, c-format
 msgid "Wrote %d lines"
 msgstr "%d sort elmentettem"

-#: files.c:1074
+#: files.c:1085
 #, c-format
 msgid "%s Selection to File"
 msgstr ""

-#: files.c:1074 files.c:1078 global.c:496
+#: files.c:1085 files.c:1089 global.c:499
 #, fuzzy
 msgid "Append"
 msgstr "Felfüggesztett"

-#: files.c:1074 files.c:1078
+#: files.c:1085 files.c:1089
 #, fuzzy
 msgid "Write"
 msgstr "Mentés"

-#: files.c:1078
+#: files.c:1089
 #, fuzzy, c-format
 msgid "File Name to %s"
 msgstr "Mentés mint"

-#: files.c:1116
+#: files.c:1127
 msgid "File exists, OVERWRITE ?"
 msgstr "A fájl már létezik, felülírjam?"

-#: files.c:1598
+#: files.c:1609
 msgid "(more)"
 msgstr "(tovább)"

-#: files.c:1911
+#: files.c:1922
 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:1921 files.c:1969
+#: files.c:1932 files.c:1980
 #, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "Nem tudom megnyitni \"%s\": %s"

-#: files.c:1949 global.c:277
+#: files.c:1960 global.c:275
 #, fuzzy
 msgid "Goto Directory"
 msgstr "Ugrás"

-#: files.c:1954
+#: files.c:1965
 #, fuzzy
 msgid "Goto Cancelled"
 msgstr "Megszakítva"
@@ -211,300 +211,300 @@ msgstr ""
 msgid "Open next loaded file"
 msgstr ""

-#: global.c:238
+#: global.c:236
 msgid "Invoke the help menu"
 msgstr "A súgó meghívása"

-#: global.c:239
+#: global.c:237
 msgid "Write the current file to disk"
 msgstr "Az aktuális fájl lemezre mentése"

-#: global.c:242
+#: global.c:240
 msgid "Close currently loaded file/Exit from nano"
 msgstr ""

-#: global.c:244
+#: global.c:242
 msgid "Exit from nano"
 msgstr "Kilépés a nanoból"

-#: global.c:247
+#: global.c:245
 msgid "Goto a specific line number"
 msgstr "Ugrás a megadott számú sorra"

-#: global.c:248
+#: global.c:246
 msgid "Justify the current paragraph"
 msgstr "Az adott bekezdés sorkizárt legyen"

-#: global.c:249
+#: global.c:247
 msgid "Unjustify after a justify"
 msgstr "A sorkizártság megszüntetése"

-#: global.c:250
+#: global.c:248
 msgid "Replace text within the editor"
 msgstr "Szöveg kicserélése"

-#: global.c:251
+#: global.c:249
 msgid "Insert another file into the current one"
 msgstr "Egy másik fájl beszúrása"

-#: global.c:252
+#: global.c:250
 msgid "Search for text within the editor"
 msgstr "Szöveg keresése"

-#: global.c:253
+#: global.c:251
 msgid "Move to the previous screen"
 msgstr "Ugrás az elõzõ oldalra"

-#: global.c:254
+#: global.c:252
 msgid "Move to the next screen"
 msgstr "Ugrás a következõ oldalra"

-#: global.c:255
+#: global.c:253
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Az aktuális sor kivágása a cutbufferbe"

-#: global.c:256
+#: global.c:254
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "A cutbufferben lévõ sor beillesztése az aktuális sorba"

-#: global.c:257
+#: global.c:255
 msgid "Show the position of the cursor"
 msgstr "A kurzor helyének mutatása"

-#: global.c:258
+#: global.c:256
 msgid "Invoke the spell checker (if available)"
 msgstr "A helyesírás-ellenõrzõ indítása (ha elérhetõ)"

-#: global.c:259
+#: global.c:257
 msgid "Move up one line"
 msgstr "Ugrás az elõzõ sorra"

-#: global.c:260
+#: global.c:258
 msgid "Move down one line"
 msgstr "Ugrás a következõ sorra"

-#: global.c:261
+#: global.c:259
 msgid "Move forward one character"
 msgstr "Ugrás a következõ karakterre"

-#: global.c:262
+#: global.c:260
 msgid "Move back one character"
 msgstr "Ugrás az elõzõ karakterre"

-#: global.c:263
+#: global.c:261
 msgid "Move to the beginning of the current line"
 msgstr "Ugrás a sor elejére"

-#: global.c:264
+#: global.c:262
 msgid "Move to the end of the current line"
 msgstr "Ugrás a sor végére"

-#: global.c:265
+#: global.c:263
 msgid "Go to the first line of the file"
 msgstr "Ugrás az elsõ sorra"

-#: global.c:266
+#: global.c:264
 msgid "Go to the last line of the file"
 msgstr "Ugrás a legutolsó sorra"

-#: global.c:267
+#: global.c:265
 msgid "Refresh (redraw) the current screen"
 msgstr "A képernyõ frissítése"

-#: global.c:268
+#: global.c:266
 msgid "Mark text at the current cursor location"
 msgstr "A szöveg megjelölése az aktuális kurzorpozícióban"

-#: global.c:269
+#: global.c:267
 msgid "Delete the character under the cursor"
 msgstr "A kurzor helyén lévõ karakter törlése"

-#: global.c:271
+#: global.c:269
 msgid "Delete the character to the left of the cursor"
 msgstr "A kurzor elõtt álló karakter törlése"

-#: global.c:272
+#: global.c:270
 msgid "Insert a tab character"
 msgstr "Tabulátor karakter beszúrása"

-#: global.c:273
+#: global.c:271
 msgid "Insert a carriage return at the cursor position"
 msgstr "\"Kocsivissza\" karakter beillesztése a kurzor helyére"

-#: global.c:275
+#: global.c:273
 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:276
+#: global.c:274
 msgid "Go to file browser"
 msgstr "Tallózás"

-#: global.c:278
+#: global.c:276
 msgid "Cancel the current function"
 msgstr "Az aktuális mûvelet megszakítása"

-#: global.c:279
+#: global.c:277
 #, fuzzy
 msgid "Append to the current file"
 msgstr "Ugrás a sor végére"

-#: global.c:280
+#: global.c:278
 #, fuzzy
 msgid "Search Backwards"
 msgstr "Keresés megszakítva"

-#: global.c:281
+#: global.c:279
 #, fuzzy
 msgid "Use Regular Expressions"
 msgstr "Reguláris kifejezések"

-#: global.c:284
+#: global.c:282
 msgid "Get Help"
 msgstr "Súgó"

-#: global.c:289
+#: global.c:287
 msgid "Close"
 msgstr ""

-#: global.c:293 global.c:487 global.c:525
+#: global.c:291 global.c:490 global.c:528
 msgid "Exit"
 msgstr "Kilépés"

-#: global.c:296
+#: global.c:294
 msgid "WriteOut"
 msgstr "Mentés"

-#: global.c:301 global.c:390
+#: global.c:299 global.c:388
 msgid "Justify"
 msgstr "Sorkizár"

-#: global.c:305 global.c:311
+#: global.c:303 global.c:309
 msgid "Read File"
 msgstr "FájlBeolv"

-#: global.c:315 global.c:386 global.c:410
+#: global.c:313 global.c:384 global.c:408
 msgid "Replace"
 msgstr "Csere"

-#: global.c:319
+#: global.c:317
 msgid "Where Is"
 msgstr "Keresés"

-#: global.c:323 global.c:479 global.c:514
+#: global.c:321 global.c:482 global.c:517
 msgid "Prev Page"
 msgstr "ElõzõOldal"

-#: global.c:327 global.c:483 global.c:518
+#: global.c:325 global.c:486 global.c:521
 msgid "Next Page"
 msgstr "Következõ"

-#: global.c:331
+#: global.c:329
 msgid "Cut Text"
 msgstr "Kivágás"

-#: global.c:335
+#: global.c:333
 msgid "UnJustify"
 msgstr "NSorkizár"

-#: global.c:338
+#: global.c:336
 msgid "UnCut Txt"
 msgstr "Beilleszt"

-#: global.c:342
+#: global.c:340
 msgid "Cur Pos"
 msgstr "Pozíció"

-#: global.c:346
+#: global.c:344
 msgid "To Spell"
 msgstr "Helyes-e?"

-#: global.c:350
+#: global.c:348
 msgid "Up"
 msgstr "Fel"

-#: global.c:353
+#: global.c:351
 msgid "Down"
 msgstr "Le"

-#: global.c:356
+#: global.c:354
 msgid "Forward"
 msgstr "Elõre"

-#: global.c:359
+#: global.c:357
 msgid "Back"
 msgstr "Vissza"

-#: global.c:362
+#: global.c:360
 msgid "Home"
 msgstr "Eleje"

-#: global.c:365
+#: global.c:363
 msgid "End"
 msgstr "Vége"

-#: global.c:368
+#: global.c:366
 msgid "Refresh"
 msgstr "Frissít"

-#: global.c:371
+#: global.c:369
 msgid "Mark Text"
 msgstr "Megjelöl"

-#: global.c:374
+#: global.c:372
 msgid "Delete"
 msgstr "Töröl"

-#: global.c:378
+#: global.c:376
 msgid "Backspace"
 msgstr "Visszalép"

-#: global.c:382
+#: global.c:380
 msgid "Tab"
 msgstr "Tabulátor"

-#: global.c:394
+#: global.c:392
 msgid "Enter"
 msgstr "Enter"

-#: global.c:398 global.c:414 global.c:441
+#: global.c:396 global.c:412 global.c:442
 msgid "Goto Line"
 msgstr "Ugrás"

-#: global.c:404 global.c:431 global.c:459 global.c:469
+#: global.c:402 global.c:432 global.c:462 global.c:472
 msgid "First Line"
 msgstr "Elsõ sor"

-#: global.c:407 global.c:434 global.c:462 global.c:472
+#: global.c:405 global.c:435 global.c:465 global.c:475
 msgid "Last Line"
 msgstr "Utolsó sor"

-#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499
-#: global.c:507 global.c:510 global.c:528 winio.c:1239
-msgid "Cancel"
-msgstr "Mégsem"
-
-#: global.c:420 global.c:447
+#: global.c:416 global.c:446
 msgid "Case Sens"
 msgstr "kis/Nagy"

-#: global.c:423 global.c:450
+#: global.c:419 global.c:449
 #, fuzzy
 msgid "Backward"
 msgstr "Vissza"

-#: global.c:427 global.c:454
+#: global.c:424 global.c:454
 msgid "Regexp"
 msgstr ""

-#: global.c:437
+#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502
+#: global.c:510 global.c:513 global.c:531 winio.c:1239
+msgid "Cancel"
+msgstr "Mégsem"
+
+#: global.c:438
 msgid "No Replace"
 msgstr "Nem cserél"

-#: global.c:492 global.c:503
+#: global.c:495 global.c:506
 msgid "To Files"
 msgstr "Tallózás"

-#: global.c:522
+#: global.c:525
 #, fuzzy
 msgid "Goto"
 msgstr "Ugrás"
@@ -786,132 +786,132 @@ msgstr "Megjel
 msgid "Mark UNset"
 msgstr "Megjelölés vége"

-#: nano.c:1105
+#: nano.c:1106
 #, 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:1157
+#: nano.c:1158
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data most = \"%s\"\n"

-#: nano.c:1209
+#: nano.c:1210
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Ezután az adat ez lett = \"%s\"\n"

-#: nano.c:1310
+#: nano.c:1311
 msgid "Edit a replacement"
 msgstr "A helyettesítõ érték módosítása"

-#: nano.c:1548
+#: nano.c:1549
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Az ideiglenes fájlt nem tudtam létrehozni: %s"

-#: nano.c:1554
+#: nano.c:1555
 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:1566
+#: nano.c:1567
 msgid "Finished checking spelling"
 msgstr "A helyesírás-ellenõrzés befejezése"

-#: nano.c:1568
+#: nano.c:1569
 msgid "Spell checking failed"
 msgstr "Helyesírás-ellenõrzés nem sikerült"

-#: nano.c:1597
+#: nano.c:1598
 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:1733
+#: nano.c:1734
 msgid "Received SIGHUP"
 msgstr "Kaptam egy SIGHUPot"

-#: nano.c:1797
+#: nano.c:1798
 msgid "Cannot resize top win"
 msgstr "A felsõ ablakot nem tudom átméretezni"

-#: nano.c:1799
+#: nano.c:1800
 msgid "Cannot move top win"
 msgstr "A felsõ ablakot nem tudom mozgatni"

-#: nano.c:1801
+#: nano.c:1802
 msgid "Cannot resize edit win"
 msgstr "A szerkesztõ ablakot nem tudom átméretezni"

-#: nano.c:1803
+#: nano.c:1804
 msgid "Cannot move edit win"
 msgstr "A szerkesztõ ablakot nem tudom mozgatni"

-#: nano.c:1805
+#: nano.c:1806
 msgid "Cannot resize bottom win"
 msgstr "Az alsó ablakot nem tudom átméretezni"

-#: nano.c:1807
+#: nano.c:1808
 msgid "Cannot move bottom win"
 msgstr "Az alsó ablakot nem tudom mozgatni"

-#: nano.c:2132
+#: nano.c:2133
 msgid "Can now UnJustify!"
 msgstr "A sorokat most már tudom nem sorkizárttá tenni"

-#: nano.c:2248
+#: nano.c:2249
 #, c-format
 msgid "%s enable/disable"
 msgstr "%s engedélyezés/kikapcsolás"

-#: nano.c:2267
+#: nano.c:2268
 msgid "enabled"
 msgstr "engedélyezve"

-#: nano.c:2268
+#: nano.c:2269
 msgid "disabled"
 msgstr "kikapcsolva"

-#: nano.c:2321
+#: nano.c:2322
 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:2576
+#: nano.c:2577
 msgid "Main: set up windows\n"
 msgstr "Fõprogram: az ablakok beállítása\n"

-#: nano.c:2587
+#: nano.c:2588
 msgid "Main: bottom win\n"
 msgstr "Fõprogram: alsó ablak\n"

-#: nano.c:2593
+#: nano.c:2594
 msgid "Main: open file\n"
 msgstr "Fõprogram: fájl megnyitása\n"

-#: nano.c:2651
+#: nano.c:2652
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "Az Alt-O-%c billentyûket lenyomtad! (%d)\n"

-#: nano.c:2678
+#: nano.c:2679
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "Az Alt-[-1-%c billentyûket lenyomtad! (%d)\n"

-#: nano.c:2716
+#: nano.c:2717
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "Az Alt-[-2-%c billentyûket lenyomtad! (%d)\n"

-#: nano.c:2770
+#: nano.c:2771
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Az Alt-[-%c billentyûket lenyomtad! (%d)\n"

-#: nano.c:2805
+#: nano.c:2806
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Az Alt-%c billentyûket lenyomtad! (%d)\n"
@@ -965,93 +965,93 @@ msgstr ""
 msgid "Unable to open ~/.nanorc file, %s"
 msgstr ""

-#: search.c:126
+#: search.c:129
 #, fuzzy
 msgid "Case Sensitive "
 msgstr "kis/Nagy"

-#: search.c:127
+#: search.c:130
 msgid "Regexp "
 msgstr ""

-#: search.c:128
+#: search.c:131
 #, fuzzy
 msgid "Search"
 msgstr "Keresés%s%s"

-#: search.c:129
+#: search.c:132
 msgid " Backwards"
 msgstr ""

-#: search.c:130
+#: search.c:133
 msgid " (to replace)"
 msgstr " (cserére)"

-#: search.c:135 search.c:399
+#: search.c:138 search.c:404
 msgid "Search Cancelled"
 msgstr "Keresés megszakítva"

-#: search.c:216
+#: search.c:221
 #, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s...\" nem található"

-#: search.c:265 search.c:321
+#: search.c:270 search.c:326
 msgid "Search Wrapped"
 msgstr ""

-#: search.c:421
+#: search.c:426
 #, fuzzy, c-format
 msgid "Replaced %d occurrences"
 msgstr "%d alkalommal fordult elõ, kicseréltem azokat"

-#: search.c:423
+#: search.c:428
 #, fuzzy
 msgid "Replaced 1 occurrence"
 msgstr "Egyszer fordult elõ, kicseréltem"

-#: search.c:561 search.c:671 search.c:687
+#: search.c:566 search.c:676 search.c:692
 msgid "Replace Cancelled"
 msgstr "A csere megszakítva"

-#: search.c:611
+#: search.c:616
 msgid "Replace this instance?"
 msgstr ""

-#: search.c:623
+#: search.c:628
 msgid "Replace failed: unknown subexpression!"
 msgstr "Hiba a cserénél: ismeretlen alkifejezés!"

-#: search.c:712
+#: search.c:717
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Cserélés erre [%s]"

-#: search.c:716 search.c:720
+#: search.c:721 search.c:725
 msgid "Replace with"
 msgstr "Erre lesz cserélve"

-#: search.c:754
+#: search.c:759
 msgid "Enter line number"
 msgstr "Kérem a sor számát"

-#: search.c:756
+#: search.c:761
 msgid "Aborted"
 msgstr "Megszakítva"

-#: search.c:765
+#: search.c:770
 msgid "Come on, be reasonable"
 msgstr "Gyerünk, adj meg egy hihetõbb értéket :-)"

-#: utils.c:146
+#: utils.c:159
 msgid "nano: malloc: out of memory!"
 msgstr ""

-#: utils.c:160
+#: utils.c:173
 msgid "nano: calloc: out of memory!"
 msgstr ""

-#: utils.c:170
+#: utils.c:183
 msgid "nano: realloc: out of memory!"
 msgstr ""

--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.0.2\n"
-"POT-Creation-Date: 2001-07-14 18:56-0400\n"
+"POT-Creation-Date: 2001-07-28 19:55-0400\n"
 "PO-Revision-Date: 2001-06-22 14:38GMT+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -23,133 +23,133 @@ msgstr "add_to_cutbuffer dipanggil dgn inptr->data = %s\n"
 msgid "Blew away cutbuffer =)\n"
 msgstr "Hapus cutbuffer =)\n"

-#: files.c:134
+#: files.c:145
 msgid "read_line: not on first line and prev is NULL"
 msgstr "read_line: tidak di baris pertama dan sebelumnya adalah NULL"

-#: files.c:196 files.c:214
+#: files.c:207 files.c:225
 #, c-format
 msgid "Read %d lines"
 msgstr "Membaca %d baris"

-#: files.c:232 search.c:210
+#: files.c:243 search.c:215
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" tidak ditemukan"

 #. We have a new file
-#: files.c:236
+#: files.c:247
 msgid "New File"
 msgstr "File Baru"

-#: files.c:249
+#: files.c:260
 #, 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:252
+#: files.c:263
 #, c-format
 msgid "File \"%s\" is a device file"
 msgstr "File \"%s\" adalah sebuah file device"

-#: files.c:259
+#: files.c:270
 msgid "Reading File"
 msgstr "Membaca File"

-#: files.c:279
+#: files.c:290
 msgid "File to insert [from ./] "
 msgstr "File untuk disisipkan [dari ./] "

-#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705
-#: files.c:716 files.c:1102
+#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716
+#: files.c:727 files.c:1113
 #, c-format
 msgid "filename is %s"
 msgstr "Namafile adalah %s"

-#: files.c:368 files.c:872 files.c:1187 nano.c:1629
+#: files.c:379 files.c:883 files.c:1198 nano.c:1630
 msgid "Cancelled"
 msgstr "Dibatalkan"

-#: files.c:642 files.c:697
+#: files.c:653 files.c:708
 msgid "No more open files"
 msgstr ""

-#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974
+#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Tidak dapat membuka file untuk menulis: %s"

-#: files.c:955
+#: files.c:966
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Tulis >%s\n"

-#: files.c:983
+#: files.c:994
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Tidak dapat menutup %s: %s"

 #. Try a rename??
-#: files.c:1006 files.c:1015 files.c:1020
+#: files.c:1017 files.c:1026 files.c:1031
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Tidak dapat membuka %s untuk menulis: %s"

-#: files.c:1027
+#: files.c:1038
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Tidak dapat menset permisi %o pada %s: %s"

-#: files.c:1034
+#: files.c:1045
 #, c-format
 msgid "Wrote %d lines"
 msgstr "Menulis %d baris"

-#: files.c:1074
+#: files.c:1085
 #, c-format
 msgid "%s Selection to File"
 msgstr ""

-#: files.c:1074 files.c:1078 global.c:496
+#: files.c:1085 files.c:1089 global.c:499
 #, fuzzy
 msgid "Append"
 msgstr "Tunda"

-#: files.c:1074 files.c:1078
+#: files.c:1085 files.c:1089
 #, fuzzy
 msgid "Write"
 msgstr "Tulis"

-#: files.c:1078
+#: files.c:1089
 #, fuzzy, c-format
 msgid "File Name to %s"
 msgstr "Nama file untuk ditulis"

-#: files.c:1116
+#: files.c:1127
 msgid "File exists, OVERWRITE ?"
 msgstr "File ada, DITIMPA ?"

-#: files.c:1598
+#: files.c:1609
 msgid "(more)"
 msgstr "(lagi)"

-#: files.c:1911
+#: files.c:1922
 msgid "Can't move up a directory"
 msgstr "Tidak dapat memindahkan direktori"

 #. We can't open this dir for some reason.  Complain
-#: files.c:1921 files.c:1969
+#: files.c:1932 files.c:1980
 #, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "Tidak dapat membuka \"%s\": %s"

-#: files.c:1949 global.c:277
+#: files.c:1960 global.c:275
 #, fuzzy
 msgid "Goto Directory"
 msgstr "Ke baris"

-#: files.c:1954
+#: files.c:1965
 #, fuzzy
 msgid "Goto Cancelled"
 msgstr "Dibatalkan"
@@ -211,300 +211,300 @@ msgstr ""
 msgid "Open next loaded file"
 msgstr ""

-#: global.c:238
+#: global.c:236
 msgid "Invoke the help menu"
 msgstr "Panggil menu bantuan"

-#: global.c:239
+#: global.c:237
 msgid "Write the current file to disk"
 msgstr "Tulis file sekarang ke disk"

-#: global.c:242
+#: global.c:240
 msgid "Close currently loaded file/Exit from nano"
 msgstr ""

-#: global.c:244
+#: global.c:242
 msgid "Exit from nano"
 msgstr "Keluar dari nano"

-#: global.c:247
+#: global.c:245
 msgid "Goto a specific line number"
 msgstr "Ke nomor baris tertentu"

-#: global.c:248
+#: global.c:246
 msgid "Justify the current paragraph"
 msgstr "Justifikasi paragraf saat ini"

-#: global.c:249
+#: global.c:247
 msgid "Unjustify after a justify"
 msgstr "Unjustifikasi setelah justifikasi"

-#: global.c:250
+#: global.c:248
 msgid "Replace text within the editor"
 msgstr "Ganti teks dalam editor"

-#: global.c:251
+#: global.c:249
 msgid "Insert another file into the current one"
 msgstr "Sertakan file lain ke file saat ini"

-#: global.c:252
+#: global.c:250
 msgid "Search for text within the editor"
 msgstr "Cari teks dalam editor"

-#: global.c:253
+#: global.c:251
 msgid "Move to the previous screen"
 msgstr "Pindah ke layar sebelumnya"

-#: global.c:254
+#: global.c:252
 msgid "Move to the next screen"
 msgstr "Pindah ke layar berikutnya"

-#: global.c:255
+#: global.c:253
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Hapus baris saat ini dan taruh dalam cutbuffer"

-#: global.c:256
+#: global.c:254
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Kembalikan dari cutbuffer ke baris saat ini"

-#: global.c:257
+#: global.c:255
 msgid "Show the position of the cursor"
 msgstr "Tampilkan posisi kursor"

-#: global.c:258
+#: global.c:256
 msgid "Invoke the spell checker (if available)"
 msgstr "Panggil spell checker (jika ada)"

-#: global.c:259
+#: global.c:257
 msgid "Move up one line"
 msgstr "Naik satu baris"

-#: global.c:260
+#: global.c:258
 msgid "Move down one line"
 msgstr "Turun satu baris"

-#: global.c:261
+#: global.c:259
 msgid "Move forward one character"
 msgstr "Pindah satu karakter ke depan"

-#: global.c:262
+#: global.c:260
 msgid "Move back one character"
 msgstr "Pindah satu karakter ke belakang"

-#: global.c:263
+#: global.c:261
 msgid "Move to the beginning of the current line"
 msgstr "Pindah ke awal baris ini"

-#: global.c:264
+#: global.c:262
 msgid "Move to the end of the current line"
 msgstr "Pindah ke akhir baris ini"

-#: global.c:265
+#: global.c:263
 msgid "Go to the first line of the file"
 msgstr "Ke baris terawal file"

-#: global.c:266
+#: global.c:264
 msgid "Go to the last line of the file"
 msgstr "Ke baris terakhir file"

-#: global.c:267
+#: global.c:265
 msgid "Refresh (redraw) the current screen"
 msgstr "Refresh layar saat ini"

-#: global.c:268
+#: global.c:266
 msgid "Mark text at the current cursor location"
 msgstr "Tandai teks pada lokasi kursor saat ini"

-#: global.c:269
+#: global.c:267
 msgid "Delete the character under the cursor"
 msgstr "Hapus karakter pada kursor"

-#: global.c:271
+#: global.c:269
 msgid "Delete the character to the left of the cursor"
 msgstr "Hapus satu karakter di kiri kursor"

-#: global.c:272
+#: global.c:270
 msgid "Insert a tab character"
 msgstr "Masukkan karakter tab"

-#: global.c:273
+#: global.c:271
 msgid "Insert a carriage return at the cursor position"
 msgstr "Sertakan carriage return di posisi kursor"

-#: global.c:275
+#: global.c:273
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Jadikan pencarian/penggantian saat ini case (in)sensitive"

-#: global.c:276
+#: global.c:274
 msgid "Go to file browser"
 msgstr "Ke browser file"

-#: global.c:278
+#: global.c:276
 msgid "Cancel the current function"
 msgstr "Batalkan fungsi ini"

-#: global.c:279
+#: global.c:277
 #, fuzzy
 msgid "Append to the current file"
 msgstr "Pindah ke akhir baris ini"

-#: global.c:280
+#: global.c:278
 #, fuzzy
 msgid "Search Backwards"
 msgstr "Pencarian dibatalkan"

-#: global.c:281
+#: global.c:279
 #, fuzzy
 msgid "Use Regular Expressions"
 msgstr "Regular expressions"

-#: global.c:284
+#: global.c:282
 msgid "Get Help"
 msgstr "Bantuan"

-#: global.c:289
+#: global.c:287
 msgid "Close"
 msgstr ""

-#: global.c:293 global.c:487 global.c:525
+#: global.c:291 global.c:490 global.c:528
 msgid "Exit"
 msgstr "Keluar"

-#: global.c:296
+#: global.c:294
 msgid "WriteOut"
 msgstr "Tulis"

-#: global.c:301 global.c:390
+#: global.c:299 global.c:388
 msgid "Justify"
 msgstr "Justifikasi"

-#: global.c:305 global.c:311
+#: global.c:303 global.c:309
 msgid "Read File"
 msgstr "Baca File"

-#: global.c:315 global.c:386 global.c:410
+#: global.c:313 global.c:384 global.c:408
 msgid "Replace"
 msgstr "Ganti"

-#: global.c:319
+#: global.c:317
 msgid "Where Is"
 msgstr "Di mana"

-#: global.c:323 global.c:479 global.c:514
+#: global.c:321 global.c:482 global.c:517
 msgid "Prev Page"
 msgstr "Hlm sebelumnya"

-#: global.c:327 global.c:483 global.c:518
+#: global.c:325 global.c:486 global.c:521
 msgid "Next Page"
 msgstr "Hlm berikutnya"

-#: global.c:331
+#: global.c:329
 msgid "Cut Text"
 msgstr "Ptng Teks"

-#: global.c:335
+#: global.c:333
 msgid "UnJustify"
 msgstr "UnJustifikasi"

-#: global.c:338
+#: global.c:336
 msgid "UnCut Txt"
 msgstr "UnCut Teks"

-#: global.c:342
+#: global.c:340
 msgid "Cur Pos"
 msgstr "Pos Kursor"

-#: global.c:346
+#: global.c:344
 msgid "To Spell"
 msgstr "Mengeja"

-#: global.c:350
+#: global.c:348
 msgid "Up"
 msgstr "Naik"

-#: global.c:353
+#: global.c:351
 msgid "Down"
 msgstr "Turun"

-#: global.c:356
+#: global.c:354
 msgid "Forward"
 msgstr "Depan"

-#: global.c:359
+#: global.c:357
 msgid "Back"
 msgstr "Belakang"

-#: global.c:362
+#: global.c:360
 msgid "Home"
 msgstr "Awal"

-#: global.c:365
+#: global.c:363
 msgid "End"
 msgstr "Akhir"

-#: global.c:368
+#: global.c:366
 msgid "Refresh"
 msgstr "Refresh"

-#: global.c:371
+#: global.c:369
 msgid "Mark Text"
 msgstr "Tandai Teks"

-#: global.c:374
+#: global.c:372
 msgid "Delete"
 msgstr "Hapus"

-#: global.c:378
+#: global.c:376
 msgid "Backspace"
 msgstr "Backspace"

-#: global.c:382
+#: global.c:380
 msgid "Tab"
 msgstr "Tab"

-#: global.c:394
+#: global.c:392
 msgid "Enter"
 msgstr "Enter"

-#: global.c:398 global.c:414 global.c:441
+#: global.c:396 global.c:412 global.c:442
 msgid "Goto Line"
 msgstr "Ke baris"

-#: global.c:404 global.c:431 global.c:459 global.c:469
+#: global.c:402 global.c:432 global.c:462 global.c:472
 msgid "First Line"
 msgstr "Baris pertama"

-#: global.c:407 global.c:434 global.c:462 global.c:472
+#: global.c:405 global.c:435 global.c:465 global.c:475
 msgid "Last Line"
 msgstr "Baris terakhir"

-#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499
-#: global.c:507 global.c:510 global.c:528 winio.c:1239
-msgid "Cancel"
-msgstr "Batal"
-
-#: global.c:420 global.c:447
+#: global.c:416 global.c:446
 msgid "Case Sens"
 msgstr "Case Sens"

-#: global.c:423 global.c:450
+#: global.c:419 global.c:449
 #, fuzzy
 msgid "Backward"
 msgstr "Belakang"

-#: global.c:427 global.c:454
+#: global.c:424 global.c:454
 msgid "Regexp"
 msgstr ""

-#: global.c:437
+#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502
+#: global.c:510 global.c:513 global.c:531 winio.c:1239
+msgid "Cancel"
+msgstr "Batal"
+
+#: global.c:438
 msgid "No Replace"
 msgstr "No Replace"

-#: global.c:492 global.c:503
+#: global.c:495 global.c:506
 msgid "To Files"
 msgstr "Ke File"

-#: global.c:522
+#: global.c:525
 #, fuzzy
 msgid "Goto"
 msgstr "Ke baris"
@@ -786,130 +786,130 @@ msgstr "Set Tanda"
 msgid "Mark UNset"
 msgstr "Unset Tanda"

-#: nano.c:1105
+#: nano.c:1106
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap dipanggil dengan inptr->data=\"%s\"\n"

-#: nano.c:1157
+#: nano.c:1158
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data sekarang =\"%s\"\n"

-#: nano.c:1209
+#: nano.c:1210
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Setelah, data= \"%s\"\n"

-#: nano.c:1310
+#: nano.c:1311
 msgid "Edit a replacement"
 msgstr "Edit pengganti"

-#: nano.c:1548
+#: nano.c:1549
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Tidak dapat membuat nama file sementara: %s"

-#: nano.c:1554
+#: nano.c:1555
 msgid "Spell checking failed: unable to write temp file!"
 msgstr "Spell checking gagal: tidak dapat menulis file temp!"

-#: nano.c:1566
+#: nano.c:1567
 msgid "Finished checking spelling"
 msgstr "Selesai memeriksa ejaan"

-#: nano.c:1568
+#: nano.c:1569
 msgid "Spell checking failed"
 msgstr "Spell checking gagal"

-#: nano.c:1597
+#: nano.c:1598
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Simpan buffer termodifikasi (JAWAB \"No\" AKAN MENGHAPUS PERUBAHAN) ?"

-#: nano.c:1733
+#: nano.c:1734
 msgid "Received SIGHUP"
 msgstr "Menerima SIGHUP"

-#: nano.c:1797
+#: nano.c:1798
 msgid "Cannot resize top win"
 msgstr "Tidak dapat menganti ukuran jendela atas"

-#: nano.c:1799
+#: nano.c:1800
 msgid "Cannot move top win"
 msgstr "Tidak dapat memindahkan jendela atas"

-#: nano.c:1801
+#: nano.c:1802
 msgid "Cannot resize edit win"
 msgstr "Tidak dapat mengganti ukuran jendela edit"

-#: nano.c:1803
+#: nano.c:1804
 msgid "Cannot move edit win"
 msgstr "Tidak dapat memindah jendela edit"

-#: nano.c:1805
+#: nano.c:1806
 msgid "Cannot resize bottom win"
 msgstr "Tidak dapat mengganti ukuran jendela bawah"

-#: nano.c:1807
+#: nano.c:1808
 msgid "Cannot move bottom win"
 msgstr "Tidak dapat memindah jendela bawah"

-#: nano.c:2132
+#: nano.c:2133
 msgid "Can now UnJustify!"
 msgstr "Sekarang dapat melakukan UnJustify"

-#: nano.c:2248
+#: nano.c:2249
 #, c-format
 msgid "%s enable/disable"
 msgstr "%s enable/disable"

-#: nano.c:2267
+#: nano.c:2268
 msgid "enabled"
 msgstr "enabled"

-#: nano.c:2268
+#: nano.c:2269
 msgid "disabled"
 msgstr "disabled"

-#: nano.c:2321
+#: nano.c:2322
 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:2576
+#: nano.c:2577
 msgid "Main: set up windows\n"
 msgstr "Main: menset jendela\n"

-#: nano.c:2587
+#: nano.c:2588
 msgid "Main: bottom win\n"
 msgstr "Main: jendela bawah\n"

-#: nano.c:2593
+#: nano.c:2594
 msgid "Main: open file\n"
 msgstr "Main: membuka file\n"

-#: nano.c:2651
+#: nano.c:2652
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "Saya mendapat Alt-O-%c! (%d)\n"

-#: nano.c:2678
+#: nano.c:2679
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "Saya mendapat Alt-[-1-%c! (%d)\n"

-#: nano.c:2716
+#: nano.c:2717
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "Saya mendapat Alt-[-2-%c! (%d)\n"

-#: nano.c:2770
+#: nano.c:2771
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Saya mendapat Alt-%c! (%d)\n"

-#: nano.c:2805
+#: nano.c:2806
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Saya mendapat Alt-%c! (%d)\n"
@@ -963,92 +963,92 @@ msgstr ""
 msgid "Unable to open ~/.nanorc file, %s"
 msgstr ""

-#: search.c:126
+#: search.c:129
 #, fuzzy
 msgid "Case Sensitive "
 msgstr "Case Sens"

-#: search.c:127
+#: search.c:130
 msgid "Regexp "
 msgstr ""

-#: search.c:128
+#: search.c:131
 #, fuzzy
 msgid "Search"
 msgstr "Pencarian%s%s"

-#: search.c:129
+#: search.c:132
 msgid " Backwards"
 msgstr ""

-#: search.c:130
+#: search.c:133
 msgid " (to replace)"
 msgstr " (ganti)"

-#: search.c:135 search.c:399
+#: search.c:138 search.c:404
 msgid "Search Cancelled"
 msgstr "Pencarian dibatalkan"

-#: search.c:216
+#: search.c:221
 #, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s...\" tidak ditemukan"

-#: search.c:265 search.c:321
+#: search.c:270 search.c:326
 msgid "Search Wrapped"
 msgstr "Pancarian diulangi dari awal"

-#: search.c:421
+#: search.c:426
 #, c-format
 msgid "Replaced %d occurrences"
 msgstr "%d tempat terganti"

-#: search.c:423
+#: search.c:428
 msgid "Replaced 1 occurrence"
 msgstr "Terganti 1 tempat"

-#: search.c:561 search.c:671 search.c:687
+#: search.c:566 search.c:676 search.c:692
 msgid "Replace Cancelled"
 msgstr "Penggantian dibatalkan"

-#: search.c:611
+#: search.c:616
 msgid "Replace this instance?"
 msgstr "Ganti kata ini?"

-#: search.c:623
+#: search.c:628
 msgid "Replace failed: unknown subexpression!"
 msgstr "Replace gagal: subekspresi tidak dikenal!"

-#: search.c:712
+#: search.c:717
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Ganti dengan [%s]"

-#: search.c:716 search.c:720
+#: search.c:721 search.c:725
 msgid "Replace with"
 msgstr "Ganti dengan"

-#: search.c:754
+#: search.c:759
 msgid "Enter line number"
 msgstr "Masukkan nomor baris"

-#: search.c:756
+#: search.c:761
 msgid "Aborted"
 msgstr "Dibatalkan"

-#: search.c:765
+#: search.c:770
 msgid "Come on, be reasonable"
 msgstr "Ayo, yang masuk akal"

-#: utils.c:146
+#: utils.c:159
 msgid "nano: malloc: out of memory!"
 msgstr ""

-#: utils.c:160
+#: utils.c:173
 msgid "nano: calloc: out of memory!"
 msgstr ""

-#: utils.c:170
+#: utils.c:183
 msgid "nano: realloc: out of memory!"
 msgstr ""

--- 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-07-14 18:56-0400\n"
+"POT-Creation-Date: 2001-07-28 19:55-0400\n"
 "PO-Revision-Date: 2001-05-13 17:17GMT\n"
 "Last-Translator: Marco Colombo <magicdice@inwind.it>\n"
 "Language-Team: Italiano\n"
@@ -25,133 +25,133 @@ msgstr "add_to_cutbuffer chiamato con inptr->data = %s\n"
 msgid "Blew away cutbuffer =)\n"
 msgstr "Svuota cutbuffer =)\n"

-#: files.c:134
+#: files.c:145
 msgid "read_line: not on first line and prev is NULL"
 msgstr "read_line: non è la prima linea e la precedente è NULL"

-#: files.c:196 files.c:214
+#: files.c:207 files.c:225
 #, c-format
 msgid "Read %d lines"
 msgstr "Leggi %d linee"

-#: files.c:232 search.c:210
+#: files.c:243 search.c:215
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" non trovato"

 #. We have a new file
-#: files.c:236
+#: files.c:247
 msgid "New File"
 msgstr "Nuovo file"

-#: files.c:249
+#: files.c:260
 #, 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:252
+#: files.c:263
 #, c-format
 msgid "File \"%s\" is a device file"
 msgstr "Il file \"%s\" è un file di device"

-#: files.c:259
+#: files.c:270
 msgid "Reading File"
 msgstr "Lettura file"

-#: files.c:279
+#: files.c:290
 msgid "File to insert [from ./] "
 msgstr "File da inserire [da ./] "

-#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705
-#: files.c:716 files.c:1102
+#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716
+#: files.c:727 files.c:1113
 #, c-format
 msgid "filename is %s"
 msgstr "Il nome file è %s"

-#: files.c:368 files.c:872 files.c:1187 nano.c:1629
+#: files.c:379 files.c:883 files.c:1198 nano.c:1630
 msgid "Cancelled"
 msgstr "Annullato"

-#: files.c:642 files.c:697
+#: files.c:653 files.c:708
 msgid "No more open files"
 msgstr ""

-#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974
+#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Impossibile aprire il file in scrittura: %s"

-#: files.c:955
+#: files.c:966
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Scrivi >%s\n"

-#: files.c:983
+#: files.c:994
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Impossibile chiudere %s: %s"

 #. Try a rename??
-#: files.c:1006 files.c:1015 files.c:1020
+#: files.c:1017 files.c:1026 files.c:1031
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Impossibile aprire %s in scrittura: %s"

-#: files.c:1027
+#: files.c:1038
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Impossibile configurare i permessi di %o su %s: %s"

-#: files.c:1034
+#: files.c:1045
 #, c-format
 msgid "Wrote %d lines"
 msgstr "Scritte %d linee"

-#: files.c:1074
+#: files.c:1085
 #, c-format
 msgid "%s Selection to File"
 msgstr ""

-#: files.c:1074 files.c:1078 global.c:496
+#: files.c:1085 files.c:1089 global.c:499
 #, fuzzy
 msgid "Append"
 msgstr "Sospendi"

-#: files.c:1074 files.c:1078
+#: files.c:1085 files.c:1089
 #, fuzzy
 msgid "Write"
 msgstr "Salva"

-#: files.c:1078
+#: files.c:1089
 #, fuzzy, c-format
 msgid "File Name to %s"
 msgstr "Salva con nome"

-#: files.c:1116
+#: files.c:1127
 msgid "File exists, OVERWRITE ?"
 msgstr "File esistente, SOVRASCRIVERE?"

-#: files.c:1598
+#: files.c:1609
 msgid "(more)"
 msgstr "(ancora)"

-#: files.c:1911
+#: files.c:1922
 msgid "Can't move up a directory"
 msgstr "Non posso risalire la directory"

 #. We can't open this dir for some reason.  Complain
-#: files.c:1921 files.c:1969
+#: files.c:1932 files.c:1980
 #, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "Impossibile aprire \"%s\": %s"

-#: files.c:1949 global.c:277
+#: files.c:1960 global.c:275
 #, fuzzy
 msgid "Goto Directory"
 msgstr "Vai a..."

-#: files.c:1954
+#: files.c:1965
 #, fuzzy
 msgid "Goto Cancelled"
 msgstr "Annullato"
@@ -213,300 +213,300 @@ msgstr ""
 msgid "Open next loaded file"
 msgstr ""

-#: global.c:238
+#: global.c:236
 msgid "Invoke the help menu"
 msgstr "Invoca Aiuto"

-#: global.c:239
+#: global.c:237
 msgid "Write the current file to disk"
 msgstr "Salva il file corrente sul disco"

-#: global.c:242
+#: global.c:240
 msgid "Close currently loaded file/Exit from nano"
 msgstr ""

-#: global.c:244
+#: global.c:242
 msgid "Exit from nano"
 msgstr "Esci da nano"

-#: global.c:247
+#: global.c:245
 msgid "Goto a specific line number"
 msgstr "Vai ad un numero linea specifico"

-#: global.c:248
+#: global.c:246
 msgid "Justify the current paragraph"
 msgstr "Giustifica il paragrafo corrente"

-#: global.c:249
+#: global.c:247
 msgid "Unjustify after a justify"
 msgstr "Annulla la giustificazione"

-#: global.c:250
+#: global.c:248
 msgid "Replace text within the editor"
 msgstr "Sostituisci testo all'interno dell'editor"

-#: global.c:251
+#: global.c:249
 msgid "Insert another file into the current one"
 msgstr "Inserisci un file dentro il corrente"

-#: global.c:252
+#: global.c:250
 msgid "Search for text within the editor"
 msgstr "Cerca testo all'interno dell'editor"

-#: global.c:253
+#: global.c:251
 msgid "Move to the previous screen"
 msgstr "Vai alla pagina precedente"

-#: global.c:254
+#: global.c:252
 msgid "Move to the next screen"
 msgstr "Vai alla pagina successiva"

-#: global.c:255
+#: global.c:253
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Taglia la linea corrente e memorizzala nel cutbuffer"

-#: global.c:256
+#: global.c:254
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Incolla dal cutbuffer dentro la linea corrente"

-#: global.c:257
+#: global.c:255
 msgid "Show the position of the cursor"
 msgstr "Mostra la posizione del cursore"

-#: global.c:258
+#: global.c:256
 msgid "Invoke the spell checker (if available)"
 msgstr "Invoca il correttore ortografico (se disponibile)"

-#: global.c:259
+#: global.c:257
 msgid "Move up one line"
 msgstr "Vai alla riga superiore"

-#: global.c:260
+#: global.c:258
 msgid "Move down one line"
 msgstr "Vai alla riga inferiore"

-#: global.c:261
+#: global.c:259
 msgid "Move forward one character"
 msgstr "Avanza di un carattere"

-#: global.c:262
+#: global.c:260
 msgid "Move back one character"
 msgstr "Arretra di un carattere"

-#: global.c:263
+#: global.c:261
 msgid "Move to the beginning of the current line"
 msgstr "Vai all'inizio della linea corrente"

-#: global.c:264
+#: global.c:262
 msgid "Move to the end of the current line"
 msgstr "Vai alla fine delle linea corrente"

-#: global.c:265
+#: global.c:263
 msgid "Go to the first line of the file"
 msgstr "Vai alla prima linea del file"

-#: global.c:266
+#: global.c:264
 msgid "Go to the last line of the file"
 msgstr "Vai all'ultima linea del file"

-#: global.c:267
+#: global.c:265
 msgid "Refresh (redraw) the current screen"
 msgstr "Aggiorna la schermata corrente"

-#: global.c:268
+#: global.c:266
 msgid "Mark text at the current cursor location"
 msgstr "Marca testo nella posizione corrente del cursore"

-#: global.c:269
+#: global.c:267
 msgid "Delete the character under the cursor"
 msgstr "Elimina i caratteri sotto il cursore"

-#: global.c:271
+#: global.c:269
 msgid "Delete the character to the left of the cursor"
 msgstr "Elimina i caratteri a sinistra del cursore"

-#: global.c:272
+#: global.c:270
 msgid "Insert a tab character"
 msgstr "Inserisci una tabulazione"

-#: global.c:273
+#: global.c:271
 msgid "Insert a carriage return at the cursor position"
 msgstr "Inserisci un ritorno a capo alla posizione del cursore"

-#: global.c:275
+#: global.c:273
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Ricerca/Sostituisci con case (in)sensitive"

-#: global.c:276
+#: global.c:274
 msgid "Go to file browser"
 msgstr "Sfoglia..."

-#: global.c:278
+#: global.c:276
 msgid "Cancel the current function"
 msgstr "Annulla la funzione corrente"

-#: global.c:279
+#: global.c:277
 #, fuzzy
 msgid "Append to the current file"
 msgstr "Vai alla fine delle linea corrente"

-#: global.c:280
+#: global.c:278
 #, fuzzy
 msgid "Search Backwards"
 msgstr "Ricerca annullata"

-#: global.c:281
+#: global.c:279
 #, fuzzy
 msgid "Use Regular Expressions"
 msgstr "Espressioni regolari"

-#: global.c:284
+#: global.c:282
 msgid "Get Help"
 msgstr "Aiuto"

-#: global.c:289
+#: global.c:287
 msgid "Close"
 msgstr ""

-#: global.c:293 global.c:487 global.c:525
+#: global.c:291 global.c:490 global.c:528
 msgid "Exit"
 msgstr "Esci"

-#: global.c:296
+#: global.c:294
 msgid "WriteOut"
 msgstr "Salva"

-#: global.c:301 global.c:390
+#: global.c:299 global.c:388
 msgid "Justify"
 msgstr "Giustifica"

-#: global.c:305 global.c:311
+#: global.c:303 global.c:309
 msgid "Read File"
 msgstr "Inserisci"

-#: global.c:315 global.c:386 global.c:410
+#: global.c:313 global.c:384 global.c:408
 msgid "Replace"
 msgstr "Sostituisci"

-#: global.c:319
+#: global.c:317
 msgid "Where Is"
 msgstr "Cerca"

-#: global.c:323 global.c:479 global.c:514
+#: global.c:321 global.c:482 global.c:517
 msgid "Prev Page"
 msgstr "Pag Prec"

-#: global.c:327 global.c:483 global.c:518
+#: global.c:325 global.c:486 global.c:521
 msgid "Next Page"
 msgstr "Pag Seg"

-#: global.c:331
+#: global.c:329
 msgid "Cut Text"
 msgstr "Taglia"

-#: global.c:335
+#: global.c:333
 msgid "UnJustify"
 msgstr "Giustifica"

-#: global.c:338
+#: global.c:336
 msgid "UnCut Txt"
 msgstr "Incolla"

-#: global.c:342
+#: global.c:340
 msgid "Cur Pos"
 msgstr "Posizione"

-#: global.c:346
+#: global.c:344
 msgid "To Spell"
 msgstr "Ortografia"

-#: global.c:350
+#: global.c:348
 msgid "Up"
 msgstr "Alza"

-#: global.c:353
+#: global.c:351
 msgid "Down"
 msgstr "Abbassa"

-#: global.c:356
+#: global.c:354
 msgid "Forward"
 msgstr "Avanti"

-#: global.c:359
+#: global.c:357
 msgid "Back"
 msgstr "Indietro"

-#: global.c:362
+#: global.c:360
 msgid "Home"
 msgstr "Inizio"

-#: global.c:365
+#: global.c:363
 msgid "End"
 msgstr "Fine"

-#: global.c:368
+#: global.c:366
 msgid "Refresh"
 msgstr "Aggiorna"

-#: global.c:371
+#: global.c:369
 msgid "Mark Text"
 msgstr "Marca testo"

-#: global.c:374
+#: global.c:372
 msgid "Delete"
 msgstr "Elimina"

-#: global.c:378
+#: global.c:376
 msgid "Backspace"
 msgstr "Backspace"

-#: global.c:382
+#: global.c:380
 msgid "Tab"
 msgstr "Tab"

-#: global.c:394
+#: global.c:392
 msgid "Enter"
 msgstr "Invio"

-#: global.c:398 global.c:414 global.c:441
+#: global.c:396 global.c:412 global.c:442
 msgid "Goto Line"
 msgstr "Vai a..."

-#: global.c:404 global.c:431 global.c:459 global.c:469
+#: global.c:402 global.c:432 global.c:462 global.c:472
 msgid "First Line"
 msgstr "Prima riga"

-#: global.c:407 global.c:434 global.c:462 global.c:472
+#: global.c:405 global.c:435 global.c:465 global.c:475
 msgid "Last Line"
 msgstr "Ultima riga"

-#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499
-#: global.c:507 global.c:510 global.c:528 winio.c:1239
-msgid "Cancel"
-msgstr "Annulla"
-
-#: global.c:420 global.c:447
+#: global.c:416 global.c:446
 msgid "Case Sens"
 msgstr "Case sens"

-#: global.c:423 global.c:450
+#: global.c:419 global.c:449
 #, fuzzy
 msgid "Backward"
 msgstr "Indietro"

-#: global.c:427 global.c:454
+#: global.c:424 global.c:454
 msgid "Regexp"
 msgstr ""

-#: global.c:437
+#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502
+#: global.c:510 global.c:513 global.c:531 winio.c:1239
+msgid "Cancel"
+msgstr "Annulla"
+
+#: global.c:438
 msgid "No Replace"
 msgstr "Non sostituire"

-#: global.c:492 global.c:503
+#: global.c:495 global.c:506
 msgid "To Files"
 msgstr "Nuovo file"

-#: global.c:522
+#: global.c:525
 #, fuzzy
 msgid "Goto"
 msgstr "Vai a..."
@@ -793,133 +793,133 @@ msgstr "Imposta mark"
 msgid "Mark UNset"
 msgstr "Rimuovi mark"

-#: nano.c:1105
+#: nano.c:1106
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap chiamata con inptr->data=\"%s\"\n"

-#: nano.c:1157
+#: nano.c:1158
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data ora = \"%s\"\n"

-#: nano.c:1209
+#: nano.c:1210
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Dopo, data = \"%s\"\n"

-#: nano.c:1310
+#: nano.c:1311
 msgid "Edit a replacement"
 msgstr "Modifica sostituzione"

-#: nano.c:1548
+#: nano.c:1549
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Impossibile creare un nome file temporaneo: %s"

-#: nano.c:1554
+#: nano.c:1555
 msgid "Spell checking failed: unable to write temp file!"
 msgstr ""
 "Controllo ortografico fallito: impossibile scrivere su file temporaneo!"

-#: nano.c:1566
+#: nano.c:1567
 msgid "Finished checking spelling"
 msgstr "Controllo ortografico terminato"

-#: nano.c:1568
+#: nano.c:1569
 msgid "Spell checking failed"
 msgstr "Controllo ortografico fallito"

-#: nano.c:1597
+#: nano.c:1598
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Salva il buffer modificato? (RISPONDENDO \"No\" ANNULLERETE I CAMBIAMENTI "
 "AVVENUTI) "

-#: nano.c:1733
+#: nano.c:1734
 msgid "Received SIGHUP"
 msgstr "Ricevuto SIGHUP"

-#: nano.c:1797
+#: nano.c:1798
 msgid "Cannot resize top win"
 msgstr "Impossibile ridimensionare la finestra superiore"

-#: nano.c:1799
+#: nano.c:1800
 msgid "Cannot move top win"
 msgstr "Impossibile spostare la finestra superiore"

-#: nano.c:1801
+#: nano.c:1802
 msgid "Cannot resize edit win"
 msgstr "Impossibile ridimensionare la finestra di modifica"

-#: nano.c:1803
+#: nano.c:1804
 msgid "Cannot move edit win"
 msgstr "Impossibile spostare finestra di modifica"

-#: nano.c:1805
+#: nano.c:1806
 msgid "Cannot resize bottom win"
 msgstr "Impossibile ridimensionare la finestra inferiore"

-#: nano.c:1807
+#: nano.c:1808
 msgid "Cannot move bottom win"
 msgstr "Impossibile spostare la finestra inferiore"

-#: nano.c:2132
+#: nano.c:2133
 msgid "Can now UnJustify!"
 msgstr "Impossibile togliere giustificazione!"

-#: nano.c:2248
+#: nano.c:2249
 #, c-format
 msgid "%s enable/disable"
 msgstr "%s abilita/disabilita"

-#: nano.c:2267
+#: nano.c:2268
 msgid "enabled"
 msgstr "abilitato"

-#: nano.c:2268
+#: nano.c:2269
 msgid "disabled"
 msgstr "disabilitato"

-#: nano.c:2321
+#: nano.c:2322
 msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 msgstr ""
 "Rilevata pressione del NumLock: il keypad potrebbe non funzionare col "
 "Numlock spento"

-#: nano.c:2576
+#: nano.c:2577
 msgid "Main: set up windows\n"
 msgstr "Main: configura finestre\n"

-#: nano.c:2587
+#: nano.c:2588
 msgid "Main: bottom win\n"
 msgstr "Main: finestra inferiore\n"

-#: nano.c:2593
+#: nano.c:2594
 msgid "Main: open file\n"
 msgstr "Main: apri file\n"

-#: nano.c:2651
+#: nano.c:2652
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "Premuto Alt-O-%c! (%d)\n"

-#: nano.c:2678
+#: nano.c:2679
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "Premuto Alt-[-1-%c! (%d)\n"

-#: nano.c:2716
+#: nano.c:2717
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "Premuto Alt-[-2-%c! (%d)\n"

-#: nano.c:2770
+#: nano.c:2771
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Premuto Alt-[-%c! (%d)\n"

-#: nano.c:2805
+#: nano.c:2806
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Premuto Alt-%c! (%d)\n"
@@ -973,92 +973,92 @@ msgstr ""
 msgid "Unable to open ~/.nanorc file, %s"
 msgstr ""

-#: search.c:126
+#: search.c:129
 #, fuzzy
 msgid "Case Sensitive "
 msgstr "Case sens"

-#: search.c:127
+#: search.c:130
 msgid "Regexp "
 msgstr ""

-#: search.c:128
+#: search.c:131
 #, fuzzy
 msgid "Search"
 msgstr "Cerca%s%s"

-#: search.c:129
+#: search.c:132
 msgid " Backwards"
 msgstr ""

-#: search.c:130
+#: search.c:133
 msgid " (to replace)"
 msgstr " (sostituisci)"

-#: search.c:135 search.c:399
+#: search.c:138 search.c:404
 msgid "Search Cancelled"
 msgstr "Ricerca annullata"

-#: search.c:216
+#: search.c:221
 #, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s...\" non trovato"

-#: search.c:265 search.c:321
+#: search.c:270 search.c:326
 msgid "Search Wrapped"
 msgstr "Ricerca interrotta"

-#: search.c:421
+#: search.c:426
 #, c-format
 msgid "Replaced %d occurrences"
 msgstr "Sostituite %d occorrenze"

-#: search.c:423
+#: search.c:428
 msgid "Replaced 1 occurrence"
 msgstr "Sostituita 1 occorrenza"

-#: search.c:561 search.c:671 search.c:687
+#: search.c:566 search.c:676 search.c:692
 msgid "Replace Cancelled"
 msgstr "Sostituzione annullata"

-#: search.c:611
+#: search.c:616
 msgid "Replace this instance?"
 msgstr "Sostituisci questa occorrenza?"

-#: search.c:623
+#: search.c:628
 msgid "Replace failed: unknown subexpression!"
 msgstr "Sostituzione fallita: espressione sconosciuta!"

-#: search.c:712
+#: search.c:717
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Sostituisci con [%s]"

-#: search.c:716 search.c:720
+#: search.c:721 search.c:725
 msgid "Replace with"
 msgstr "Sostituisci con"

-#: search.c:754
+#: search.c:759
 msgid "Enter line number"
 msgstr "Inserisci numero linea"

-#: search.c:756
+#: search.c:761
 msgid "Aborted"
 msgstr "Operazione annullata"

-#: search.c:765
+#: search.c:770
 msgid "Come on, be reasonable"
 msgstr "Avanti, sii ragionevole"

-#: utils.c:146
+#: utils.c:159
 msgid "nano: malloc: out of memory!"
 msgstr ""

-#: utils.c:160
+#: utils.c:173
 msgid "nano: calloc: out of memory!"
 msgstr ""

-#: utils.c:170
+#: utils.c:183
 msgid "nano: realloc: out of memory!"
 msgstr ""

--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0.3\n"
-"POT-Creation-Date: 2001-07-14 18:56-0400\n"
+"POT-Creation-Date: 2001-07-28 19:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Eivind Kjørstad <ekj@vestdata.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -22,131 +22,131 @@ msgstr "add_to_cutbuffer vart kalla med inptr->data = %s\n"
 msgid "Blew away cutbuffer =)\n"
 msgstr "Frigjorde cut-bufferet\n"

-#: files.c:134
+#: files.c:145
 msgid "read_line: not on first line and prev is NULL"
 msgstr "read_line: ikkje på første linje, og prev er NULL"

-#: files.c:196 files.c:214
+#: files.c:207 files.c:225
 #, c-format
 msgid "Read %d lines"
 msgstr "Leste %d linjer"

-#: files.c:232 search.c:210
+#: files.c:243 search.c:215
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" ikke funnet"

 #. We have a new file
-#: files.c:236
+#: files.c:247
 msgid "New File"
 msgstr "Ny fil"

-#: files.c:249
+#: files.c:260
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr "Fila er en katalog"

 # "enhet" = "device", kanskje, men det er litt forvirrande
 #. Don't open character or block files.  Sorry, /dev/sndstat!
-#: files.c:252
+#: files.c:263
 #, c-format
 msgid "File \"%s\" is a device file"
 msgstr "Fila er ikke ei vanlig fil"

-#: files.c:259
+#: files.c:270
 msgid "Reading File"
 msgstr "Leser fil"

-#: files.c:279
+#: files.c:290
 msgid "File to insert [from ./] "
 msgstr "Fil som skal settast inn [frå ./] "

-#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705
-#: files.c:716 files.c:1102
+#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716
+#: files.c:727 files.c:1113
 #, c-format
 msgid "filename is %s"
 msgstr "filnavnet er %s"

-#: files.c:368 files.c:872 files.c:1187 nano.c:1629
+#: files.c:379 files.c:883 files.c:1198 nano.c:1630
 msgid "Cancelled"
 msgstr "Avbrutt"

-#: files.c:642 files.c:697
+#: files.c:653 files.c:708
 msgid "No more open files"
 msgstr ""

-#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974
+#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Kunne ikkje åpne fila for skriving: %s"

-#: files.c:955
+#: files.c:966
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Skreiv >%s\n"

-#: files.c:983
+#: files.c:994
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Kunne ikke lukke %s: %s"

 #. Try a rename??
-#: files.c:1006 files.c:1015 files.c:1020
+#: files.c:1017 files.c:1026 files.c:1031
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Kunne ikke åpne %s for skriving: %s"

-#: files.c:1027
+#: files.c:1038
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Kunne ikke sette rettighetebe %o på %s: %s"

-#: files.c:1034
+#: files.c:1045
 #, c-format
 msgid "Wrote %d lines"
 msgstr "Skreiv %d linjer"

-#: files.c:1074
+#: files.c:1085
 #, c-format
 msgid "%s Selection to File"
 msgstr "%s område til fil"

-#: files.c:1074 files.c:1078 global.c:496
+#: files.c:1085 files.c:1089 global.c:499
 msgid "Append"
 msgstr "Legg til"

-#: files.c:1074 files.c:1078
+#: files.c:1085 files.c:1089
 msgid "Write"
 msgstr "Skriv"

-#: files.c:1078
+#: files.c:1089
 #, c-format
 msgid "File Name to %s"
 msgstr "Filnamn som skal"

-#: files.c:1116
+#: files.c:1127
 msgid "File exists, OVERWRITE ?"
 msgstr "Fila eksisterar, OVERSKRIVE ?"

-#: files.c:1598
+#: files.c:1609
 msgid "(more)"
 msgstr "(meir)"

-#: files.c:1911
+#: files.c:1922
 msgid "Can't move up a directory"
 msgstr "Kan ikke skifte katalog"

 #. We can't open this dir for some reason.  Complain
-#: files.c:1921 files.c:1969
+#: files.c:1932 files.c:1980
 #, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "Kan ikke åpne \"%s\": %s"

-#: files.c:1949 global.c:277
+#: files.c:1960 global.c:275
 msgid "Goto Directory"
 msgstr "Gå til katalog"

-#: files.c:1954
+#: files.c:1965
 msgid "Goto Cancelled"
 msgstr "Gåtil avbrutt"

@@ -206,296 +206,296 @@ msgstr ""
 msgid "Open next loaded file"
 msgstr ""

-#: global.c:238
+#: global.c:236
 msgid "Invoke the help menu"
 msgstr "Vis hjelp-menyen"

-#: global.c:239
+#: global.c:237
 msgid "Write the current file to disk"
 msgstr "Lagre gjeldande fil"

-#: global.c:242
+#: global.c:240
 msgid "Close currently loaded file/Exit from nano"
 msgstr ""

-#: global.c:244
+#: global.c:242
 msgid "Exit from nano"
 msgstr "Avslutt nano"

-#: global.c:247
+#: global.c:245
 msgid "Goto a specific line number"
 msgstr "Hopp til eit linjenummer"

-#: global.c:248
+#: global.c:246
 msgid "Justify the current paragraph"
 msgstr "Juster avsnittet"

-#: global.c:249
+#: global.c:247
 msgid "Unjustify after a justify"
 msgstr "Fjern justering etter ei justering"

-#: global.c:250
+#: global.c:248
 msgid "Replace text within the editor"
 msgstr "Erstatt tekst"

-#: global.c:251
+#: global.c:249
 msgid "Insert another file into the current one"
 msgstr "Sett inn ei anna fil i denne"

-#: global.c:252
+#: global.c:250
 msgid "Search for text within the editor"
 msgstr "Søk etter tekst"

-#: global.c:253
+#: global.c:251
 msgid "Move to the previous screen"
 msgstr "Gå til forrige skjerm"

-#: global.c:254
+#: global.c:252
 msgid "Move to the next screen"
 msgstr "Gå til neste skjerm"

-#: global.c:255
+#: global.c:253
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Klipp denne linja og lagre den i klippebufferet"

-#: global.c:256
+#: global.c:254
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Sett inn klippebufferet her"

-#: global.c:257
+#: global.c:255
 msgid "Show the position of the cursor"
 msgstr "Vis kursorposisjonen"

-#: global.c:258
+#: global.c:256
 msgid "Invoke the spell checker (if available)"
 msgstr "Start stavesjekk (viss tilgjengelig)"

-#: global.c:259
+#: global.c:257
 msgid "Move up one line"
 msgstr "Flytt opp ei linje"

-#: global.c:260
+#: global.c:258
 msgid "Move down one line"
 msgstr "Flytt ned ei linje"

-#: global.c:261
+#: global.c:259
 msgid "Move forward one character"
 msgstr "Flytt fram ein bokstav"

-#: global.c:262
+#: global.c:260
 msgid "Move back one character"
 msgstr "Flytt tilbake ein bokstav"

-#: global.c:263
+#: global.c:261
 msgid "Move to the beginning of the current line"
 msgstr "Flytt til starten av linja"

-#: global.c:264
+#: global.c:262
 msgid "Move to the end of the current line"
 msgstr "Flytt til enden av linja"

-#: global.c:265
+#: global.c:263
 msgid "Go to the first line of the file"
 msgstr "Gå til første linje"

-#: global.c:266
+#: global.c:264
 msgid "Go to the last line of the file"
 msgstr "Gå til siste linje"

-#: global.c:267
+#: global.c:265
 msgid "Refresh (redraw) the current screen"
 msgstr "Tegn skjermen på nytt"

-#: global.c:268
+#: global.c:266
 msgid "Mark text at the current cursor location"
 msgstr "Marker teksten ved kursor"

-#: global.c:269
+#: global.c:267
 msgid "Delete the character under the cursor"
 msgstr "Slett bokstaven under kursor"

-#: global.c:271
+#: global.c:269
 msgid "Delete the character to the left of the cursor"
 msgstr "Slett bokstaven til venstre for kursor"

-#: global.c:272
+#: global.c:270
 msgid "Insert a tab character"
 msgstr "Sett inn et tab-tegn"

-#: global.c:273
+#: global.c:271
 msgid "Insert a carriage return at the cursor position"
 msgstr "Sett inn et linjeskift"

-#: global.c:275
+#: global.c:273
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Gjer gjeldande søk utan hensyn til store/små bokstavar"

-#: global.c:276
+#: global.c:274
 msgid "Go to file browser"
 msgstr "Gå til fil-lesar"

-#: global.c:278
+#: global.c:276
 msgid "Cancel the current function"
 msgstr "Avbryt gjeldande funksjon"

-#: global.c:279
+#: global.c:277
 msgid "Append to the current file"
 msgstr "Legg til noverande fil"

-#: global.c:280
+#: global.c:278
 msgid "Search Backwards"
 msgstr "Søk bakover"

-#: global.c:281
+#: global.c:279
 msgid "Use Regular Expressions"
 msgstr "Bruk regulære uttrykk"

-#: global.c:284
+#: global.c:282
 msgid "Get Help"
 msgstr "Hjelp"

-#: global.c:289
+#: global.c:287
 msgid "Close"
 msgstr ""

-#: global.c:293 global.c:487 global.c:525
+#: global.c:291 global.c:490 global.c:528
 msgid "Exit"
 msgstr "Avslutt"

-#: global.c:296
+#: global.c:294
 msgid "WriteOut"
 msgstr "Lagre"

-#: global.c:301 global.c:390
+#: global.c:299 global.c:388
 msgid "Justify"
 msgstr "Juster"

-#: global.c:305 global.c:311
+#: global.c:303 global.c:309
 msgid "Read File"
 msgstr "Les fil"

-#: global.c:315 global.c:386 global.c:410
+#: global.c:313 global.c:384 global.c:408
 msgid "Replace"
 msgstr "Erstatt"

-#: global.c:319
+#: global.c:317
 msgid "Where Is"
 msgstr "Finn"

-#: global.c:323 global.c:479 global.c:514
+#: global.c:321 global.c:482 global.c:517
 msgid "Prev Page"
 msgstr "Forrige side"

-#: global.c:327 global.c:483 global.c:518
+#: global.c:325 global.c:486 global.c:521
 msgid "Next Page"
 msgstr "Neste side"

-#: global.c:331
+#: global.c:329
 msgid "Cut Text"
 msgstr "Klipp"

-#: global.c:335
+#: global.c:333
 msgid "UnJustify"
 msgstr "Avjuster"

-#: global.c:338
+#: global.c:336
 msgid "UnCut Txt"
 msgstr "Lim inn"

-#: global.c:342
+#: global.c:340
 msgid "Cur Pos"
 msgstr "Posisjon"

-#: global.c:346
+#: global.c:344
 msgid "To Spell"
 msgstr "Staving"

-#: global.c:350
+#: global.c:348
 msgid "Up"
 msgstr "Opp"

-#: global.c:353
+#: global.c:351
 msgid "Down"
 msgstr "Ned"

-#: global.c:356
+#: global.c:354
 msgid "Forward"
 msgstr "Framover"

-#: global.c:359
+#: global.c:357
 msgid "Back"
 msgstr "Bakover"

-#: global.c:362
+#: global.c:360
 msgid "Home"
 msgstr "Hjem"

-#: global.c:365
+#: global.c:363
 msgid "End"
 msgstr "Bunn"

-#: global.c:368
+#: global.c:366
 msgid "Refresh"
 msgstr "Oppfrisk"

-#: global.c:371
+#: global.c:369
 msgid "Mark Text"
 msgstr "Marker tekst"

-#: global.c:374
+#: global.c:372
 msgid "Delete"
 msgstr "Slett"

-#: global.c:378
+#: global.c:376
 msgid "Backspace"
 msgstr "Visketast"

-#: global.c:382
+#: global.c:380
 msgid "Tab"
 msgstr "Tab"

-#: global.c:394
+#: global.c:392
 msgid "Enter"
 msgstr "Enter"

-#: global.c:398 global.c:414 global.c:441
+#: global.c:396 global.c:412 global.c:442
 msgid "Goto Line"
 msgstr "Gå til linje"

-#: global.c:404 global.c:431 global.c:459 global.c:469
+#: global.c:402 global.c:432 global.c:462 global.c:472
 msgid "First Line"
 msgstr "Første linje"

-#: global.c:407 global.c:434 global.c:462 global.c:472
+#: global.c:405 global.c:435 global.c:465 global.c:475
 msgid "Last Line"
 msgstr "Siste linje"

-#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499
-#: global.c:507 global.c:510 global.c:528 winio.c:1239
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: global.c:420 global.c:447
+#: global.c:416 global.c:446
 msgid "Case Sens"
 msgstr "Følsomt for store/små bokstavar"

-#: global.c:423 global.c:450
+#: global.c:419 global.c:449
 msgid "Backward"
 msgstr "Bakover"

-#: global.c:427 global.c:454
+#: global.c:424 global.c:454
 msgid "Regexp"
 msgstr "Regulært uttrykk"

-#: global.c:437
+#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502
+#: global.c:510 global.c:513 global.c:531 winio.c:1239
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: global.c:438
 msgid "No Replace"
 msgstr "Ingen erstatting"

-#: global.c:492 global.c:503
+#: global.c:495 global.c:506
 msgid "To Files"
 msgstr "Til filer"

-#: global.c:522
+#: global.c:525
 msgid "Goto"
 msgstr "Gå til"

@@ -782,128 +782,128 @@ msgstr "Merke satt"
 msgid "Mark UNset"
 msgstr "Merke fjerna"

-#: nano.c:1105
+#: nano.c:1106
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap kalla med inptr->data=\"%s\"\n"

-#: nano.c:1157
+#: nano.c:1158
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data nå = \"%s\"\n"

-#: nano.c:1209
+#: nano.c:1210
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Etter, data = \"%s\"\n"

-#: nano.c:1310
+#: nano.c:1311
 msgid "Edit a replacement"
 msgstr "Rediger erstatning"

-#: nano.c:1548
+#: nano.c:1549
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Kunne ikkje oprette midlertidig fil: %s"

-#: nano.c:1554
+#: nano.c:1555
 msgid "Spell checking failed: unable to write temp file!"
 msgstr "Stavekontroll feila: kunne ikkje lage midlertidig fil!"

-#: nano.c:1566
+#: nano.c:1567
 msgid "Finished checking spelling"
 msgstr "Stavekontroll fullført"

-#: nano.c:1568
+#: nano.c:1569
 msgid "Spell checking failed"
 msgstr "Stavekontroll feila"

-#: nano.c:1597
+#: nano.c:1598
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Lagre endra buffer (\"No\" VIL MISTE ENDRINGENE) ? "

-#: nano.c:1733
+#: nano.c:1734
 msgid "Received SIGHUP"
 msgstr "Mottok SIGHUP"

-#: nano.c:1797
+#: nano.c:1798
 msgid "Cannot resize top win"
 msgstr "Kan ikke endre størrelse på toppvinduet"

-#: nano.c:1799
+#: nano.c:1800
 msgid "Cannot move top win"
 msgstr "Kan ikke flytte toppvinduet"

-#: nano.c:1801
+#: nano.c:1802
 msgid "Cannot resize edit win"
 msgstr "Kan ikke endre størrelse på redigeringsvinduet"

-#: nano.c:1803
+#: nano.c:1804
 msgid "Cannot move edit win"
 msgstr "Kan iikke flytte redigeringsvinduet"

-#: nano.c:1805
+#: nano.c:1806
 msgid "Cannot resize bottom win"
 msgstr "Kan ikke endre størrelse på bunnvinduet"

-#: nano.c:1807
+#: nano.c:1808
 msgid "Cannot move bottom win"
 msgstr "Kan ikke flytte bunnvinduet"

-#: nano.c:2132
+#: nano.c:2133
 msgid "Can now UnJustify!"
 msgstr "Du kan no avjustere!"

-#: nano.c:2248
+#: nano.c:2249
 #, c-format
 msgid "%s enable/disable"
 msgstr "%s skru på/av"

-#: nano.c:2267
+#: nano.c:2268
 msgid "enabled"
 msgstr "på"

-#: nano.c:2268
+#: nano.c:2269
 msgid "disabled"
 msgstr "av"

-#: nano.c:2321
+#: nano.c:2322
 msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 msgstr "NumLock-feil oppdaga. Nummer-tastane vil fungere feil med NumLock av"

-#: nano.c:2576
+#: nano.c:2577
 msgid "Main: set up windows\n"
 msgstr "Hoved: Vinduer satt opp\n"

-#: nano.c:2587
+#: nano.c:2588
 msgid "Main: bottom win\n"
 msgstr "Hoved: bunnvindu\n"

-#: nano.c:2593
+#: nano.c:2594
 msgid "Main: open file\n"
 msgstr "Hoved: åpne fil\n"

-#: nano.c:2651
+#: nano.c:2652
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "Jeg fikk Alt-O-%c! (%d)\n"

-#: nano.c:2678
+#: nano.c:2679
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "Jeg fikk Alt-[-1-%c! (%d)\n"

-#: nano.c:2716
+#: nano.c:2717
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "Jeg fikk Alt-[-2-%c! (%d)\n"

-#: nano.c:2770
+#: nano.c:2771
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Jeg fikk Alt-[-%c! (%d)\n"

-#: nano.c:2805
+#: nano.c:2806
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Jeg fikk Alt-%c (%d)\n"
@@ -959,90 +959,90 @@ msgstr "Feil funnet i .nanorc fila"
 msgid "Unable to open ~/.nanorc file, %s"
 msgstr "Kan ikkje åpne ~/.nanorc, %s"

-#: search.c:126
+#: search.c:129
 msgid "Case Sensitive "
 msgstr "Ta hensyn til store/små bokstaver "

-#: search.c:127
+#: search.c:130
 msgid "Regexp "
 msgstr "Regulært uttrykk"

-#: search.c:128
+#: search.c:131
 msgid "Search"
 msgstr "Søk"

-#: search.c:129
+#: search.c:132
 msgid " Backwards"
 msgstr " Bakover"

-#: search.c:130
+#: search.c:133
 msgid " (to replace)"
 msgstr " (å erstatte)"

-#: search.c:135 search.c:399
+#: search.c:138 search.c:404
 msgid "Search Cancelled"
 msgstr "Søk avbrutt"

-#: search.c:216
+#: search.c:221
 #, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s...\" ikke funnet"

-#: search.c:265 search.c:321
+#: search.c:270 search.c:326
 msgid "Search Wrapped"
 msgstr "Søket gikk rundt"

-#: search.c:421
+#: search.c:426
 #, c-format
 msgid "Replaced %d occurrences"
 msgstr "Erstattet %d tilfeller"

-#: search.c:423
+#: search.c:428
 msgid "Replaced 1 occurrence"
 msgstr "Erstattet 1 tilfelle"

-#: search.c:561 search.c:671 search.c:687
+#: search.c:566 search.c:676 search.c:692
 msgid "Replace Cancelled"
 msgstr "Erstatt avbrutt"

-#: search.c:611
+#: search.c:616
 msgid "Replace this instance?"
 msgstr "Erstatt dette tilfellet?"

-#: search.c:623
+#: search.c:628
 msgid "Replace failed: unknown subexpression!"
 msgstr "Erstatt feila: ukjent underuttrykk!"

-#: search.c:712
+#: search.c:717
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Erstatt med [%s]"

-#: search.c:716 search.c:720
+#: search.c:721 search.c:725
 msgid "Replace with"
 msgstr "Erstatt med"

-#: search.c:754
+#: search.c:759
 msgid "Enter line number"
 msgstr "Skriv linjenummer"

-#: search.c:756
+#: search.c:761
 msgid "Aborted"
 msgstr "Avbrutt"

-#: search.c:765
+#: search.c:770
 msgid "Come on, be reasonable"
 msgstr "Kom igjen, samarbeid litt"

-#: utils.c:146
+#: utils.c:159
 msgid "nano: malloc: out of memory!"
 msgstr "nano: malloc: tom for minne!"

-#: utils.c:160
+#: utils.c:173
 msgid "nano: calloc: out of memory!"
 msgstr "nano: calloc: tom for minne!"

-#: utils.c:170
+#: utils.c:183
 msgid "nano: realloc: out of memory!"
 msgstr "nano: realloc: tom for minne!"

--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.0.1\n"
-"POT-Creation-Date: 2001-07-14 18:56-0400\n"
+"POT-Creation-Date: 2001-07-28 19:55-0400\n"
 "PO-Revision-Date: 2001-05-16 10:10+0200\n"
 "Last-Translator: Sergey A. Ribalchenko <fisher@obu.ck.ua>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -22,133 +22,133 @@ msgstr "add_to_cutbuffer
 msgid "Blew away cutbuffer =)\n"
 msgstr "cutbuffer ÓÄÕÌÏ ×ÅÔÒÏÍ =)\n"

-#: files.c:134
+#: files.c:145
 msgid "read_line: not on first line and prev is NULL"
 msgstr "read_line: ÎÅ ÎÁ ÐÅÒ×ÏÊ ÓÔÒÏËÅ É ÐÒÅÄÙÄÕÝÁÑ NULL"

-#: files.c:196 files.c:214
+#: files.c:207 files.c:225
 #, c-format
 msgid "Read %d lines"
 msgstr "ðÒÏÞÉÔÁÎÏ %d ÓÔÒÏË"

-#: files.c:232 search.c:210
+#: files.c:243 search.c:215
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" ÎÅ ÎÁÊÄÅÎ"

 #. We have a new file
-#: files.c:236
+#: files.c:247
 msgid "New File"
 msgstr "îÏ×ÙÊ æÁÊÌ"

-#: files.c:249
+#: files.c:260
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr "æÁÊÌ \"%s\" - ÜÔÏ ÄÉÒÅËÔÏÒÉÑ"

 #. Don't open character or block files.  Sorry, /dev/sndstat!
-#: files.c:252
+#: files.c:263
 #, c-format
 msgid "File \"%s\" is a device file"
 msgstr "æÁÊÌ \"%s\" Ñ×ÌÑÅÔÓÑ ÆÁÊÌÏÍ ÕÓÔÒÏÊÓÔ×Á"

-#: files.c:259
+#: files.c:270
 msgid "Reading File"
 msgstr "þÉÔÁÅÍ æÁÊÌ"

-#: files.c:279
+#: files.c:290
 msgid "File to insert [from ./] "
 msgstr "æÁÊÌ ÄÌÑ ×ÓÔÁ×ËÉ [ÏÔ ./]"

-#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705
-#: files.c:716 files.c:1102
+#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716
+#: files.c:727 files.c:1113
 #, c-format
 msgid "filename is %s"
 msgstr "ÉÍÑ ÆÁÊÌÁ %s"

-#: files.c:368 files.c:872 files.c:1187 nano.c:1629
+#: files.c:379 files.c:883 files.c:1198 nano.c:1630
 msgid "Cancelled"
 msgstr "ïÔÍÅÎÅÎÏ"

-#: files.c:642 files.c:697
+#: files.c:653 files.c:708
 msgid "No more open files"
 msgstr ""

-#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974
+#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ ÎÁ ÚÁÐÉÓØ: %s"

-#: files.c:955
+#: files.c:966
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "úÁÐÉÓÁÎÏ >%s\n"

-#: files.c:983
+#: files.c:994
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "îÅ ÍÏÇÕ ÚÁËÒÙÔØ %s: %s"

 #. Try a rename??
-#: files.c:1006 files.c:1015 files.c:1020
+#: files.c:1017 files.c:1026 files.c:1031
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ %s ÎÁ ÚÁÐÉÓØ: %s"

-#: files.c:1027
+#: files.c:1038
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ ÐÒÁ×Á %o ÎÁ %s: %s"

-#: files.c:1034
+#: files.c:1045
 #, c-format
 msgid "Wrote %d lines"
 msgstr "úÁÐÉÓÁÎÏ %d ÓÔÒÏË"

-#: files.c:1074
+#: files.c:1085
 #, c-format
 msgid "%s Selection to File"
 msgstr ""

-#: files.c:1074 files.c:1078 global.c:496
+#: files.c:1085 files.c:1089 global.c:499
 #, fuzzy
 msgid "Append"
 msgstr "ðÒÉÏÓÔÁÎÏ×ÉÔØ"

-#: files.c:1074 files.c:1078
+#: files.c:1085 files.c:1089
 #, fuzzy
 msgid "Write"
 msgstr "úÁÐÉÓÁÔØ"

-#: files.c:1078
+#: files.c:1089
 #, fuzzy, c-format
 msgid "File Name to %s"
 msgstr "éÍÑ æÁÊÌÁ ÎÁ ÚÁÐÉÓØ"

-#: files.c:1116
+#: files.c:1127
 msgid "File exists, OVERWRITE ?"
 msgstr "æÁÊÌ ÓÕÝÅÓÔ×ÕÅÔ, ðåòåðéûåí ?"

-#: files.c:1598
+#: files.c:1609
 msgid "(more)"
 msgstr "(ÅÝÅ)"

-#: files.c:1911
+#: files.c:1922
 msgid "Can't move up a directory"
 msgstr "îÅ ÍÏÇÕ ÐÅÒÅÍÅÓÔÉÔØ ÄÉÒÅËÔÏÒÉÀ"

 #. We can't open this dir for some reason.  Complain
-#: files.c:1921 files.c:1969
+#: files.c:1932 files.c:1980
 #, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ \"%s\": %s"

-#: files.c:1949 global.c:277
+#: files.c:1960 global.c:275
 #, fuzzy
 msgid "Goto Directory"
 msgstr "ë ÓÔÒÏËÅ"

-#: files.c:1954
+#: files.c:1965
 #, fuzzy
 msgid "Goto Cancelled"
 msgstr "ïÔÍÅÎÅÎÏ"
@@ -210,301 +210,301 @@ msgstr ""
 msgid "Open next loaded file"
 msgstr ""

-#: global.c:238
+#: global.c:236
 msgid "Invoke the help menu"
 msgstr "÷ÙÐÏÌÎÉÔØ ÍÅÎÀ ÐÏÍÏÝÉ"

-#: global.c:239
+#: global.c:237
 msgid "Write the current file to disk"
 msgstr "úÁÐÉÓÁÔØ ÔÅËÕÝÉÊ ÆÁÊÌ ÎÁ ÄÉÓË"

-#: global.c:242
+#: global.c:240
 msgid "Close currently loaded file/Exit from nano"
 msgstr ""

-#: global.c:244
+#: global.c:242
 msgid "Exit from nano"
 msgstr "÷ÙÈÏÄ ÉÚ nano"

-#: global.c:247
+#: global.c:245
 msgid "Goto a specific line number"
 msgstr "ðÅÒÅÊÔÉ ÎÁ ÕËÁÚÁÎÎÙÊ ÎÏÍÅÒ ÓÔÒÏËÉ"

-#: global.c:248
+#: global.c:246
 msgid "Justify the current paragraph"
 msgstr "÷ÙÒÏ×ÎÑÔØ ÔÅËÕÝÉÊ ÁÂÚÁÃ"

-#: global.c:249
+#: global.c:247
 msgid "Unjustify after a justify"
 msgstr "ïÔÍÅÎÉÔØ ÐÏÓÌÅÄÎÅÅ ×ÙÒÁ×ÎÉ×ÁÎÉÅ"

-#: global.c:250
+#: global.c:248
 msgid "Replace text within the editor"
 msgstr "úÁÍÅÎÉÔØ ÔÅËÓÔ × ÐÒÅÄÅÌÁÈ ÒÅÄÁËÔÏÒÁ"

-#: global.c:251
+#: global.c:249
 msgid "Insert another file into the current one"
 msgstr "÷ÓÔÁ×ÉÔØ ÄÒÕÇÏÊ ÆÁÊÌ × ÔÅËÕÝÉÊ"

-#: global.c:252
+#: global.c:250
 msgid "Search for text within the editor"
 msgstr "éÓËÁÔØ ÔÅËÓÔ × ÐÒÅÄÅÌÁÈ ÒÅÄÁËÔÏÒÁ"

-#: global.c:253
+#: global.c:251
 msgid "Move to the previous screen"
 msgstr "ðÅÒÅÍÅÓÔÉÔØÓÑ ÎÁ ÐÒÅÄÙÄÕÝÉÊ ÜËÒÁÎ"

-#: global.c:254
+#: global.c:252
 msgid "Move to the next screen"
 msgstr "ðÅÒÅÍÅÓÔÉÔØÓÑ ÎÁ ÓÌÅÄÕÝÉÊ ÜËÒÁÎ"

-#: global.c:255
+#: global.c:253
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "÷ÙÒÅÚÁÔØ ÔÅËÕÝÕÀ ÓÔÒÏËÕ É ÓÏÈÒÁÎÉÔØ ÅÅ × cutbuffer'Å"

-#: global.c:256
+#: global.c:254
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "÷ÓÔÁ×ÉÔØ ÓÏÄÅÒÖÉÍÏÅ cutbuffer'Á × ÔÅËÕÝÕÀ ÓÔÒÏËÕ"

-#: global.c:257
+#: global.c:255
 #, fuzzy
 msgid "Show the position of the cursor"
 msgstr "ðÏËÁÚÁÔØ ÐÏÌÏÖÅÎÉÅ ËÕÒÓÏÒÁ"

-#: global.c:258
+#: global.c:256
 msgid "Invoke the spell checker (if available)"
 msgstr "÷ÙÐÏÌÎÉÔØ ÐÒÏ×ÅÒËÕ ÏÒÆÏÇÒÁÆÉÉ (ÅÓÌÉ ÅÓÔØ)"

-#: global.c:259
+#: global.c:257
 msgid "Move up one line"
 msgstr "ðÏÄÎÑÔØÓÑ ÎÁ ÏÄÎÕ ÓÔÒÏËÕ"

-#: global.c:260
+#: global.c:258
 msgid "Move down one line"
 msgstr "ïÐÕÓÔÉÔØÓÑ ÎÁ ÏÄÎÕ ÓÔÒÏËÕ"

-#: global.c:261
+#: global.c:259
 msgid "Move forward one character"
 msgstr "÷ÐÅÒÅÄ ÎÁ ÏÄÉÎ ÓÉÍ×ÏÌ"

-#: global.c:262
+#: global.c:260
 msgid "Move back one character"
 msgstr "îÁÚÁÄ ÎÁ ÏÄÉÎ ÓÉÍ×ÏÌ"

-#: global.c:263
+#: global.c:261
 msgid "Move to the beginning of the current line"
 msgstr "ðÅÒÅÍÅÓÔÉÔØÓÑ ÎÁ ÎÁÞÁÌÏ ÔÅËÕÝÅÊ ÓÔÒÏËÉ"

-#: global.c:264
+#: global.c:262
 msgid "Move to the end of the current line"
 msgstr "ðÅÒÅÍÅÓÔÉÔØÓÑ × ËÏÎÅÃ ÔÅËÕÝÅÊ ÓÔÒÏËÉ"

-#: global.c:265
+#: global.c:263
 msgid "Go to the first line of the file"
 msgstr "ðÅÒÅÍÅÓÔÉÔØÓÑ ÎÁ ÐÅÒ×ÕÀ ÓÔÒÏËÕ ÆÁÊÌÁ"

-#: global.c:266
+#: global.c:264
 msgid "Go to the last line of the file"
 msgstr "ðÅÒÅÍÅÓÔÉÔØÓÑ ÎÁ ÐÏÓÌÅÄÎÀÀ ÓÔÒÏËÕ ÆÁÊÌÁ"

-#: global.c:267
+#: global.c:265
 msgid "Refresh (redraw) the current screen"
 msgstr "ðÅÒÅÒÉÓÏ×ÁÔØ ÔÅËÕÝÉÊ ÜËÒÁÎ"

-#: global.c:268
+#: global.c:266
 msgid "Mark text at the current cursor location"
 msgstr "ïÔÍÅÔÉÔØ ÔÅËÓÔ Ó ÔÅËÕÝÅÊ ÐÏÚÉÃÉÉ ËÕÒÓÏÒÁ"

-#: global.c:269
+#: global.c:267
 msgid "Delete the character under the cursor"
 msgstr "õÄÁÌÉÔØ ÓÉÍ×ÏÌ ÐÏÄ ËÕÒÓÏÒÏÍ"

-#: global.c:271
+#: global.c:269
 msgid "Delete the character to the left of the cursor"
 msgstr "õÄÁÌÉÔØ ÓÉÍ×ÏÌ ÓÌÅ×Á ÏÔ ËÕÒÓÏÒÁ"

-#: global.c:272
+#: global.c:270
 msgid "Insert a tab character"
 msgstr "÷ÓÔÁ×ÉÔØ ÓÉÍ×ÏÌ ÔÁÂÕÌÑÃÉÉ"

-#: global.c:273
+#: global.c:271
 msgid "Insert a carriage return at the cursor position"
 msgstr "÷ÓÔÁ×ÉÔØ CR (ÐÅÒÅ×ÏÄ ÓÔÒÏËÉ) × ÐÏÚÉÃÉÉ ËÕÒÓÏÒÁ"

-#: global.c:275
+#: global.c:273
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "óÄÅÌÁÔØ ÔÅËÕÝÉÊ ÐÏÉÓË ÉÌÉ ÚÁÍÅÎÕ ÒÅÇÉÓÔÒÏ(ÎÅ)ÚÁ×ÉÓÉÍÏÊ"

-#: global.c:276
+#: global.c:274
 msgid "Go to file browser"
 msgstr "ðÏÊÔÉ × ÐÒÏÓÍÏÔÒÝÉË ÆÁÊÌÏ×"

-#: global.c:278
+#: global.c:276
 msgid "Cancel the current function"
 msgstr "ïÔÍÅÎÉÔØ ÔÅËÕÝÕÀ ÆÕÎËÃÉÀ"

-#: global.c:279
+#: global.c:277
 #, fuzzy
 msgid "Append to the current file"
 msgstr "ðÅÒÅÍÅÓÔÉÔØÓÑ × ËÏÎÅÃ ÔÅËÕÝÅÊ ÓÔÒÏËÉ"

-#: global.c:280
+#: global.c:278
 #, fuzzy
 msgid "Search Backwards"
 msgstr "ðÏÉÓË ÏÔÍÅÎÅÎ"

-#: global.c:281
+#: global.c:279
 #, fuzzy
 msgid "Use Regular Expressions"
 msgstr "æÏÒÍÁÌØÎÙÅ ×ÙÒÁÖÅÎÉÑ (regexp)"

-#: global.c:284
+#: global.c:282
 msgid "Get Help"
 msgstr "ðÏÍÏÝØ"

-#: global.c:289
+#: global.c:287
 msgid "Close"
 msgstr ""

-#: global.c:293 global.c:487 global.c:525
+#: global.c:291 global.c:490 global.c:528
 msgid "Exit"
 msgstr "÷ÙÈÏÄ"

-#: global.c:296
+#: global.c:294
 msgid "WriteOut"
 msgstr "úÁÐÉÓÁÔØ"

-#: global.c:301 global.c:390
+#: global.c:299 global.c:388
 msgid "Justify"
 msgstr "÷ÙÒÏ×ÎÑÔØ"

-#: global.c:305 global.c:311
+#: global.c:303 global.c:309
 msgid "Read File"
 msgstr "þÉÔÁÔØæÁÊÌ"

-#: global.c:315 global.c:386 global.c:410
+#: global.c:313 global.c:384 global.c:408
 msgid "Replace"
 msgstr "úÁÍÅÎÁ"

-#: global.c:319
+#: global.c:317
 msgid "Where Is"
 msgstr "ðÏÉÓË"

-#: global.c:323 global.c:479 global.c:514
+#: global.c:321 global.c:482 global.c:517
 msgid "Prev Page"
 msgstr "ðÒÅÄ CÔÒ"

-#: global.c:327 global.c:483 global.c:518
+#: global.c:325 global.c:486 global.c:521
 msgid "Next Page"
 msgstr "óÌÅÄ CÔÒ"

-#: global.c:331
+#: global.c:329
 msgid "Cut Text"
 msgstr "÷ÙÒÅÚÁÔØ"

-#: global.c:335
+#: global.c:333
 msgid "UnJustify"
 msgstr "ïÔÍ ÷ÙÒÁ×Î"

-#: global.c:338
+#: global.c:336
 msgid "UnCut Txt"
 msgstr "ïÔÍ ÷ÙÒÅÚ"

-#: global.c:342
+#: global.c:340
 msgid "Cur Pos"
 msgstr "ôÅËðÏÚÉÃÉÑ"

-#: global.c:346
+#: global.c:344
 msgid "To Spell"
 msgstr "ïÒÆÏÇÒÁÆÉÑ"

-#: global.c:350
+#: global.c:348
 msgid "Up"
 msgstr "÷×ÅÒÈ"

-#: global.c:353
+#: global.c:351
 msgid "Down"
 msgstr "÷ÎÉÚ"

-#: global.c:356
+#: global.c:354
 msgid "Forward"
 msgstr "÷ÐÅÒÅÄ"

-#: global.c:359
+#: global.c:357
 msgid "Back"
 msgstr "îÁÚÁÄ"

-#: global.c:362
+#: global.c:360
 msgid "Home"
 msgstr "îÁÞÁÌÏ"

-#: global.c:365
+#: global.c:363
 msgid "End"
 msgstr "ëÏÎÅÃ"

-#: global.c:368
+#: global.c:366
 msgid "Refresh"
 msgstr "ðÅÒÅÒÉÓÏ×ÁÔØ"

-#: global.c:371
+#: global.c:369
 msgid "Mark Text"
 msgstr "ïÔÍÅÔÉÔØ"

-#: global.c:374
+#: global.c:372
 msgid "Delete"
 msgstr "õÄÁÌÉÔØ"

-#: global.c:378
+#: global.c:376
 msgid "Backspace"
 msgstr "úÁÂÏÊ (BS)"

-#: global.c:382
+#: global.c:380
 msgid "Tab"
 msgstr "ôÁÂÕÌÑÃÉÑ"

-#: global.c:394
+#: global.c:392
 msgid "Enter"
 msgstr "Enter"

-#: global.c:398 global.c:414 global.c:441
+#: global.c:396 global.c:412 global.c:442
 msgid "Goto Line"
 msgstr "ë ÓÔÒÏËÅ"

-#: global.c:404 global.c:431 global.c:459 global.c:469
+#: global.c:402 global.c:432 global.c:462 global.c:472
 msgid "First Line"
 msgstr "ðÅÒ×óÔÒÏËÁ"

-#: global.c:407 global.c:434 global.c:462 global.c:472
+#: global.c:405 global.c:435 global.c:465 global.c:475
 msgid "Last Line"
 msgstr "ðÏÓÌóÔÒÏËÁ"

-#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499
-#: global.c:507 global.c:510 global.c:528 winio.c:1239
-msgid "Cancel"
-msgstr "ïÔÍÅÎÉÔØ"
-
-#: global.c:420 global.c:447
+#: global.c:416 global.c:446
 msgid "Case Sens"
 msgstr "òÅÇúÁ×ÉÓÉÍ"

-#: global.c:423 global.c:450
+#: global.c:419 global.c:449
 #, fuzzy
 msgid "Backward"
 msgstr "îÁÚÁÄ"

-#: global.c:427 global.c:454
+#: global.c:424 global.c:454
 msgid "Regexp"
 msgstr ""

-#: global.c:437
+#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502
+#: global.c:510 global.c:513 global.c:531 winio.c:1239
+msgid "Cancel"
+msgstr "ïÔÍÅÎÉÔØ"
+
+#: global.c:438
 msgid "No Replace"
 msgstr "îÅúÁÍÅÝÁÔØ"

-#: global.c:492 global.c:503
+#: global.c:495 global.c:506
 msgid "To Files"
 msgstr "ë æÁÊÌÁÍ"

-#: global.c:522
+#: global.c:525
 #, fuzzy
 msgid "Goto"
 msgstr "ë ÓÔÒÏËÅ"
@@ -784,128 +784,128 @@ msgstr "
 msgid "Mark UNset"
 msgstr "íÅÔËÁ ÓÎÑÔÁ"

-#: nano.c:1105
+#: nano.c:1106
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap ×ÙÚ×ÁÎÏ Ó inptr->data=\"%s\"\n"

-#: nano.c:1157
+#: nano.c:1158
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data ÓÅÊÞÁÓ = \"%s\"\n"

-#: nano.c:1209
+#: nano.c:1210
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "ðÏÓÌÅ, data = \"%s\"\n"

-#: nano.c:1310
+#: nano.c:1311
 msgid "Edit a replacement"
 msgstr "òÅÄÁËÔÉÒÏ×ÁÔØ ÚÁÍÅÎÕ"

-#: nano.c:1548
+#: nano.c:1549
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "îÅ ÍÏÇÕ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÏÅ ÉÍÑ ÆÁÊÌÁ: %s"

-#: nano.c:1554
+#: nano.c:1555
 msgid "Spell checking failed: unable to write temp file!"
 msgstr "ðÒÏ×ÅÒËÁ ÐÒÁ×ÏÐÉÓÁÎÉÑ ÏÂÌÏÍ-Ó: ÎÅ ÍÏÇÕ ÚÁÐÉÓÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ."

-#: nano.c:1566
+#: nano.c:1567
 msgid "Finished checking spelling"
 msgstr "ðÒÏ×ÅÒËÁ ÐÒÁ×ÏÐÉÓÁÎÉÑ ÚÁ×ÅÒÛÅÎÁ"

-#: nano.c:1568
+#: nano.c:1569
 msgid "Spell checking failed"
 msgstr "ðÒÏ×ÅÒËÁ ÐÒÁ×ÏÐÉÓÁÎÉÑ ÎÅ ÕÄÁÌÁÓØ"

-#: nano.c:1597
+#: nano.c:1598
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "óÏÈÒÁÎÉÔØ ÉÚÍÅÎÅÎÎÙÊ ÂÕÆÅÒ (ïÔ×ÅÔ \"îÅÔ\" õîéþôïöéô ×ÓÅ ÉÚÍÅÎÅÎÉÑ) ?"

-#: nano.c:1733
+#: nano.c:1734
 msgid "Received SIGHUP"
 msgstr "ðÏÌÕÞÉÌÉ SIGHUP"

-#: nano.c:1797
+#: nano.c:1798
 msgid "Cannot resize top win"
 msgstr "îÅ ÍÏÇÕ ÉÚÍÅÎÉÔØ ÒÁÚÍÅÒ ×ÅÒÈÎÅÇÏ ÏËÎÁ"

-#: nano.c:1799
+#: nano.c:1800
 msgid "Cannot move top win"
 msgstr "îÅ ÍÏÇÕ ÐÅÒÅÍÅÓÔÉÔØ ×ÅÒÈÎÅÅ ÏËÎÏ"

-#: nano.c:1801
+#: nano.c:1802
 msgid "Cannot resize edit win"
 msgstr "îÅ ÍÏÇÕ ÉÚÍÅÎÉÔØ ÒÁÚÍÅÒ ÏËÎÁ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ"

-#: nano.c:1803
+#: nano.c:1804
 msgid "Cannot move edit win"
 msgstr "îÅ ÍÏÇÕ ÐÅÒÅÍÅÓÔÉÔØ ÏËÎÏ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ"

-#: nano.c:1805
+#: nano.c:1806
 msgid "Cannot resize bottom win"
 msgstr "îÅ ÍÏÇÕ ÉÚÍÅÎÉÔØ ÒÁÚÍÅÒ ÎÉÖÎÅÇÏ ÏËÎÁ"

-#: nano.c:1807
+#: nano.c:1808
 msgid "Cannot move bottom win"
 msgstr "îÅ ÍÏÇÕ ÐÅÒÅÍÅÓÔÉÔØ ÎÉÖÎÅÅ ÏËÎÏ"

-#: nano.c:2132
+#: nano.c:2133
 msgid "Can now UnJustify!"
 msgstr "óÅÊÞÁÓ ÍÏÖÎÏ ÏÔÍÅÎÉÔØ ×ÙÒÁ×ÎÉ×ÁÎÉÅ! (^U)"

-#: nano.c:2248
+#: nano.c:2249
 #, c-format
 msgid "%s enable/disable"
 msgstr "%s - ÒÁÚÒÅÛÉÔØ/ÚÁÐÒÅÔÉÔØ"

-#: nano.c:2267
+#: nano.c:2268
 msgid "enabled"
 msgstr "ÒÁÚÒÅÛÅÎÏ"

-#: nano.c:2268
+#: nano.c:2269
 msgid "disabled"
 msgstr "ÚÁÐÒÅÝÅÎÏ"

-#: nano.c:2321
+#: nano.c:2322
 msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 msgstr "ïÂÎÁÒÕÖÅÎ ÓÂÏÊ NumLock'Á. ãÉÆÒÏ×ÁÑ ËÌÁ×ÉÁÔÕÒÁ ÎÅÄÏÓÔÕÐÎÁ (NumLock off)"

-#: nano.c:2576
+#: nano.c:2577
 msgid "Main: set up windows\n"
 msgstr "Main: ÕÓÔÁÎÏ×ÉÔØ ÏËÎÁ\n"

-#: nano.c:2587
+#: nano.c:2588
 msgid "Main: bottom win\n"
 msgstr "Main: ÎÉÖÎÅÅ ÏËÎÏ\n"

-#: nano.c:2593
+#: nano.c:2594
 msgid "Main: open file\n"
 msgstr "Main: ÏÔËÒÙÔØ ÆÁÊÌ\n"

-#: nano.c:2651
+#: nano.c:2652
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "ðÏÊÍÁÌ Alt-O-%c! (%d)\n"

-#: nano.c:2678
+#: nano.c:2679
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "ðÏÊÍÁÌ Alt-[-1-%c! (%d)\n"

-#: nano.c:2716
+#: nano.c:2717
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "ðÏÊÍÁÌ Alt-[-2-%c! (%d)\n"

-#: nano.c:2770
+#: nano.c:2771
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "ðÏÊÍÁÌ Alt-[-%c! (%d)\n"

-#: nano.c:2805
+#: nano.c:2806
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "ðÏÊÍÁÌ Alt-%c! (%d)\n"
@@ -959,92 +959,92 @@ msgstr ""
 msgid "Unable to open ~/.nanorc file, %s"
 msgstr ""

-#: search.c:126
+#: search.c:129
 #, fuzzy
 msgid "Case Sensitive "
 msgstr "òÅÇúÁ×ÉÓÉÍ"

-#: search.c:127
+#: search.c:130
 msgid "Regexp "
 msgstr ""

-#: search.c:128
+#: search.c:131
 #, fuzzy
 msgid "Search"
 msgstr "ðÏÉÓË%s%s"

-#: search.c:129
+#: search.c:132
 msgid " Backwards"
 msgstr ""

-#: search.c:130
+#: search.c:133
 msgid " (to replace)"
 msgstr " (ÞÔÏ ÍÅÎÑÔØ)"

-#: search.c:135 search.c:399
+#: search.c:138 search.c:404
 msgid "Search Cancelled"
 msgstr "ðÏÉÓË ÏÔÍÅÎÅÎ"

-#: search.c:216
+#: search.c:221
 #, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s...\" ÎÅ ÎÁÊÄÅÎÏ"

-#: search.c:265 search.c:321
+#: search.c:270 search.c:326
 msgid "Search Wrapped"
 msgstr "ðÏÉÓË ÚÁ×ÅÒÎÕÔ"

-#: search.c:421
+#: search.c:426
 #, c-format
 msgid "Replaced %d occurrences"
 msgstr "úÁÍÅÎÅÎÏ %d ×ÈÏÖÄÅÎÉÊ"

-#: search.c:423
+#: search.c:428
 msgid "Replaced 1 occurrence"
 msgstr "úÁÍÅÎÅÎÏ 1 ×ÈÏÖÄÅÎÉÅ"

-#: search.c:561 search.c:671 search.c:687
+#: search.c:566 search.c:676 search.c:692
 msgid "Replace Cancelled"
 msgstr "úÁÍÅÎÁ ÏÔÍÅÎÅÎÁ"

-#: search.c:611
+#: search.c:616
 msgid "Replace this instance?"
 msgstr "úÁÍÅÎÉÔØ ÜÔÏ ×ÈÏÖÄÅÎÉÅ?"

-#: search.c:623
+#: search.c:628
 msgid "Replace failed: unknown subexpression!"
 msgstr "úÁÍÅÎÁ ÎÅ ÐÏÌÕÞÉÌÁÓØ: ÎÅÉÚ×ÅÓÔÎÏÅ ÐÏÄ×ÙÒÁÖÅÎÉÅ!"

-#: search.c:712
+#: search.c:717
 #, c-format
 msgid "Replace with [%s]"
 msgstr "úÁÍÅÎÉÔØ ÎÁ [%s]"

-#: search.c:716 search.c:720
+#: search.c:721 search.c:725
 msgid "Replace with"
 msgstr "úÁÍÅÎÉÔØ ÎÁ"

-#: search.c:754
+#: search.c:759
 msgid "Enter line number"
 msgstr "÷×ÅÄÉÔÅ ÎÏÍÅÒ ÓÔÒÏËÉ"

-#: search.c:756
+#: search.c:761
 msgid "Aborted"
 msgstr "ðÒÅÒ×ÁÎÏ"

-#: search.c:765
+#: search.c:770
 msgid "Come on, be reasonable"
 msgstr "üÔÁ, Á ÍÏÖÎÏ ÞÕÔØ ÂÏÌÅÅ ÁÄÅË×ÁÔÎÏ?"

-#: utils.c:146
+#: utils.c:159
 msgid "nano: malloc: out of memory!"
 msgstr ""

-#: utils.c:160
+#: utils.c:173
 msgid "nano: calloc: out of memory!"
 msgstr ""

-#: utils.c:170
+#: utils.c:183
 msgid "nano: realloc: out of memory!"
 msgstr ""

--- a/po/sv.po
+++ b/po/sv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.0.3\n"
-"POT-Creation-Date: 2001-07-14 18:56-0400\n"
+"POT-Creation-Date: 2001-07-28 19:55-0400\n"
 "PO-Revision-Date: 2001-07-06 22:27+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -22,133 +22,133 @@ msgstr "add_to_cutbuffer anropades med inptr->data = %s\n"
 msgid "Blew away cutbuffer =)\n"
 msgstr "Sprängde urklippsbufferten =)\n"

-#: files.c:134
+#: files.c:145
 msgid "read_line: not on first line and prev is NULL"
 msgstr "read_line: inte på första raden och prev är NULL"

-#: files.c:196 files.c:214
+#: files.c:207 files.c:225
 #, c-format
 msgid "Read %d lines"
 msgstr "Läste %d rader"

-#: files.c:232 search.c:210
+#: files.c:243 search.c:215
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" kunde inte hittas"

 #. We have a new file
-#: files.c:236
+#: files.c:247
 msgid "New File"
 msgstr "Ny fil"

-#: files.c:249
+#: files.c:260
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr "\"%s\" är en katalog"

 #. Don't open character or block files.  Sorry, /dev/sndstat!
-#: files.c:252
+#: files.c:263
 #, c-format
 msgid "File \"%s\" is a device file"
 msgstr "Filen \"%s\" är en enhetsfil"

-#: files.c:259
+#: files.c:270
 msgid "Reading File"
 msgstr "Läser filen"

-#: files.c:279
+#: files.c:290
 msgid "File to insert [from ./] "
 msgstr "Fil att infoga [från ./] "

-#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705
-#: files.c:716 files.c:1102
+#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716
+#: files.c:727 files.c:1113
 #, c-format
 msgid "filename is %s"
 msgstr "filnamnet är %s"

-#: files.c:368 files.c:872 files.c:1187 nano.c:1629
+#: files.c:379 files.c:883 files.c:1198 nano.c:1630
 msgid "Cancelled"
 msgstr "Avbruten"

-#: files.c:642 files.c:697
+#: files.c:653 files.c:708
 msgid "No more open files"
 msgstr ""

-#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974
+#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Kunde inte öppna filen för skrivning: %s"

-#: files.c:955
+#: files.c:966
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Skrev >%s\n"

-#: files.c:983
+#: files.c:994
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Kunde inte stänga %s: %s"

 #. Try a rename??
-#: files.c:1006 files.c:1015 files.c:1020
+#: files.c:1017 files.c:1026 files.c:1031
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Kunde inte öppna %s för skrivning: %s"

-#: files.c:1027
+#: files.c:1038
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Kunde inte sätta rättigheterna %o på %s: %s"

-#: files.c:1034
+#: files.c:1045
 #, c-format
 msgid "Wrote %d lines"
 msgstr "Skrev %d rader"

-#: files.c:1074
+#: files.c:1085
 #, c-format
 msgid "%s Selection to File"
 msgstr ""

-#: files.c:1074 files.c:1078 global.c:496
+#: files.c:1085 files.c:1089 global.c:499
 #, fuzzy
 msgid "Append"
 msgstr "Skjut upp"

-#: files.c:1074 files.c:1078
+#: files.c:1085 files.c:1089
 #, fuzzy
 msgid "Write"
 msgstr "Spara"

-#: files.c:1078
+#: files.c:1089
 #, fuzzy, c-format
 msgid "File Name to %s"
 msgstr "Filnamn att skriva"

-#: files.c:1116
+#: files.c:1127
 msgid "File exists, OVERWRITE ?"
 msgstr "Filen existerar, SKRIVA ÖVER?"

-#: files.c:1598
+#: files.c:1609
 msgid "(more)"
 msgstr "(mer)"

-#: files.c:1911
+#: files.c:1922
 msgid "Can't move up a directory"
 msgstr "Kan inte gå upp en katalog"

 #. We can't open this dir for some reason.  Complain
-#: files.c:1921 files.c:1969
+#: files.c:1932 files.c:1980
 #, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "Kan inte öppna \"%s\": %s"

-#: files.c:1949 global.c:277
+#: files.c:1960 global.c:275
 #, fuzzy
 msgid "Goto Directory"
 msgstr "Gå till rad"

-#: files.c:1954
+#: files.c:1965
 #, fuzzy
 msgid "Goto Cancelled"
 msgstr "Avbruten"
@@ -210,301 +210,301 @@ msgstr ""
 msgid "Open next loaded file"
 msgstr ""

-#: global.c:238
+#: global.c:236
 msgid "Invoke the help menu"
 msgstr "Starta hjälpmenyn"

-#: global.c:239
+#: global.c:237
 msgid "Write the current file to disk"
 msgstr "Skriv den aktuella filen till disk"

-#: global.c:242
+#: global.c:240
 msgid "Close currently loaded file/Exit from nano"
 msgstr ""

-#: global.c:244
+#: global.c:242
 msgid "Exit from nano"
 msgstr "Avsluta nano"

-#: global.c:247
+#: global.c:245
 msgid "Goto a specific line number"
 msgstr "Gå till ett specifikt radnummer"

-#: global.c:248
+#: global.c:246
 msgid "Justify the current paragraph"
 msgstr "Justera det aktuella stycket"

-#: global.c:249
+#: global.c:247
 msgid "Unjustify after a justify"
 msgstr "Återställ en justering"

-#: global.c:250
+#: global.c:248
 msgid "Replace text within the editor"
 msgstr "Ersätt text inuti textredigeraren"

-#: global.c:251
+#: global.c:249
 msgid "Insert another file into the current one"
 msgstr "Infoga ytterligare en fil i den nuvarande"

-#: global.c:252
+#: global.c:250
 msgid "Search for text within the editor"
 msgstr "Sök efter text inuti textredigeraren"

-#: global.c:253
+#: global.c:251
 msgid "Move to the previous screen"
 msgstr "Gå till föregående skärm"

-#: global.c:254
+#: global.c:252
 msgid "Move to the next screen"
 msgstr "Gå till nästa skärm"

-#: global.c:255
+#: global.c:253
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Klipper ut den aktuella raden och lagrar den i urklippsbufferten"

-#: global.c:256
+#: global.c:254
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Klistra in från urklippsbufferten i aktuell rad"

-#: global.c:257
+#: global.c:255
 msgid "Show the position of the cursor"
 msgstr "Visa markörens position"

-#: global.c:258
+#: global.c:256
 msgid "Invoke the spell checker (if available)"
 msgstr "Starta stavningskontrollen (om tillgänglig)"

-#: global.c:259
+#: global.c:257
 msgid "Move up one line"
 msgstr "Gå upp en rad"

-#: global.c:260
+#: global.c:258
 msgid "Move down one line"
 msgstr "Gå ner en rad"

-#: global.c:261
+#: global.c:259
 msgid "Move forward one character"
 msgstr "Gå framåt ett tecken"

-#: global.c:262
+#: global.c:260
 msgid "Move back one character"
 msgstr "Gå bakåt ett tecken"

-#: global.c:263
+#: global.c:261
 msgid "Move to the beginning of the current line"
 msgstr "Gå till början på aktuell rad"

-#: global.c:264
+#: global.c:262
 msgid "Move to the end of the current line"
 msgstr "Gå till slutet på aktuell rad"

-#: global.c:265
+#: global.c:263
 msgid "Go to the first line of the file"
 msgstr "Gå till filens första rad"

-#: global.c:266
+#: global.c:264
 msgid "Go to the last line of the file"
 msgstr "Gå till filens sista rad"

-#: global.c:267
+#: global.c:265
 msgid "Refresh (redraw) the current screen"
 msgstr "Uppdatera (rita om) den aktuella skärmen"

-#: global.c:268
+#: global.c:266
 msgid "Mark text at the current cursor location"
 msgstr "Markera text vid aktuell markörposition"

-#: global.c:269
+#: global.c:267
 msgid "Delete the character under the cursor"
 msgstr "Ta bort tecknet under markören"

-#: global.c:271
+#: global.c:269
 msgid "Delete the character to the left of the cursor"
 msgstr "Ta bort tecknet till vänster om markören"

-#: global.c:272
+#: global.c:270
 msgid "Insert a tab character"
 msgstr "Infoga ett tabulatorsteg"

-#: global.c:273
+#: global.c:271
 msgid "Insert a carriage return at the cursor position"
 msgstr "Infoga en vagnretur vid markörpositionen"

-#: global.c:275
+#: global.c:273
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Gör den aktuella sökningen eller ersättningen skiftlägesokänslig"

-#: global.c:276
+#: global.c:274
 msgid "Go to file browser"
 msgstr "Gå til filbläddrare"

-#: global.c:278
+#: global.c:276
 msgid "Cancel the current function"
 msgstr "Avbryt den aktuella funktionen"

-#: global.c:279
+#: global.c:277
 #, fuzzy
 msgid "Append to the current file"
 msgstr "Gå till slutet på aktuell rad"

-#: global.c:280
+#: global.c:278
 #, fuzzy
 msgid "Search Backwards"
 msgstr "Sökningen avbruten"

-#: global.c:281
+#: global.c:279
 #, fuzzy
 msgid "Use Regular Expressions"
 msgstr "Reguljära uttryck"

 # kontrollera att den finns
-#: global.c:284
+#: global.c:282
 msgid "Get Help"
 msgstr "Få hjälp"

-#: global.c:289
+#: global.c:287
 msgid "Close"
 msgstr ""

-#: global.c:293 global.c:487 global.c:525
+#: global.c:291 global.c:490 global.c:528
 msgid "Exit"
 msgstr "Avsluta"

-#: global.c:296
+#: global.c:294
 msgid "WriteOut"
 msgstr "Spara"

-#: global.c:301 global.c:390
+#: global.c:299 global.c:388
 msgid "Justify"
 msgstr "Justera"

-#: global.c:305 global.c:311
+#: global.c:303 global.c:309
 msgid "Read File"
 msgstr "Läs fil"

-#: global.c:315 global.c:386 global.c:410
+#: global.c:313 global.c:384 global.c:408
 msgid "Replace"
 msgstr "Ersätt"

-#: global.c:319
+#: global.c:317
 msgid "Where Is"
 msgstr "Var finns"

-#: global.c:323 global.c:479 global.c:514
+#: global.c:321 global.c:482 global.c:517
 msgid "Prev Page"
 msgstr "Föreg sid"

-#: global.c:327 global.c:483 global.c:518
+#: global.c:325 global.c:486 global.c:521
 msgid "Next Page"
 msgstr "Nästa sid"

-#: global.c:331
+#: global.c:329
 msgid "Cut Text"
 msgstr "Klipp ut"

-#: global.c:335
+#: global.c:333
 msgid "UnJustify"
 msgstr "Ojustera"

-#: global.c:338
+#: global.c:336
 msgid "UnCut Txt"
 msgstr "Klist. in"

-#: global.c:342
+#: global.c:340
 msgid "Cur Pos"
 msgstr "Akt. pos"

-#: global.c:346
+#: global.c:344
 msgid "To Spell"
 msgstr "Stavkontr."

-#: global.c:350
+#: global.c:348
 msgid "Up"
 msgstr "Upp"

-#: global.c:353
+#: global.c:351
 msgid "Down"
 msgstr "Ner"

-#: global.c:356
+#: global.c:354
 msgid "Forward"
 msgstr "Framåt"

-#: global.c:359
+#: global.c:357
 msgid "Back"
 msgstr "Bakåt"

-#: global.c:362
+#: global.c:360
 msgid "Home"
 msgstr "Hem"

-#: global.c:365
+#: global.c:363
 msgid "End"
 msgstr "Slut"

-#: global.c:368
+#: global.c:366
 msgid "Refresh"
 msgstr "Uppdatera"

-#: global.c:371
+#: global.c:369
 msgid "Mark Text"
 msgstr "Markera text"

-#: global.c:374
+#: global.c:372
 msgid "Delete"
 msgstr "Ta bort"

-#: global.c:378
+#: global.c:376
 msgid "Backspace"
 msgstr "Backsteg"

-#: global.c:382
+#: global.c:380
 msgid "Tab"
 msgstr "Tabulator"

-#: global.c:394
+#: global.c:392
 msgid "Enter"
 msgstr "Enter"

-#: global.c:398 global.c:414 global.c:441
+#: global.c:396 global.c:412 global.c:442
 msgid "Goto Line"
 msgstr "Gå till rad"

-#: global.c:404 global.c:431 global.c:459 global.c:469
+#: global.c:402 global.c:432 global.c:462 global.c:472
 msgid "First Line"
 msgstr "Första raden"

-#: global.c:407 global.c:434 global.c:462 global.c:472
+#: global.c:405 global.c:435 global.c:465 global.c:475
 msgid "Last Line"
 msgstr "Sista raden"

-#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499
-#: global.c:507 global.c:510 global.c:528 winio.c:1239
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: global.c:420 global.c:447
+#: global.c:416 global.c:446
 msgid "Case Sens"
 msgstr "Skiftkänsl"

-#: global.c:423 global.c:450
+#: global.c:419 global.c:449
 #, fuzzy
 msgid "Backward"
 msgstr "Bakåt"

-#: global.c:427 global.c:454
+#: global.c:424 global.c:454
 msgid "Regexp"
 msgstr ""

-#: global.c:437
+#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502
+#: global.c:510 global.c:513 global.c:531 winio.c:1239
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: global.c:438
 msgid "No Replace"
 msgstr "Ingen ersättning"

-#: global.c:492 global.c:503
+#: global.c:495 global.c:506
 msgid "To Files"
 msgstr "Till filer"

-#: global.c:522
+#: global.c:525
 #, fuzzy
 msgid "Goto"
 msgstr "Gå till rad"
@@ -785,130 +785,130 @@ msgstr "Markering satt"
 msgid "Mark UNset"
 msgstr "Markering borttagen"

-#: nano.c:1105
+#: nano.c:1106
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap anropades med inptr->data=\"%s\"\n"

-#: nano.c:1157
+#: nano.c:1158
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data nu = \"%s\"\n"

-#: nano.c:1209
+#: nano.c:1210
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Efter, data = \"%s\"\n"

-#: nano.c:1310
+#: nano.c:1311
 msgid "Edit a replacement"
 msgstr "Redigera en ersättning"

-#: nano.c:1548
+#: nano.c:1549
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Kunde inte skapa ett temporärt filnamn: %s"

-#: nano.c:1554
+#: nano.c:1555
 msgid "Spell checking failed: unable to write temp file!"
 msgstr "Stavningskontroll misslyckades: kan inte skriva till temporärfil!"

-#: nano.c:1566
+#: nano.c:1567
 msgid "Finished checking spelling"
 msgstr "Stavningskontrollen slutfördes"

-#: nano.c:1568
+#: nano.c:1569
 msgid "Spell checking failed"
 msgstr "Stavningskontrollen misslyckades"

-#: nano.c:1597
+#: nano.c:1598
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Spara ändrad buffert (ATT SVARA \"Nej\" KOMMER ATT FÖRSTÖRA ÄNDRINGAR)? "

-#: nano.c:1733
+#: nano.c:1734
 msgid "Received SIGHUP"
 msgstr "Mottog SIGHUP"

-#: nano.c:1797
+#: nano.c:1798
 msgid "Cannot resize top win"
 msgstr "Kan inte ändra storlek på övre fönstret"

-#: nano.c:1799
+#: nano.c:1800
 msgid "Cannot move top win"
 msgstr "Kan inte flytta övre fönstret"

-#: nano.c:1801
+#: nano.c:1802
 msgid "Cannot resize edit win"
 msgstr "Kan inte ändra storlek på redigeringsfönstret"

-#: nano.c:1803
+#: nano.c:1804
 msgid "Cannot move edit win"
 msgstr "Kan inte flytta redigeringsfönstret"

-#: nano.c:1805
+#: nano.c:1806
 msgid "Cannot resize bottom win"
 msgstr "Kan inte ändra storlek på nedre fönstret"

-#: nano.c:1807
+#: nano.c:1808
 msgid "Cannot move bottom win"
 msgstr "Kan inte flytta nedre fönstret"

-#: nano.c:2132
+#: nano.c:2133
 msgid "Can now UnJustify!"
 msgstr "Kan ojustera nu!"

-#: nano.c:2248
+#: nano.c:2249
 #, c-format
 msgid "%s enable/disable"
 msgstr "%s aktivera/deaktivera"

-#: nano.c:2267
+#: nano.c:2268
 msgid "enabled"
 msgstr "aktiverad"

-#: nano.c:2268
+#: nano.c:2269
 msgid "disabled"
 msgstr "deaktiverad"

-#: nano.c:2321
+#: nano.c:2322
 msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 msgstr ""
 "NumLock-problem upptäcktes. Tangenterna kommer inte att fungera utan NumLock"

-#: nano.c:2576
+#: nano.c:2577
 msgid "Main: set up windows\n"
 msgstr "Main: konfigurera fönster\n"

-#: nano.c:2587
+#: nano.c:2588
 msgid "Main: bottom win\n"
 msgstr "Main: nedre fönstret\n"

-#: nano.c:2593
+#: nano.c:2594
 msgid "Main: open file\n"
 msgstr "Main: öppna fil\n"

-#: nano.c:2651
+#: nano.c:2652
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "Jag mottog Alt-O-%c! (%d)\n"

-#: nano.c:2678
+#: nano.c:2679
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "Jag mottog Alt-[-1-%c! (%d)\n"

-#: nano.c:2716
+#: nano.c:2717
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "Jag mottog Alt-[-2-%c! (%d)\n"

-#: nano.c:2770
+#: nano.c:2771
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Jag mottog Alt-[-%c! (%d)\n"

-#: nano.c:2805
+#: nano.c:2806
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Jag mottog Alt-%c! (%d)\n"
@@ -962,92 +962,92 @@ msgstr ""
 msgid "Unable to open ~/.nanorc file, %s"
 msgstr ""

-#: search.c:126
+#: search.c:129
 #, fuzzy
 msgid "Case Sensitive "
 msgstr "Skiftkänsl"

-#: search.c:127
+#: search.c:130
 msgid "Regexp "
 msgstr ""

-#: search.c:128
+#: search.c:131
 #, fuzzy
 msgid "Search"
 msgstr "Sök%s%s"

-#: search.c:129
+#: search.c:132
 msgid " Backwards"
 msgstr ""

-#: search.c:130
+#: search.c:133
 msgid " (to replace)"
 msgstr " (att ersätta)"

-#: search.c:135 search.c:399
+#: search.c:138 search.c:404
 msgid "Search Cancelled"
 msgstr "Sökningen avbruten"

-#: search.c:216
+#: search.c:221
 #, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s...\" kunde inte hittas"

-#: search.c:265 search.c:321
+#: search.c:270 search.c:326
 msgid "Search Wrapped"
 msgstr "Sökningen började om från början"

-#: search.c:421
+#: search.c:426
 #, c-format
 msgid "Replaced %d occurrences"
 msgstr "Ersatte %d förekomster"

-#: search.c:423
+#: search.c:428
 msgid "Replaced 1 occurrence"
 msgstr "Ersatte 1 förekomst"

-#: search.c:561 search.c:671 search.c:687
+#: search.c:566 search.c:676 search.c:692
 msgid "Replace Cancelled"
 msgstr "Ersättningen avbröts"

-#: search.c:611
+#: search.c:616
 msgid "Replace this instance?"
 msgstr "Ersätt denna förekomst?"

-#: search.c:623
+#: search.c:628
 msgid "Replace failed: unknown subexpression!"
 msgstr "Ersättningen misslyckades: okänt deluttryck!"

-#: search.c:712
+#: search.c:717
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Ersätt med [%s]"

-#: search.c:716 search.c:720
+#: search.c:721 search.c:725
 msgid "Replace with"
 msgstr "Ersätt med"

-#: search.c:754
+#: search.c:759
 msgid "Enter line number"
 msgstr "Ange radnummer"

-#: search.c:756
+#: search.c:761
 msgid "Aborted"
 msgstr "Avbruten"

-#: search.c:765
+#: search.c:770
 msgid "Come on, be reasonable"
 msgstr "Kom igen, var nu förståndig"

-#: utils.c:146
+#: utils.c:159
 msgid "nano: malloc: out of memory!"
 msgstr ""

-#: utils.c:160
+#: utils.c:173
 msgid "nano: calloc: out of memory!"
 msgstr ""

-#: utils.c:170
+#: utils.c:183
 msgid "nano: realloc: out of memory!"
 msgstr ""

--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.0.1\n"
-"POT-Creation-Date: 2001-07-14 18:56-0400\n"
+"POT-Creation-Date: 2001-07-28 19:55-0400\n"
 "PO-Revision-Date: 2001-04-10 18:40+0300\n"
 "Last-Translator: Sergey A. Ribalchenko <fisher@obu.ck.ua>\n"
 "Language-Team: Ukrainian <linux@lambada.rovno.ua>\n"
@@ -22,133 +22,133 @@ msgstr "add_to_cutbuffer
 msgid "Blew away cutbuffer =)\n"
 msgstr "cutbuffer ÚÄÕÔÏ ×¦ÔÒÏÍ =)\n"

-#: files.c:134
+#: files.c:145
 msgid "read_line: not on first line and prev is NULL"
 msgstr "read_line: ÎÅ ÎÁ ÐÅÒÛÏÍÕ ÒÑÄËÕ, ÔÁ ÝÅ Ê ÐÏÐÅÒÅÄÎ¦Ê ¤ NULL"

-#: files.c:196 files.c:214
+#: files.c:207 files.c:225
 #, c-format
 msgid "Read %d lines"
 msgstr "ðÒÏÞÉÔÁÎÏ %d ÒÑÄË¦×"

-#: files.c:232 search.c:210
+#: files.c:243 search.c:215
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" ÎÅ ÚÎÁÊÄÅÎÏ"

 #. We have a new file
-#: files.c:236
+#: files.c:247
 msgid "New File"
 msgstr "îÏ×ÉÊ ÆÁÊÌ"

-#: files.c:249
+#: files.c:260
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr "æÁÊÌ \"%s\" ¤ ÄÉÒÅËÔÏÒ¦¤À"

 #. Don't open character or block files.  Sorry, /dev/sndstat!
-#: files.c:252
+#: files.c:263
 #, c-format
 msgid "File \"%s\" is a device file"
 msgstr "æÁÊÌ \"%s\" ¤ ÆÁÊÌÏÍ ÐÒÉÓÔÒÏÀ"

-#: files.c:259
+#: files.c:270
 msgid "Reading File"
 msgstr "þÉÔÁ¤ÍÏ ÆÁÊÌ.."

-#: files.c:279
+#: files.c:290
 msgid "File to insert [from ./] "
 msgstr "æÁÊÌ ÄÏ ×ÓÔÁ×ËÉ [×¦Ä ./] "

-#: files.c:283 files.c:426 files.c:475 files.c:650 files.c:662 files.c:705
-#: files.c:716 files.c:1102
+#: files.c:294 files.c:437 files.c:486 files.c:661 files.c:673 files.c:716
+#: files.c:727 files.c:1113
 #, c-format
 msgid "filename is %s"
 msgstr "¦Í'Ñ ÆÁÊÌÕ ¤ %s"

-#: files.c:368 files.c:872 files.c:1187 nano.c:1629
+#: files.c:379 files.c:883 files.c:1198 nano.c:1630
 msgid "Cancelled"
 msgstr "óËÁÓÏ×ÁÎÏ"

-#: files.c:642 files.c:697
+#: files.c:653 files.c:708
 msgid "No more open files"
 msgstr ""

-#: files.c:920 files.c:936 files.c:950 files.c:967 files.c:974
+#: files.c:931 files.c:947 files.c:961 files.c:978 files.c:985
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ ÆÁÊÌ ÄÌÑ ÚÁÐÉÓÕ: %s"

-#: files.c:955
+#: files.c:966
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "úÁÐÉÓÁÎÏ >%s\n"

-#: files.c:983
+#: files.c:994
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "îÅ ÍÏÖÕ ÚÁÞÉÎÉÔÉ %s: %s"

 #. Try a rename??
-#: files.c:1006 files.c:1015 files.c:1020
+#: files.c:1017 files.c:1026 files.c:1031
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ %s ÄÌÑ ÚÁÐÉÓÕ: %s"

-#: files.c:1027
+#: files.c:1038
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "îÅ ÍÏÖÕ ×ÓÔÁÎÏ×ÉÔÉ ÐÒÁ×Á %o ÎÁ %s: %s"

-#: files.c:1034
+#: files.c:1045
 #, c-format
 msgid "Wrote %d lines"
 msgstr "úÁÐÉÓÁÎÏ %d ÒÑÄË¦×"

-#: files.c:1074
+#: files.c:1085
 #, c-format
 msgid "%s Selection to File"
 msgstr ""

-#: files.c:1074 files.c:1078 global.c:496
+#: files.c:1085 files.c:1089 global.c:499
 #, fuzzy
 msgid "Append"
 msgstr "ðÒÉÚÕÐÉÎÉÔÉ"

-#: files.c:1074 files.c:1078
+#: files.c:1085 files.c:1089
 #, fuzzy
 msgid "Write"
 msgstr "úÁÐÉÓÁÔÉ"

-#: files.c:1078
+#: files.c:1089
 #, fuzzy, c-format
 msgid "File Name to %s"
 msgstr "¶Í'Ñ ÆÁÊÌÕ ÄÏ ÚÁÐÉÓÕ"

-#: files.c:1116
+#: files.c:1127
 msgid "File exists, OVERWRITE ?"
 msgstr "æÁÊÌ ¦ÓÎÕ¤, ðåòåðéóõ´íï ?"

-#: files.c:1598
+#: files.c:1609
 msgid "(more)"
 msgstr "(ÄÁÌ¦)"

-#: files.c:1911
+#: files.c:1922
 msgid "Can't move up a directory"
 msgstr "îÅ ÍÏÖÕ ÐÅÒÅÍ¦ÓÔÉÔÉ ÄÉÒÅËÔÏÒ¦À"

 #. We can't open this dir for some reason.  Complain
-#: files.c:1921 files.c:1969
+#: files.c:1932 files.c:1980
 #, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ \"%s\": %s"

-#: files.c:1949 global.c:277
+#: files.c:1960 global.c:275
 #, fuzzy
 msgid "Goto Directory"
 msgstr "äÏ òÑÄËÁ"

-#: files.c:1954
+#: files.c:1965
 #, fuzzy
 msgid "Goto Cancelled"
 msgstr "óËÁÓÏ×ÁÎÏ"
@@ -210,303 +210,303 @@ msgstr ""
 msgid "Open next loaded file"
 msgstr ""

-#: global.c:238
+#: global.c:236
 msgid "Invoke the help menu"
 msgstr "÷ÉËÌÉËÁÔÉ ÍÅÎÀ ÄÏÐÏÍÏÇÉ"

-#: global.c:239
+#: global.c:237
 msgid "Write the current file to disk"
 msgstr "úÁÐÉÓÁÔÉ ÐÏÔÏÞÎÉÊ ÆÁÊÌ ÎÁ ÄÉÓË"

-#: global.c:242
+#: global.c:240
 msgid "Close currently loaded file/Exit from nano"
 msgstr ""

-#: global.c:244
+#: global.c:242
 msgid "Exit from nano"
 msgstr "÷ÉÈ¦Ä Ú nano"

-#: global.c:247
+#: global.c:245
 msgid "Goto a specific line number"
 msgstr "ðÅÒÅÊÔÉ ÄÏ ×ËÁÚÁÎÏÇÏ ÒÑÄËÁ"

-#: global.c:248
+#: global.c:246
 msgid "Justify the current paragraph"
 msgstr "÷ÉÒ¦×ÎÑÔÉ ÐÏÔÏÞÎÉÊ ÁÂÚÁÃ"

-#: global.c:249
+#: global.c:247
 msgid "Unjustify after a justify"
 msgstr "óËÁÓÕ×ÁÔÉ ÏÓÔÁÎÎ¤ ×ÉÒ¦×ÎÀ×ÁÎÎÑ"

-#: global.c:250
+#: global.c:248
 msgid "Replace text within the editor"
 msgstr "úÁÍ¦ÎÉÔÉ ÔÅËÓÔ Õ ÍÅÖÁÈ ÒÅÄÁËÔÏÒÁ"

-#: global.c:251
+#: global.c:249
 msgid "Insert another file into the current one"
 msgstr "÷ÓÔÁ×ÉÔÉ ¦ÎÛÉÊ ÆÁÊÌ ÄÏ ÐÏÔÏÞÎÏÇÏ"

-#: global.c:252
+#: global.c:250
 msgid "Search for text within the editor"
 msgstr "ûÕËÁÔÉ ÔÅËÓÔ × ÍÅÖÁÈ ÒÅÄÁËÔÏÒÕ"

-#: global.c:253
+#: global.c:251
 msgid "Move to the previous screen"
 msgstr "ðÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄØÏÇÏ ÅËÒÁÎÕ"

-#: global.c:254
+#: global.c:252
 msgid "Move to the next screen"
 msgstr "ðÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎÏÇÏ ÅËÒÁÎÕ"

-#: global.c:255
+#: global.c:253
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "÷ÉÒ¦ÚÁÔÉ ÐÏÔÏÞÎÉÊ ÒÑÄÏË ÔÁ ÐÏÍ¦ÓÔÉÔÉ ÊÏÇÏ ÄÏ cutbuffer'Õ"

-#: global.c:256
+#: global.c:254
 msgid "Uncut from the cutbuffer into the current line"
 msgstr ""
 "óËÁÓÕ×ÁÔÉ ×ÉÒ¦ÚÁÎÎÑ ÔÁ ×ÓÔÁ×ÉÔÉ ÚÍ¦ÓÔ cutbuffer'Õ\n"
 "\t\t\t ÄÏ ÐÏÔÏÞÎÏÇÏ ÒÑÄËÁ"

-#: global.c:257
+#: global.c:255
 #, fuzzy
 msgid "Show the position of the cursor"
 msgstr "ðÏËÁÚÁÔÉ ÐÏÚÉÃ¦À ËÕÒÓÏÒÁ"

-#: global.c:258
+#: global.c:256
 msgid "Invoke the spell checker (if available)"
 msgstr "÷ÉËÌÉËÁÔÉ ÐÒÏÇÒÁÍÕ ÐÏÛÕËÕ ÄÒÕËÁÒÓØËÉÈ ÐÏÍÉÌÏË (ÑËÝÏ ¤)"

-#: global.c:259
+#: global.c:257
 msgid "Move up one line"
 msgstr "ð¦ÄÎÑÔÉÓÑ ×ÇÏÒÕ ÎÁ ÏÄÉÎ ÒÑÄÏË"

-#: global.c:260
+#: global.c:258
 msgid "Move down one line"
 msgstr "ðÅÒÅÍ¦ÓÔÉÔÉÓÑ ÎÁ ÒÑÄÏË ÎÉÖÞÅ"

-#: global.c:261
+#: global.c:259
 msgid "Move forward one character"
 msgstr "÷ÐÅÒÅÄ ÎÁ ÏÄÎÕ ÌiÔÅÒÕ"

-#: global.c:262
+#: global.c:260
 msgid "Move back one character"
 msgstr "îÁÚÁÄ ÎÁ ÏÄÎÕ ÌiÔÅÒÕ"

-#: global.c:263
+#: global.c:261
 msgid "Move to the beginning of the current line"
 msgstr "ðÅÒÅÍiÓÔÉÔÉÓÑ ÄÏ ÐÏÞÁÔËÕ ÐÏÔÏÞÎÏÇÏ ÒÑÄËÁ"

-#: global.c:264
+#: global.c:262
 msgid "Move to the end of the current line"
 msgstr "ðÅÒÅÍiÓÔÉÔÉÓÑ ÎÁ ËiÎÅÃØ ÐÏÔÏÞÎÏÇÏ ÒÑÄËÁ"

-#: global.c:265
+#: global.c:263
 msgid "Go to the first line of the file"
 msgstr "ðÅÒÅÍiÓÔÉÔÉÓÑ ÄÏ ÐÅÒÛÏÇÏ ÒÑÄËÁ ÆÁÊÌÕ"

-#: global.c:266
+#: global.c:264
 msgid "Go to the last line of the file"
 msgstr "ðÅÒÅÍiÓÔÉÔÉÓÑ ÄÏ ÏÓÔÁÎØÏÇÏ ÒÑÄËÁ ÆÁÊÌÕ"

-#: global.c:267
+#: global.c:265
 msgid "Refresh (redraw) the current screen"
 msgstr "ðÅÒÅÍÁÌÀ×ÁÔÉ ÐÏÔÏÞÎÉÊ ÅËÒÁÎ"

-#: global.c:268
+#: global.c:266
 msgid "Mark text at the current cursor location"
 msgstr "ðÏÍ¦ÔÉÔÉ ÔÅËÓÔ Ð¦Ä ÐÏÔÏÞÎÏÀ ÐÏÚÉÃ¦¤À ËÕÒÓÏÒÁ"

-#: global.c:269
+#: global.c:267
 msgid "Delete the character under the cursor"
 msgstr "÷ÉÄÁÌÉÔÉ Ì¦ÔÅÒÕ Ð¦Ä ËÕÒÓÏÒÏÍ"

-#: global.c:271
+#: global.c:269
 msgid "Delete the character to the left of the cursor"
 msgstr "÷ÉÄÁÌÉÔÉ Ì¦ÔÅÒÕ ÚÌ¦×Á ×¦Ä ËÕÒÓÏÒÁ"

-#: global.c:272
+#: global.c:270
 msgid "Insert a tab character"
 msgstr "÷ÓÔÁ×ÉÔÉ ÓÉÍÂÏÌ ÔÁÂÕÌÑÃi§"

-#: global.c:273
+#: global.c:271
 msgid "Insert a carriage return at the cursor position"
 msgstr "÷ÓÔÁ×ÉÔÉ ÓÉÍÂÏÌ CR (ÐÏ×ÅÒÎÅÎÎÑ ÇÏÌ¦×ËÉ) × ÐÏÚ. ËÕÒÓÏÒÁ"

-#: global.c:275
+#: global.c:273
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "úÒÏÂÉÔÉ ÐÏÔÏÞÎÉÊ ÐÏÛÕË ÁÂÏ ÚÁÍ¦ÎÕ (ÎÅ)ÚÁÌÅÖÎÉÍ ×¦Ä ÒÅÇÉÓÔÒÕ Ì¦ÔÅÒ"

-#: global.c:276
+#: global.c:274
 msgid "Go to file browser"
 msgstr "äÏ ÐÅÒÅÇÌÑÄÁÞÁ ÆÁÊÌ¦×"

-#: global.c:278
+#: global.c:276
 msgid "Cancel the current function"
 msgstr "óËÁÓÕ×ÁÔÉ ÐÏÔÏÞÎÕ ÆÕÎËÃiÀ"

-#: global.c:279
+#: global.c:277
 #, fuzzy
 msgid "Append to the current file"
 msgstr "ðÅÒÅÍiÓÔÉÔÉÓÑ ÎÁ ËiÎÅÃØ ÐÏÔÏÞÎÏÇÏ ÒÑÄËÁ"

-#: global.c:280
+#: global.c:278
 #, fuzzy
 msgid "Search Backwards"
 msgstr "ðÏÛÕË ÓËÁÓÏ×ÁÎÏ"

-#: global.c:281
+#: global.c:279
 #, fuzzy
 msgid "Use Regular Expressions"
 msgstr "æÏÒÍÁÌØÎ¦ ×ÉÒÁÚÉ (regexp)"

-#: global.c:284
+#: global.c:282
 msgid "Get Help"
 msgstr "äÏÐÏÍÏÇÁ"

-#: global.c:289
+#: global.c:287
 msgid "Close"
 msgstr ""

-#: global.c:293 global.c:487 global.c:525
+#: global.c:291 global.c:490 global.c:528
 msgid "Exit"
 msgstr "÷ÉÈiÄ"

-#: global.c:296
+#: global.c:294
 msgid "WriteOut"
 msgstr "úÁÐÉÓÁÔÉ"

-#: global.c:301 global.c:390
+#: global.c:299 global.c:388
 msgid "Justify"
 msgstr "÷ÉÒ¦×ÎÀ×ÁÎÎÑ"

-#: global.c:305 global.c:311
+#: global.c:303 global.c:309
 msgid "Read File"
 msgstr "þÉÔ. æÁÊÌ"

-#: global.c:315 global.c:386 global.c:410
+#: global.c:313 global.c:384 global.c:408
 msgid "Replace"
 msgstr "úÁÍ¦ÎÁ"

-#: global.c:319
+#: global.c:317
 msgid "Where Is"
 msgstr "ðÏÛÕË"

-#: global.c:323 global.c:479 global.c:514
+#: global.c:321 global.c:482 global.c:517
 msgid "Prev Page"
 msgstr "ðÏÐÅÒÅÄÎÑ"

-#: global.c:327 global.c:483 global.c:518
+#: global.c:325 global.c:486 global.c:521
 msgid "Next Page"
 msgstr "îÁÓÔÕÐÎÁ"

-#: global.c:331
+#: global.c:329
 msgid "Cut Text"
 msgstr "÷ÉÒ¦ÚÁÔÉ"

-#: global.c:335
+#: global.c:333
 msgid "UnJustify"
 msgstr "óËÁÓ÷ÉÒ¦×Î"

-#: global.c:338
+#: global.c:336
 msgid "UnCut Txt"
 msgstr "óËÁÓ÷ÉÒ¦Ú"

-#: global.c:342
+#: global.c:340
 msgid "Cur Pos"
 msgstr "ðÏÚÉÃ¦Ñ"

-#: global.c:346
+#: global.c:344
 msgid "To Spell"
 msgstr "ðÒÁ×ÏÐÉÓ"

-#: global.c:350
+#: global.c:348
 msgid "Up"
 msgstr "÷ÇÏÒÕ"

-#: global.c:353
+#: global.c:351
 msgid "Down"
 msgstr "÷ÎÉÚ"

-#: global.c:356
+#: global.c:354
 msgid "Forward"
 msgstr "÷ÐÅÒÅÄ"

-#: global.c:359
+#: global.c:357
 msgid "Back"
 msgstr "îÁÚÁÄ"

-#: global.c:362
+#: global.c:360
 msgid "Home"
 msgstr "ðÏÞÁÔÏË"

-#: global.c:365
+#: global.c:363
 msgid "End"
 msgstr "ë¦ÎÅÃØ"

-#: global.c:368
+#: global.c:366
 msgid "Refresh"
 msgstr "ðÅÒÅÍÁÌÀ×ÁÔÉ"

-#: global.c:371
+#: global.c:369
 msgid "Mark Text"
 msgstr "ðÏÍ¦ÔÉÔÉ"

-#: global.c:374
+#: global.c:372
 msgid "Delete"
 msgstr "÷ÉÄÁÌÉÔÉ"

-#: global.c:378
+#: global.c:376
 msgid "Backspace"
 msgstr "úÁÂ¦Ê"

-#: global.c:382
+#: global.c:380
 msgid "Tab"
 msgstr "ôÁÂÕÌÑÃ¦Ñ"

-#: global.c:394
+#: global.c:392
 msgid "Enter"
 msgstr "÷×ÏÄ"

-#: global.c:398 global.c:414 global.c:441
+#: global.c:396 global.c:412 global.c:442
 msgid "Goto Line"
 msgstr "äÏ òÑÄËÁ"

-#: global.c:404 global.c:431 global.c:459 global.c:469
+#: global.c:402 global.c:432 global.c:462 global.c:472
 msgid "First Line"
 msgstr "ðÅÒÛÉÊ òÑÄÏË"

-#: global.c:407 global.c:434 global.c:462 global.c:472
+#: global.c:405 global.c:435 global.c:465 global.c:475
 msgid "Last Line"
 msgstr "ïÓÔÁÎÎ¦Ê òÑÄÏË"

-#: global.c:417 global.c:444 global.c:465 global.c:475 global.c:499
-#: global.c:507 global.c:510 global.c:528 winio.c:1239
-msgid "Cancel"
-msgstr "óËÁÓÕ×ÁÔÉ"
-
-#: global.c:420 global.c:447
+#: global.c:416 global.c:446
 msgid "Case Sens"
 msgstr "òÅÇúÁÌÅÖ"

-#: global.c:423 global.c:450
+#: global.c:419 global.c:449
 #, fuzzy
 msgid "Backward"
 msgstr "îÁÚÁÄ"

-#: global.c:427 global.c:454
+#: global.c:424 global.c:454
 msgid "Regexp"
 msgstr ""

-#: global.c:437
+#: global.c:429 global.c:459 global.c:468 global.c:478 global.c:502
+#: global.c:510 global.c:513 global.c:531 winio.c:1239
+msgid "Cancel"
+msgstr "óËÁÓÕ×ÁÔÉ"
+
+#: global.c:438
 msgid "No Replace"
 msgstr "îÅ úÁÍ¦ÝÁÔÉ"

-#: global.c:492 global.c:503
+#: global.c:495 global.c:506
 msgid "To Files"
 msgstr "äÏ æÁÊÌ¦×"

-#: global.c:522
+#: global.c:525
 #, fuzzy
 msgid "Goto"
 msgstr "äÏ òÑÄËÁ"
@@ -787,128 +787,128 @@ msgstr "
 msgid "Mark UNset"
 msgstr "í¦ÔËÕ ÚÎÑÔÏ"

-#: nano.c:1105
+#: nano.c:1106
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap ×ÉÚ×ÁÎÏ Ú inptr->data=\"%s\"\n"

-#: nano.c:1157
+#: nano.c:1158
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data ÚÁÒÁÚ = \"%s\"\n"

-#: nano.c:1209
+#: nano.c:1210
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "ð¦ÓÌÑ, ÄÁÎ¦ = \"%s\"\n"

-#: nano.c:1310
+#: nano.c:1311
 msgid "Edit a replacement"
 msgstr "òÅÄÁÇÕ×ÁÔÉ ÚÁÍ¦ÎÕ"

-#: nano.c:1548
+#: nano.c:1549
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "îÅ ÍÏÖÕ ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×Õ ÎÁÚ×Õ ÄÌÑ ÆÁÊÌÕ: %s"

-#: nano.c:1554
+#: nano.c:1555
 msgid "Spell checking failed: unable to write temp file!"
 msgstr "ðÅÒÅ×¦ÒËÁ ÏÒÆÏÇÒÁÆ¦§ ÎÅ ×ÄÁÌÁÓÑ: ÎÅÍÏÖÌÉ×Ï ÚÁÐÉÓÁÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ!"

-#: nano.c:1566
+#: nano.c:1567
 msgid "Finished checking spelling"
 msgstr "ðÅÒÅ×¦ÒËÕ ÏÒÆÏÇÒÁÆ¦§ ÚÁ×ÅÒÛÅÎÏ"

-#: nano.c:1568
+#: nano.c:1569
 msgid "Spell checking failed"
 msgstr "ðÅÒÅ×¦ÒËÁ ÏÒÆÏÇÒÁÆ¦§ ÎÅ ×ÄÁÌÁÓÑ"

-#: nano.c:1597
+#: nano.c:1598
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "úÂÅÒÅÇÔÉ ÚÍ¦ÎÅÎÉÊ ÂÕÆÅÒ (÷¦ÄÐÏ×¦ÄØ \"î¦\" óëáóõ´ ÷ó¶ úí¶îé) ? "

-#: nano.c:1733
+#: nano.c:1734
 msgid "Received SIGHUP"
 msgstr "ðÒÉÊÎÑÔÏ SIGHUP"

-#: nano.c:1797
+#: nano.c:1798
 msgid "Cannot resize top win"
 msgstr "îÅ ÍÏÖÕ ÚÍ¦ÎÉÔÉ ÒÏÚÍ¦Ò ×ÅÒÈÎØÏÇÏ ×¦ËÎÁ"

-#: nano.c:1799
+#: nano.c:1800
 msgid "Cannot move top win"
 msgstr "îÅ ÍÏÖÕ ÐÅÒÅÍ¦ÓÔÉÔÉ ×ÅÒÈÎØÏÇÏ ×¦ËÎÏ"

-#: nano.c:1801
+#: nano.c:1802
 msgid "Cannot resize edit win"
 msgstr "îÅ ÍÏÖÕ ÚÍ¦ÎÉÔÉ ÒÏÚÍ¦Ò ×¦ËÎÁ ÒÅÄÁÇÕ×ÁÎÎÑ"

-#: nano.c:1803
+#: nano.c:1804
 msgid "Cannot move edit win"
 msgstr "îÅ ÍÏÖÕ ÐÅÒÅÍ¦ÓÔÉÔÉ ×¦ËÎÏ ÒÅÄÁÇÕ×ÁÎÎÑ"

-#: nano.c:1805
+#: nano.c:1806
 msgid "Cannot resize bottom win"
 msgstr "îÅ ÍÏÖÕ ÚÍ¦ÎÉÔÉ ÒÏÚÍ¦Ò ÎÉÖÎØÏÇÏ ×¦ËÎÁ"

-#: nano.c:1807
+#: nano.c:1808
 msgid "Cannot move bottom win"
 msgstr "îÅ ÍÏÖÕ ÐÅÒÅÍ¦ÓÔÉÔÉ ÎÉÖÎ¤ ×¦ËÎÏ"

-#: nano.c:2132
+#: nano.c:2133
 msgid "Can now UnJustify!"
 msgstr "íÏÖÕ ÚÁÒÁÚ ÖÅ óËÁÓ÷ÉÒ¦×ÎÀ×ÁÎÎÑ!"

-#: nano.c:2248
+#: nano.c:2249
 #, c-format
 msgid "%s enable/disable"
 msgstr "%s - ÄÏÚ×ÏÌÉÔÉ/ÚÁÂÏÒÏÎÉÔÉ"

-#: nano.c:2267
+#: nano.c:2268
 msgid "enabled"
 msgstr "ÄÏÚ×ÏÌÅÎÏ"

-#: nano.c:2268
+#: nano.c:2269
 msgid "disabled"
 msgstr "ÚÁÂÏÒÏÎÅÎÏ"

-#: nano.c:2321
+#: nano.c:2322
 msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 msgstr "ÐÏÍ¦ÞÅÎÏ ÇÌÀË NumLock'Á. äÏÄÁÔËÏ×Á ËÌÁ×¦ÁÔÕÒÁ ÍÏÖÅ ÎÅ ÐÒÁÃÀ×ÁÔÉ"

-#: nano.c:2576
+#: nano.c:2577
 msgid "Main: set up windows\n"
 msgstr "Main: ×ÓÔÁÎÏ×ÉÔÉ ×¦ËÎÁ\n"

-#: nano.c:2587
+#: nano.c:2588
 msgid "Main: bottom win\n"
 msgstr "Main: ÎÉÖÎ¤ ×¦ËÎÏ\n"

-#: nano.c:2593
+#: nano.c:2594
 msgid "Main: open file\n"
 msgstr "Main: ×¦ÄËÒÉÔÉ ÆÁÊÌ\n"

-#: nano.c:2651
+#: nano.c:2652
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "ñ Ð¦ÊÍÁ× Alt-O-%c! (%d)\n"

-#: nano.c:2678
+#: nano.c:2679
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "ñ Ð¦ÊÍÁ× Alt-[-1-%c! (%d)\n"

-#: nano.c:2716
+#: nano.c:2717
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "ñ Ð¦ÊÍÁ× Alt-[-2-%c! (%d)\n"

-#: nano.c:2770
+#: nano.c:2771
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "ñ Ð¦ÊÍÁ× Alt-[-%c! (%d)\n"

-#: nano.c:2805
+#: nano.c:2806
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "ñ Ð¦ÊÍÁ× Alt-%c! (%d)\n"
@@ -962,92 +962,92 @@ msgstr ""
 msgid "Unable to open ~/.nanorc file, %s"
 msgstr ""

-#: search.c:126
+#: search.c:129
 #, fuzzy
 msgid "Case Sensitive "
 msgstr "òÅÇúÁÌÅÖ"

-#: search.c:127
+#: search.c:130
 msgid "Regexp "
 msgstr ""

-#: search.c:128
+#: search.c:131
 #, fuzzy
 msgid "Search"
 msgstr "ðÏÛÕË%s%s"

-#: search.c:129
+#: search.c:132
 msgid " Backwards"
 msgstr ""

-#: search.c:130
+#: search.c:133
 msgid " (to replace)"
 msgstr " (ÄÏ ÚÁÍ¦ÎÉ)"

-#: search.c:135 search.c:399
+#: search.c:138 search.c:404
 msgid "Search Cancelled"
 msgstr "ðÏÛÕË ÓËÁÓÏ×ÁÎÏ"

-#: search.c:216
+#: search.c:221
 #, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s...\" ÎÅ ÚÎÁÊÄÅÎÏ"

-#: search.c:265 search.c:321
+#: search.c:270 search.c:326
 msgid "Search Wrapped"
 msgstr "ðÏÛÕË úÁÇÏÒÎÕÔÏ"

-#: search.c:421
+#: search.c:426
 #, c-format
 msgid "Replaced %d occurrences"
 msgstr "úÁÍ¦ÎÅÎÏ %d ×ÈÏÄÖÅÎØ"

-#: search.c:423
+#: search.c:428
 msgid "Replaced 1 occurrence"
 msgstr "úÁÍ¦ÎÅÎÏ 1 ×ÈÏÄÖÅÎÎÑ"

-#: search.c:561 search.c:671 search.c:687
+#: search.c:566 search.c:676 search.c:692
 msgid "Replace Cancelled"
 msgstr "úÁÍ¦ÎÕ ÓËÁÓÏ×ÁÎÏ"

-#: search.c:611
+#: search.c:616
 msgid "Replace this instance?"
 msgstr "úÁÍ¦ÎÉÔÉ ÃÅÊ ÐÒÉÍ¦ÒÎÉË?"

-#: search.c:623
+#: search.c:628
 msgid "Replace failed: unknown subexpression!"
 msgstr "úÁÍ¦ÎÁ ÎÅ×ÄÁÌÁ: ÎÅÚÎÁÊÏÍÉÊ Ð¦Ä×ÉÒÁÚ!"

-#: search.c:712
+#: search.c:717
 #, c-format
 msgid "Replace with [%s]"
 msgstr "úÁÍ¦ÎÉÔÉ ÎÁ [%s]"

-#: search.c:716 search.c:720
+#: search.c:721 search.c:725
 msgid "Replace with"
 msgstr "úÁÍ¦ÎÉÔÉ ÎÁ"

-#: search.c:754
+#: search.c:759
 msgid "Enter line number"
 msgstr "÷×ÅÄ¦ÔØ ÎÏÍÅÒ ÒÑÄËÁ"

-#: search.c:756
+#: search.c:761
 msgid "Aborted"
 msgstr "ðÒÅÒ×ÁÎÏ"

-#: search.c:765
+#: search.c:770
 msgid "Come on, be reasonable"
 msgstr "çÅÊ, ÂÕÄØÔÅ Á×ÔÏÔÅÎÔÉÞÎ¦"

-#: utils.c:146
+#: utils.c:159
 msgid "nano: malloc: out of memory!"
 msgstr ""

-#: utils.c:160
+#: utils.c:173
 msgid "nano: calloc: out of memory!"
 msgstr ""

-#: utils.c:170
+#: utils.c:183
 msgid "nano: realloc: out of memory!"
 msgstr ""

--- a/rcfile.c
+++ b/rcfile.c
@@ -61,7 +61,7 @@ rcoption rcopts[NUM_RCOPTS] =
 {"nowrap", NO_WRAP}, 
 {"nohelp", NO_HELP}, 
 {"suspend", SUSPEND},
-{"loadoninsert", LOADONINSERT}};
+{"multibuffer", MULTIBUFFER}};

 /* We have an error in some part of the rcfile; put it on stderr and
  make the user hit return to continue starting up nano */
--- a/search.c
+++ b/search.c
@@ -72,10 +72,13 @@ void search_init_globals(void)
 */
 int search_init(int replacing)
 {
-    int i = 0, j;
+    int i = 0;
    char *buf;
    char *prompt;
    static char *backupstring = NULL;
+#ifndef NANO_SMALL
+    int j;
+#endif

    search_init_globals();

@@ -170,9 +173,11 @@ int search_init(int replacing)
 	backupstring = NULL;
 	backupstring = mallocstrcpy(backupstring, answer);

+#ifndef NANO_SMALL
 	for (j = 0; j <= TOGGLE_LEN - 1; j++)
 	    if (i == toggles[j].val)
 		TOGGLE(toggles[j].flag);
+#endif

 	return 1;
    case NANO_OTHERSEARCH_KEY:
--- a/utils.c
+++ b/utils.c
@@ -47,6 +47,8 @@ void lowercase(char *src)
    }
 }

+/* None of this is needed if we're using NANO_SMALL! */
+#ifndef NANO_SMALL
 char *revstrstr(char *haystack, char *needle, char *rev_start)
 {
    char *p, *q, *r;
@@ -72,6 +74,7 @@ char *revstrcasestr(char *haystack, char *needle, char *rev_start)
    }
    return 0;
 }
+#endif /* NANO_SMALL */

 /* This is now mutt's version (called mutt_stristr) because it doesn't
   use memory allocation to do a simple search (yuck). */
@@ -103,11 +106,13 @@ char *strstrwrapper(char *haystack, char *needle, char *rev_start)
    char *i, *j;

    if (ISSET(USE_REGEXP)) {
+#ifndef NANO_SMALL
 	if (!ISSET(REVERSE_SEARCH)) {
 	    result = regexec(&search_regexp, haystack, 10, regmatches, 0);
 	    if (!result)
 		return haystack + regmatches[0].rm_so;
 	} else {
+#endif
 	    /* do quick check first */
 	    if (!(regexec(&search_regexp, haystack, 10, regmatches, 0))) {
 		/* there is a match */
@@ -117,21 +122,29 @@ char *strstrwrapper(char *haystack, char *needle, char *rev_start)
 			if (j <= rev_start)
 			    return j;
 		    }
+
 	    }
+#ifndef NANO_SMALL
 	}
+#endif
 	return 0;
    }
 #endif
    if (ISSET(CASE_SENSITIVE)) {
-	if (!ISSET(REVERSE_SEARCH))
-	    return strstr(haystack,needle);
-        else
+#ifndef NANO_SMALL
+	if (ISSET(REVERSE_SEARCH))
 	    return revstrstr(haystack, needle, rev_start);
+        else
+#endif
+	    return strstr(haystack,needle);
+
    } else {
-	if (!ISSET(REVERSE_SEARCH))
-	    return strcasestr(haystack, needle);
-	else
+#ifndef NANO_SMALL
+	if (ISSET(REVERSE_SEARCH))
 	    return revstrcasestr(haystack, needle, rev_start);
+	else
+#endif
+	    return strcasestr(haystack, needle);
    }
 }

--- a/winio.c
+++ b/winio.c
@@ -607,7 +607,7 @@ void bottombars(shortcut s[], int slen)
    clear_bottomwin();
    wmove(bottomwin, 1, 0);

-    for (i = 0; i <= slen - 2; i += 2) {
+    for (i = 0; i <= slen - 1; i += 2) {

 	if (s[i].val < 97)
 	    snprintf(keystr, 10, "^%c", s[i].val + 64);
Author	SHA1	Message	Date
Chris Allegretta	0e8c8d8cdc	GNU nano 1.1.1 release git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@740 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2001-07-29 01:16:27 +00:00
Chris Allegretta	41ed01632f	do_mark() - Temporarily disable cursorpos when enabled to be able to see the mark (un)set message (Ken Tyler) git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@739 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2001-07-24 00:21:03 +00:00
Chris Allegretta	4839d23b11	Spelling fixes by DLR git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@738 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2001-07-19 22:03:51 +00:00
Chris Allegretta	279aaa9bdb	Deleted the old files we didn't need for old gettext git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@737 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2001-07-19 12:26:56 +00:00
Chris Allegretta	ef8f98d0c8	Reverted to gettext 0.10.35 in intl/ added m4/ directory to allow system independent rebuild of configure stuff git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@736 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2001-07-19 12:24:17 +00:00
Chris Allegretta	e642197ff7	new_file() and close_open_file() fixes by DLR git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@735 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2001-07-18 01:03:36 +00:00
Chris Allegretta	5cce53b5a8	do_writeout() - Check for open_files == NULL before using it (Ryan Krebs) git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@734 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2001-07-17 10:42:50 +00:00
Chris Allegretta	5f36c3760f	Fixes for the nano.h #defines, shortcut_init() lists and search.c reverse search stuff when NANO_SMALL is used git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@733 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2001-07-16 00:48:53 +00:00
Chris Allegretta	f372bd9f8c	nano.h: - Fix type in INSERTFILE_LIST_LEN. && search_init() - add #ifdef NANO_SMALL around toggles code. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@732 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2001-07-15 22:24:24 +00:00
Chris Allegretta	307d4c8f6b	Many multibuffer fixes by DLR git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@731 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2001-07-15 20:25:33 +00:00
Chris Allegretta	47f77b4715	Back to CVS git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@730 35c25a1d-7b9e-4130-9fde-d3aeb78583b8	2001-07-15 16:13:18 +00:00