official 0.9.14 sync

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

BUGS

@@ -1,13 +1,7 @@
-- Marked cutting sometimes leaves a newline in the file unintelligently,
-  such as when all of a line is selected but the mark doesn't proceed to
-  the new line. (8) { Is this an issue? compare to pico 3.5 }
 - Certains are not lined up properly when there are tabs in them at 
   certain col values. (9) [FIXED]
 - edit_refresh() and update_line() do not handle selecting text when the
   cursor is beyond COLS (10) [FIXED]
-- no way to do a replace with the empty string. (11)
-- Spelling support is not elegant like pico's integration of the 'spell'
-  program.  Nano only uses ispell (for now) (12)
 - Moving to the end of a line when close to a multiple of COLS and at
   least COLS * 2 does not make the screen jump early like it would for
   if we were around COLS (bugs in edit_refresh, update_line) (13)
@@ -17,19 +11,14 @@
   (14) [FIXED, mostly]
 - Doing a replacement of a substring of the replace string (e.g. replacing
   "ed" with "fred" causes an infinite loop. (15) [FIXED]
-- Cutting a file with marked text and both marker ends on the same line
-  causes a random segfault (16)
 - Cutting more than one line resets the KEEP_CUTBUFFER flag in 0.9.3
   Error is in bitwise assignment (nano.h). (17) [FIXED]
 - The wrapping code does not work right for lines like the following:
  *                                                                     *
-  Error is in do_wrap, must be rewritten (18).
-- Wrapping a line with autoindent mode sometimes causes a segfault (19).
+  Error is in do_wrap, must be rewritten. (18) [FIXED]
 - Nano fails to follow symlinks, even though -l isn't being used (20).
   [Bug in global flag init, FIXED]
 - When using --help or --version, the SIGINT character gets lost. (21) [FIXED]
-- When inserting files, the display sometimes fails to display properly
-  until a pageup/down occurs (22).
 - edit_refresh() and update_line() (and related functions), have 
   trouble when a tab is the character that is the boundry at COLS (23) [FIXED]
 - there is an off-by-one error in keeping track of totsize.  It is caused
@@ -37,4 +26,33 @@
   but we do not, in fact, display this newline.  This should go away
   implicitly when the "Magic Line" returns, but it is noted here for
   documentation's sake. (24) [FIXED]
-- totsize becomes incorrect after word-wrapping (25)
+- In replace with completely adjacent strings, every other search string
+  will be missed (try replace ':' in a string like ':::::::::') (28) [FIXED]
+- If nano opens a read-only file with the --tempfile option, and a change
+  is made to the buffer, and a write is attempted, nano will not give you
+  a dialog about not being able to write the file, and it will not let the
+  user exit (29, discovered by Joshua Jensen) [FIXED]
+- Using nano -k, marked text is not cut properly. (31) [FIXED]
+- Invoking -t or -k has the effect of invoking both option. (32) [FIXED]
+- totsize becomes incorrect after word-wrapping (25) [FIXED]
+- Wrapping a line with autoindent mode sometimes causes a segfault (19)[FIXED]
+- When inserting files, the display sometimes fails to display properly
+  until a pageup/down occurs (22)[FIXED]
+- Using nano -t, user can not exit until a filename is given via ^O. (30)
+ [FIXED]
+
+** Open BUGS **
+
+- Marked cutting sometimes leaves a newline in the file unintelligently,
+  such as when all of a line is selected but the mark doesn't proceed to
+  the new line. (8) { Is this an issue? compare to pico 3.5 }
+- no way to do a replace with the empty string. (11)
+- Spelling support is not elegant like pico's integration of the 'spell'
+  program.  Nano only uses ispell (for now) (12)
+- Cutting a file with marked text and both marker ends on the same line
+  causes a random segfault (16)
+- In search/replace code there is too much refreshing in bottomwin (26)
+- In replace, there is no way to accept the default replace string. (27)
+- totsize problems still abound in do_justify (33)
+- Using -k cut text is not pasted properly. (34) [FIXED, mostly].
+- Using -k pasted text is not updated properly if it goes beyond editbot. (35)

ChangeLog

@@ -1,3 +1,73 @@
+nano-0.9.14 - 07/27/2000
+- nano.h:
+	- Set CUT_TO_END to a different bit than TEMP_OPT.  Fixes bug #32.
+- cut.c:
+  do_cut_text()
+	- Added check for MARK_ISSET when using CUT_TO_END.  Fixes bug #31.
+	- Simplified check for freeing cutbuffer.  Added checks for doing
+	  multiple cuts with -k, now sets marked_cut to 2 for later
+	  processing by do_uncut_text().
+  do_uncut_text()
+	- Added handler for uncutting with -k cuts.
+- files.c:
+  write_file()
+	- Removed (redundant) check for writing out files with -t.
+  do_writeout()
+	- Changed check for filename to filename[0].  Added some code, 
+	  overall fixes bug #30 =-)
+- nano.c:
+  do_justify() & do_wrap():
+	- totsize-related fixes (Rob)
+- de.po 
+	- Revised translations by floki@bigfoot.com
+
+nano-0.9.13 - 07/23/2000
+- Implemented Pico's -k mode.  New flag CUT_TO_END, option (-k, --cut), 
+  affects do_cut_text in cut.c.  Not available with SMALL_NANO because it
+  depends on the marker code which is not available with that setting.
+- Changed static temp_opt to flag TEMP_OPT.  Fixed bug #29 (using
+  -t with an unwritable file causes users to get locked into editor).
+- move.c
+  page_down()
+	- Don't edit_refresh() if the bottom of the file is in the edit
+	  buffer. (Adam)
+- nano.c:
+  main():
+	- TABSIZE now set before first call to edit_refresh (Bill Soudan)
+	- Different ^C kill code (patch by Christian Weisgerber).
+  die():
+	- More intelligent emergency-save filename selection (Rob)
+  do_spell():
+	- Changed exit semantincs a bit so that aspell wouldn't get
+	  all screwy (bug disovered by Joshua Jensen.
+- files.c:
+  read_file():
+	- Added init of buf variable, hopefully this will stop the 
+	  "bleeding" of text seen with mutt and using i18n.
+  write_file():
+	- Added code to check to see if using -l and the file is not
+	  in fact a link.  This should fix the behavior where a file
+	  that does not have write permission but could be removed and
+	  rewritten is saved without error.  Please test this feature
+	  and give feedback.
+- search.c:
+  search_init():
+	- Added " (to replace)" statement to end of search string if 
+	  we are doing a replace.  Manually converted all the translations
+	  from '%s' to '%s%s' to ensure they still work with the new code.
+	  Also put in the translation for " (replace)" in the .po's.  Hope
+	  I didn't step on your toes doing this Jordi. (Chris)
+  do_search(), do_replace():
+	- Removed call to search_abort()/replace_abort() before call to
+	  the opposite function.
+	- Fixed bug #28.
+  findnextstr()
+	- do not center string found if it is currently visable. (Adam)
+- fr.po:
+	- French update by Clement Laforet <clem_laf@wanadoo.fr>.
+- es.po:
+	- Updated strings to 0.9.13 (Jordi).
+
 nano-0.9.12 - 07/07/2000
 - all:
 	- New regexp search feature by Bill Soudan.  New flags USE_REGEXP

Makefile.am

@@ -14,7 +14,8 @@ man_MANS = nano.1
 nano_LDADD = @INTLLIBS@
 
 EXTRA_DIST =	AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README \
-		TODO install-sh missing mkinstalldirs nano.1 nano.1.html
+		TODO install-sh missing mkinstalldirs nano.1 nano.1.html \
+		faq.html
 
 SUBDIRS = po intl
 

Makefile.in

@@ -94,7 +94,7 @@ nano_SOURCES = cut.c 		files.c 		global.c 		move.c 		nano.c 		nano.h 		proto.h
 man_MANS = nano.1
 nano_LDADD = @INTLLIBS@
 
-EXTRA_DIST = AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README 		TODO install-sh missing mkinstalldirs nano.1 nano.1.html
+EXTRA_DIST = AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README 		TODO install-sh missing mkinstalldirs nano.1 nano.1.html 		faq.html
 
 
 SUBDIRS = po intl

NEWS

@@ -1,3 +1,22 @@
+07/27/2000 - Nano 0.9.14 is officially the "13 is so unlucky it should
+		be skipped as a version number" release.  One typo
+		caused unending problems (calling nano with either -t or
+		-k caused both flags to be used). The -k code is also now
+		closer in functionality to Pico's -k mode, please
+		note that this code is not finished yet.  Working on this
+		code has made me realize that there is not enough 
+		abstraction in the code, and I will be working on that
+		for the next release.  Until then, have fun with this
+		version.
+
+07/23/2000 - Nano 0.9.13 has a few new bits and bobs, most notably the
+		-k option from Pico (cut to end of line).  The majority
+		of changes in this release are bugfixes however, including
+		the usual display fixes and fixes for writing to symbolic
+		links and un-writeable files.  Barring any other major 
+		changes, this should be the feature set for nano 1.0,
+		whenever it might be released =-)
+
 07/07/2000 - Nano 0.9.12 (The "lucky day" release) is bursting with new
 		features, bug fixes, and yummy fruit flavor.  For
 		changes, the alternate replace keystroke ^W^T is now

TODO

@@ -1,14 +1,19 @@
 TODO file (? means the feature may be implemented, but not definitely)
 -----------------------------------------------------------------------------
 
+Current Version:
 - Implement Spelling [DONE, mostly...]
 - Implement Help [DONE]
 - Internationalization [In progress, translators welcome!]
 - Allow nano to be resized in X. [DONE]
-- Color syntax highlighting? (certainly seems like there's a demand for it.)
 - On page up/down, put the cursor on the first line (like Pico), not the
   center line [DONE]
+- Rewrite edit_refresh, if at all possible [DONE]
+- Implement justify function [DONE]
+- Cut to end of line [DONE]
+
+For Next Version:
 - Undo/Redo key?
 - single line scroll up/down?
-- Rewrite edit_refresh, if at all possible [In progress]
-- Implement justify function [DONE]
+- Color syntax highlighting? (certainly seems like there's a demand for it.)
+- .nanorc ?????

configure

@@ -710,7 +710,7 @@ fi
 
 PACKAGE=nano
 
-VERSION=0.9.12-cvs
+VERSION=0.9.14
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }

configure.in

@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(nano.c)
-AM_INIT_AUTOMAKE(nano, 0.9.12-cvs)
+AM_INIT_AUTOMAKE(nano, 0.9.14)
 AM_CONFIG_HEADER(config.h:config.h.in)
 ALL_LINGUAS="es de fr it id fi"
 

cut.c

@@ -133,7 +133,7 @@ int do_cut_text(void)
     filestruct *tmp, *fileptr = current;
 #ifndef NANO_SMALL
     char *tmpstr;
-    int newsize;
+    int newsize, cuttingtoend = 0;
 #endif
 
     if (fileptr == NULL || fileptr->data == NULL)
@@ -141,14 +141,33 @@ int do_cut_text(void)
 
     tmp = fileptr->next;
 
-    if (!ISSET(KEEP_CUTBUFFER) || ISSET(MARK_ISSET)) {
+    if (!ISSET(KEEP_CUTBUFFER)) {
 	free_filestruct(cutbuffer);
 	cutbuffer = NULL;
+
 #ifdef DEBUG
 	fprintf(stderr, _("Blew away cutbuffer =)\n"));
 #endif
     }
 #ifndef NANO_SMALL
+    if (ISSET(CUT_TO_END) && !ISSET(MARK_ISSET)) {
+	if (current_x == strlen(current->data))
+	{
+	    do_delete();
+	    SET(KEEP_CUTBUFFER);
+	    marked_cut = 2;
+	    return 1;
+	}
+	else
+	{
+	    SET(MARK_ISSET);
+	    SET(KEEP_CUTBUFFER);
+
+	    mark_beginx = strlen(current->data);
+	    mark_beginbuf = current;
+	    cuttingtoend = 1;
+	}
+    }
     if (ISSET(MARK_ISSET)) {
 	if (current->lineno == mark_beginbuf->lineno) {
 	    tmp = copy_node(current);
@@ -183,9 +202,14 @@ int do_cut_text(void)
 
 	placewewant = xplustabs();
 	UNSET(MARK_ISSET);
+
 	marked_cut = 1;
 	set_modified();
-	edit_update(current);
+	if (cuttingtoend)
+	    edit_refresh();
+	else
+	    edit_update(current);
+
 	return 1;
 #else
     if (0) {
@@ -272,7 +296,7 @@ int do_uncut_text(void)
 
     /* Hook newbuf into fileptr */
 #ifndef NANO_SMALL
-    if (marked_cut == 1) {
+    if (marked_cut) {
 	/* If there's only one line in the cutbuffer */
 	if (cutbuffer->next == NULL) {
 	    tmpstr =
@@ -288,7 +312,6 @@ int do_uncut_text(void)
 
 	    placewewant = xplustabs();
 	    update_cursor();
-	    renumber(current);
 	} else {		/* yuck -- no kidding! */
 	    tmp = current->next;
 	    /* New beginning */
@@ -331,13 +354,30 @@ int do_uncut_text(void)
 
 	    i = editbot->lineno;
 
-	    renumber(current);
-
 	    current = newend;
 	    if (i <= newend->lineno)
 		edit_update(current);
 	}
 
+	/* If marked cut == 2, that means that we're doing a cut to end
+	   and we don't want anything else on the line, so we have to
+	   screw up all the work we just did and separate the line.  There
+	   must be a better way to do this, but not at 1AM on a work night. */
+
+	if (marked_cut == 2 && current_x != strlen(current->data)) {
+	    tmp = make_new_node(current);
+	    tmp->data = nmalloc(strlen(&current->data[current_x]) + 1);
+	    strcpy(tmp->data, &current->data[current_x]);
+	    tmp->next = current->next;
+	    current->next = tmp;
+	    tmp->prev = current;
+	    current->data[current_x] = 0;
+	    current->data = nrealloc(current->data, strlen(current->data) + 1);	    
+	    current = current->next;
+	    current_x = 0;
+	    placewewant = 0;
+	}
+	renumber(current->prev);
 	dump_buffer(fileage);
 	dump_buffer(cutbuffer);
 	set_modified();

faq.html

@@ -0,0 +1,546 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <meta name="GENERATOR" content="Mozilla/4.73 [en] (X11; U; Linux 2.2.16 i586) [Netscape]">
+</head>
+<body text="#000000" bgcolor="#FFFFFF" link="#0000EF" vlink="#51188E" alink="#FF0000">
+
+<h1>
+<font color="#CC0000">The nano FAQ</font></h1>
+<h2>
+<font color="#330000">Table of Contents</font></h2>
+
+<h2>
+<font color="#330000"><a href="#1">1.&nbsp; General</a></font></h2>
+
+<blockquote><font color="#330000"><a href="#1.1">1.1 About this FAQ.</a></font>
+<br><font color="#330000"><a href="#1.2">1.2. How do I contribute to it?</a></font>
+<br><font color="#330000"><a href="#1.3">1.3. What is nano?</a></font>
+<br><font color="#330000"><a href="#1.4">1.4. What is the history behind
+nano?</a></font>
+<br><font color="#330000"><a href="#1.5">1.5. Why the name change from
+TIP?</a></font>
+<br><font color="#330000"><a href="#1.6">1.6 What is the current version
+of nano?</a></font>
+<br><font color="#330000"><a href="#1.7">1.7. I want to read the man page
+without having to download the program!</a></font></blockquote>
+
+<h2>
+<font color="#330000"><a href="#2">2. Where to get nano</a></font></h2>
+
+<blockquote><font color="#330000"><a href="#2.1">2.1. FTP and WWW sites
+that carry nano.</a></font>
+<br><font color="#330000"><a href="#2.2">2.2. Redhat and derivatives (.rpm)
+packages.</a></font>
+<br><font color="#330000"><a href="#2.3">2.3. Debian (.deb) packages.</a></font>
+<br><font color="#330000"><a href="#2.4">2.4. By CVS (for the brave).</a></font></blockquote>
+
+<h2>
+<font color="#330000"><a href="#3">3. Installation and Configuration</a></font></h2>
+
+<blockquote><font color="#330000"><a href="#3.1">3.1. How do install the
+RPM or DEB package?</a></font>
+<br><font color="#330000"><a href="#3.2">3.2. Compiling from source: WHAT
+THE HECK DO I DO NOW?</a></font>
+<br><font color="#330000"><a href="#3.2">3.3. Why does everything go into
+/usr/local?</a></font>
+<br><font color="#330000"><a href="#3.4">3.4. I get errors about 'bindtextdomain',
+'gettext' and/or 'gettextdomain'.&nbsp; What can I do about it?</a></font></blockquote>
+
+<h2>
+<font color="#330000"><a href="#4">4. Running</a></font></h2>
+
+<blockquote><font color="#330000"><a href="#4.1">4.1. Ack!&nbsp; My backspace/delete/enter/double
+bucky/meta key doesn't seem to work!&nbsp; What can I do?</a></font>
+<br><font color="#330000"><a href="#4.2">4.2. Nano crashes when I type
+&lt;insert keystroke here>!</a></font>
+<br><font color="#330000"><a href="#4.3">4.3. Nano crashes when I resize
+my window.&nbsp;&nbsp; How can I fix that?</a></font>
+<br><font color="#330000"><a href="#4.4">4.4. Why does nano show ^\ and
+^_ in the shortcut list instead of ^G and ^J?</a></font>
+<br><a href="#4.5">4.5 How do I make nano my default editor (in Pine, mutt,
+etc.)?</a></blockquote>
+
+<h2>
+<font color="#330000"><a href="#5">5. Internationalization</a></font></h2>
+
+<blockquote><font color="#330000"><a href="#5.1">5.1. There's no translation
+for my language!</a></font>
+<br><font color="#330000"><a href="#5.2">5.2. I don't like the translation
+for &lt;x> in my language.&nbsp;&nbsp; How can I fix it?</a></font></blockquote>
+
+<h2>
+<font color="#330000"><a href="#6">6. Advocacy and Licensing</a></font></h2>
+
+<blockquote><font color="#330000"><a href="#6.1">6.1. Why should I use
+nano instead of Pico?</a></font>
+<br><font color="#330000"><a href="#6.2">6.2. Why should I use Pico instead
+of nano?</a></font>
+<br><font color="#330000"><a href="#6.3">6.3. What is so bad about the
+PINE license?</a></font>
+<br><font color="#330000"><a href="#6.4">6.4. Okay, well what mail program
+should I use then?</a></font>
+<br><font color="#330000"><a href="#6.5">6.5. Why doesn't UW simply change
+their license?</a></font>
+<br><font color="#330000"><a href="#6.6">6.6. What if tomorrow UW changes
+the license to be truly Free Software?</a></font></blockquote>
+
+<h2>
+<font color="#330000"><a href="#7">7. Miscellaneous</a></font></h2>
+
+<blockquote><font color="#330000"><a href="#7.1">7.1. Nano related mailing
+lists.</a></font>
+<br><font color="#330000"><a href="#7.2">7.2. I want to send the development
+team a big load of cash (or just a thank you).</a></font>
+<br><font color="#330000"><a href="#7.3">7.3. How do I submit a patch?</a></font>
+<br><font color="#330000"><a href="#7.4">7.4. How do I join the development
+team?</a></font>
+<br><font color="#330000"><a href="#7.5">7.5. Can I have CVS write access?</a></font></blockquote>
+
+<h2>
+<a href="#8">8. ChangeLog</a></h2>
+
+<hr WIDTH="100%">
+<br>&nbsp;
+<h1>
+<a NAME="1"></a><font color="#330000">1.&nbsp; General</font></h1>
+
+<h2>
+<a NAME="1.1"></a><font color="#330000">1.1 About this FAQ.</font></h2>
+
+<blockquote><font color="#330000">This FAQ was written and is maintained
+by Chris Allegretta &lt;<a href="mailto:chrisa@asty.org">chrisa@asty.org</a>>,
+who also happens to be the creator of nano.&nbsp;&nbsp; Maybe someone else
+will volunteer to maintain this FAQ someday, who knows...</font></blockquote>
+
+<h2>
+<a NAME="1.2"></a><font color="#330000">1.2. How do I contribute to it?</font></h2>
+
+<blockquote><font color="#330000">Your best bet is to send it to the nano
+email address, <a href="mailto:nano@asty.org">nano@asty.org</a> and if
+it is useful enough it will be included in future versions.</font></blockquote>
+
+<h2>
+<a NAME="1.3"></a><font color="#330000">1.3. What is nano?</font></h2>
+
+<blockquote><font color="#330000">Nano is designed to be a free replacement
+for the Pico text editor, part of the PINE email suite from <a href="http://www.washington.edu/pine">The
+University of Washington</a>.&nbsp; It aims to "emulate Pico as closely
+as possible and perhaps include extra functionality WITHOUT breaking compatibility
+with Pico.</font></blockquote>
+
+<h2>
+<a NAME="1.4"></a><font color="#330000">1.4. What is the history behind
+nano?</font></h2>
+
+<blockquote><font color="#330000">Funny you should ask!</font>
+<p><b><font color="#330000">In the beginning...</font></b>
+<p><font color="#330000">For years Pine was THE program used to read email
+on a Unix system.&nbsp; The Pico text editor is the portion of the program
+one would use to compose his or her mail messages.&nbsp; Many beginners
+to Unix flocked to Pico and Pine because of their well organized, easy
+to use interfaces.&nbsp; With the proliferation of Linux in the mid to
+late 90's, many University students became intimately familiar with the
+strengths (and weaknesses) of Pine and Pico.</font>
+<p><b><font color="#330000">Then came debian...</font></b>
+<p><font color="#330000">The <a href="http://www.debian.org">debian GNU/Linux</a>
+distribution, known for its strict standards in distributing truly "free"
+software (i.e. had no restrictions on redistribution), would not include
+a binary package for Pine or Pico.&nbsp; Many people had a serious dilemma:&nbsp;
+they loved these programs, but they were not truly free software in the
+<a href="http://www.gnu.org/philosophy/free-sw.html">GNU</a>
+sense of the word.</font>
+<p><b><font color="#330000">The event...</font></b>
+<p><font color="#330000">It was in late 1999 when Chris Allegretta (our
+hero) was yet again complaining to himself about the less-than-perfect
+license Pico was distributed under, the 10000 makefiles that came with
+it and how just a few small improvements could make it the Best Editor
+in the World (TM).&nbsp; Having been a convert from Slackware to debian,
+he missed having a simple binary package that included Pine and Pico, and
+had grown tired of downloading them himself.</font>
+<p><font color="#330000">Finally something snapped inside and Chris coded
+and hacked like a madman for many hours straight one weekend to make a
+(barely usable) Pico clone, at the time called TIP (Tip Isn't Pico).&nbsp;
+The program could not be invoked without a filename, could not save files,
+had no help menu, spell checker, and so forth.&nbsp; But over time it improved,
+and with the help of a few great coders it matured to the almost stable
+state it is today.</font></blockquote>
+
+<h2>
+<a NAME="1.5"></a><font color="#330000">1.5. Why the name change from TIP?</font></h2>
+
+<blockquote><font color="#330000">On January 10, 2000, TIP was officially
+renamed to nano because of a namespace conflict with another program called
+'tip'.&nbsp; The original 'tip' program "establishes a full duplex terminal
+connection to a remote host", and was included with many older Unix systems
+(and newer ones like Solaris). The conflict was not noticed at first because
+there is no 'tip' utility included with most Linux distributions (where
+nano was developed).</font></blockquote>
+
+<h2>
+<a NAME="1.6"></a><font color="#330000">1.6 What is the current version
+of nano?</font></h2>
+
+<blockquote><font color="#330000">The current version of nano *should*
+be 0.9.14.&nbsp; Of course you should always check the nano hompage to
+see what the latest and greatest version is.</font></blockquote>
+
+<h2>
+<a NAME="1.7"></a><font color="#330000">1.7. I want to read the man page
+without having to download the program!</font></h2>
+
+<blockquote><font color="#330000">Jeez, demanding, aren't we?&nbsp;&nbsp;
+Okay, look <a href="http://www.asty.org/nano/dist/nano.1.html">here</a>.</font></blockquote>
+
+<hr WIDTH="100%">
+<h1>
+<a NAME="2"></a><font color="#330000">2. Where to get nano</font></h1>
+
+<h2>
+<a NAME="2.1"></a><font color="#330000">2.1. FTP and WWW sites that carry
+nano.</font></h2>
+
+<blockquote><font color="#330000">The nano distribution can be downloaded
+at the following fine web and ftp sites:</font>
+<ul>
+<li>
+<font color="#330000"><a href="http://www.asty.org/nano/dist">http://www.asty.org/nano/dist</a></font></li>
+
+<li>
+<font color="#330000"><a href="http://www.ewtoo.org/~astyanax/nano/dist">http://www.ewtoo.org/~astyanax/nano/dist</a></font></li>
+
+<li>
+<font color="#330000"><a href="ftp://ftp.asty.org/pub/nano">ftp://ftp.asty.org/pub/nano</a></font></li>
+
+<li>
+<font color="#330000"><a href="ftp://nano.sourceforge.net/pub/nano/">ftp://nano.sourceforge.net/pub/nano</a></font></li>
+</ul>
+</blockquote>
+
+<h2>
+<a NAME="2.2"></a><font color="#330000">2.2. Redhat and derivatives (.rpm)
+packages.</font></h2>
+
+<blockquote>
+<ul>
+<li>
+<font color="#330000"><a href="http://www.asty.org/nano/dist/RPMS">http://www.asty.org/nano/dist/RPMS</a></font></li>
+
+<li>
+<font color="#330000"><a href="http://www.ewtoo.org/~astyanax/nano/dist/RPMS">http://www.ewtoo.org/~astyanax/nano/dist/RPMS</a></font></li>
+
+<li>
+<font color="#330000"><a href="ftp://ftp.asty.org/pub/nano/RPMS">ftp://ftp.asty.org/pub/nano/RPMS</a></font></li>
+
+<li>
+<font color="#330000"><a href="ftp://nano.sourceforge.net/pub/nano/RPMS">ftp://nano.sourceforge.net/pub/nano/RPMS</a></font></li>
+</ul>
+<font color="#330000">Additionally, check out the Redhat contribs section
+at:</font>
+<ul>
+<li>
+<font color="#330000"><a href="http://metalab.unc.edu/pub/Linux/distributions/redhat/contrib/libc6/i386">http://metalab.unc.edu/pub/Linux/distributions/redhat/contrib/libc6/i386</a></font></li>
+
+<li>
+<font color="#330000"><a href="ftp://metalab.unc.edu/pub/Linux/distributions/redhat/contrib/libc6/i386">ftp://metalab.unc.edu/pub/Linux/distributions/redhat/contrib/libc6/i386</a></font></li>
+</ul>
+</blockquote>
+
+<h2>
+<a NAME="2.3"></a><font color="#330000">2.3. Debian (.deb) packages.</font></h2>
+
+<blockquote><font color="#330000">For debian users, you can check out the
+current nano packages for:</font>
+<ul>
+<li>
+<font color="#330000"><a href="http://www.debian.org/Packages/frozen/editors/nano.html">frozen</a></font></li>
+
+<li>
+<font color="#330000"><a href="http://www.debian.org/Packages/unstable/editors/nano.html">unstable</a></font></li>
+</ul>
+<font color="#330000">Note that versions &lt; 0.9.10 are probably not for
+those wanting to get serious work done, so until the frozen/stable distributions
+have an updated version of nano, you are best off using the one in unstable
+for now.</font></blockquote>
+
+<h2>
+<a NAME="2.4"></a><font color="#330000">2.4. By CVS (for the brave).</font></h2>
+
+<blockquote><font color="#330000">For the 'bleeding edge' current version
+of nano, you can use CVS to download the current source code.&nbsp; <b>Note:</b>
+believe it or not, by downloading code that has not yet stabilized into
+an official release, there could quite possibly be bugs, in fact the code
+may not even compile!&nbsp; Anyway, see <a href="https://sourceforge.net/cvs/?group_id=1304">the
+nano CVS page</a> for info on anonymous CVS access to the nano source.</font></blockquote>
+
+<hr WIDTH="100%">
+<h1>
+<a NAME="3"></a><font color="#330000">3. Installation and Configuration</font></h1>
+
+<h2>
+<a NAME="3.1"></a><font color="#330000">3.1. How do install the RPM or
+DEB package?</font></h2>
+
+<blockquote><font color="#330000">It's simple really!&nbsp; As root, type
+<b>rpm
+-Uvh nano-x.y.z-1.i386.rpm</b> if you have a Redhat-ish system or
+<b>dpkg
+-i nano_x.y.z-1.deb</b> if you have a Debian-ish system, where
+<b>x.y.z</b>
+is the release of nano.&nbsp; There are other programs to install programs,
+and if you wish to use those, knock yourself out.</font></blockquote>
+
+<h2>
+<a NAME="3.2"></a><font color="#330000">3.2. Compiling from source: WHAT
+THE HECK DO I DO NOW?</font></h2>
+
+<blockquote><font color="#330000">Okay, take a deep breath, this really
+isn't hard.&nbsp; Unpack the nano source with a command like:</font>
+<p><b><font color="#330000">tar -zxvf nano-x.y.z.tar.gz</font></b>
+<p><font color="#330000">If you get error messages about the -z option,
+try this:</font>
+<p><b><font color="#330000">gunzip -d nano-x.y.z.tar.gz | tar xvf -</font></b>
+<p><font color="#330000">(again, where x.y.z is the version number in question).&nbsp;
+Then you need to run configure with any options you might want (if any).</font>
+<p><font color="#330000">The average case is this:</font>
+<p><b><font color="#330000">./configure</font></b>
+<br><b><font color="#330000">make</font></b>
+<br><font color="#330000"><b>make install </b>(as root, of course)</font></blockquote>
+
+<h2>
+<a NAME="3.3"></a><font color="#330000">3.3. Why does everything go into
+/usr/local?</font></h2>
+
+<blockquote><font color="#330000">Well, that's what the <b>configure</b>
+script defaults to.&nbsp; If you wish to change this, simply do this:</font>
+<p><b><font color="#330000">./configure --prefix=/usr</font></b>
+<p><font color="#330000">to put nano into /usr/bin when you run <b>make
+install</b>.</font></blockquote>
+
+<h2>
+<a NAME="3.4"></a><font color="#330000">3.4. I get errors about 'bindtextdomain',
+'gettext' and/or 'gettextdomain'.&nbsp; What can I do about it?</font></h2>
+
+<blockquote><font color="#330000">Try doing a <b>./configure --with-included-gettext</b>
+and see if that solves your problem.&nbsp; You make need to do a <b>make
+clean ; make</b> to get it to work fully.</font></blockquote>
+
+<hr WIDTH="100%">
+<h1>
+<a NAME="4"></a><font color="#330000">4. Running</font></h1>
+
+<h2>
+<a NAME="4.1"></a><font color="#330000">4.1. Ack!&nbsp; My backspace/delete/enter/double
+bucky/meta key doesn't seem to work!&nbsp; What can I do?</font></h2>
+
+<blockquote><font color="#330000">Try setting your $TERM variable to 'vt100'.&nbsp;
+Nano doesn't yet support every term entry under the sun.</font>
+<p><font color="#330000">Bourne shell users (like bash): <b>export TERM=vt100</b></font>
+<br><font color="#330000">C Shell users (tcsh and csh): <b>setenv TERM
+vt100</b></font></blockquote>
+
+<h2>
+<a NAME="4.2"></a><font color="#330000">4.2. Nano crashes when I type &lt;insert
+keystroke here>!</font></h2>
+
+<blockquote><font color="#330000">If you aren't trying some bizarre keystroke
+combination with some bizarre $TERM entry, chances are you have found a
+bug.&nbsp;&nbsp; You are welcome to submit it to the nano-devel list or
+to <a href="mailto:nano@asty.org">nano@asty.org</a>.</font></blockquote>
+
+<h2>
+<a NAME="4.3"></a><font color="#330000">4.3. Nano crashes when I resize
+my window.&nbsp;&nbsp; How can I fix that?</font></h2>
+
+<blockquote><font color="#330000">Older versions of nano had this problem,
+please upgrade to a newer version (at least 0.9.9 would be great, 0.9.
+12 is recommended).</font></blockquote>
+
+<h2>
+<a NAME="4.4"></a><font color="#330000">4.4. Why does nano show ^\ and
+^_ in the shortcut list instead of ^G and ^J?</font></h2>
+
+<blockquote><font color="#330000">The help (^G) and justify (^J) functions
+were among the last to be written.&nbsp; To show the improvements that
+nano had over Pico (goto line # and replace), ^_ and ^\ were put on the
+shortcut list.&nbsp;&nbsp; If you use the <b>-p</b> option to nano you
+will get the same shortcuts at the bottom as Pico.</font></blockquote>
+
+<h2>
+<a NAME="4.5"></a>4.5 How do I make nano my default editor (in Pine, mutt,
+etc)?</h2>
+
+<blockquote>You need to make nano your $EDITOR.&nbsp; If you want this
+to be saved, you should put a line like this in your <b>.bashrc</b> if
+you use bash:
+<p><b>export EDITOR=/usr/local/bin/nano</b>
+<p>or if you use tcsh put this in your <b>.cshrc</b> file:
+<p><b>setenv EDITOR /usr/local/bin/nano</b>
+<p>Change /usr/local/bin/nano to wherever nano is installed in your system.&nbsp;
+Type which nano to find out. This will not take effect until the next time
+you login.&nbsp; So log out and back in again.
+<p>Then on top that if you use Pine you must go into setup (type <b>S</b>
+at the main menu), then configure (type <b>C</b>).&nbsp; Hit enter on the
+lines that say:
+<p><b>[ ]&nbsp; enable-alternate-editor-cmd</b>
+<br><b>[ ]&nbsp; enable-alternate-editor-implicitly</b>
+<p>Then exit (<b>E</b>) and select Yes (<b>Y</b>).
+<p>Mutt users should see an effect immediately the next time you log in,
+no further configuration is needed.&nbsp; However, if you want to let people
+know you use nano to compose your email messages, you can put a line like
+this in your <b>.muttrc</b>:
+<p><b>my_hdr X-Composer: nano x.y.z</b>
+<p>Again, replace x.y.z with the version of nano you use.
+<br>&nbsp;</blockquote>
+
+<hr WIDTH="100%">
+<h1>
+<a NAME="5"></a><font color="#330000">5. Internationalization</font></h1>
+
+<h2>
+<a NAME="5.1"></a><font color="#330000">5.1. There's no translation for
+my language!</font></h2>
+
+<blockquote><font color="#330000">So, uh, get someone who speaks your native
+language to write one =-).&nbsp; Just grab the <b>nano.pot</b> file from
+the latest and greatest nano distribution (it's in the <b>po/</b> directory)
+and translate each line into your native language on the <b>msgstr</b>
+line.&nbsp; Then send it to the nano devel list or <a href="mailto:nano@asty.org">nano@asty.org</a>.</font></blockquote>
+
+<h2>
+<a NAME="5.2"></a><font color="#330000">5.2. I don't like the translation
+for &lt;x> in my language.&nbsp;&nbsp; How can I fix it?</font></h2>
+
+<blockquote><font color="#330000">The best way would probably be to e-mail
+the person listed in the <b>&lt;your_language>.po</b> file with your suggested
+corrections and they can in turn forward it to the nano email address,
+or the devel list.</font></blockquote>
+
+<hr WIDTH="100%">
+<h1>
+<a NAME="6"></a><font color="#330000">6. Advocacy and Licensing</font></h1>
+
+<h2>
+<a NAME="6.1"></a><font color="#330000">6.1. Why should I use nano instead
+of Pico?</font></h2>
+
+<blockquote><font color="#330000">There are many reasons to use nano instead
+of Pico, a more complete list can be found at the <a href="http://www.asty.org/nano">nano
+homepage</a>.</font></blockquote>
+
+<h2>
+<a NAME="6.2"></a><font color="#330000">6.2. Why should I use Pico instead
+of nano?</font></h2>
+
+<blockquote>Again, check out the <a href="http://www.asty.org/nano">nano
+homepage</a> for a good summary of reasons.&nbsp; It really is a matter
+of personal preference as to which editor you should use.&nbsp; If you're
+the type of person who likes using the original version of a program, then
+Pico is the editor for you.&nbsp;&nbsp; If you're looking for a few more
+features and a 'better' license as far as adding your own changes (sacrificing
+mailer integration and a little stability), nano is the way to go.</blockquote>
+
+<h2>
+<a NAME="6.3"></a><font color="#330000">6.3. What is so bad about the PINE
+license?</font></h2>
+
+<blockquote><font color="#330000">Technically there is nothing "wrong"
+with the U of W license for Pine and Pico.&nbsp; However, it is&nbsp; not
+considered truly "free" according to the <a href="http://www.debian.org/social_contract#guidelines">Debian
+Free Software Guidelines</a>.&nbsp; The only real problem as far as I'm
+aware as that there are limitations on the redistribution of programs based
+on the Pine and Pico source.&nbsp;&nbsp; So at a real nitty gritty level,
+these programs are not considered Free Software.&nbsp; This is why Pico
+isn't distributed in binary form in debian, and hence one of the main reasons
+nano was started.</font></blockquote>
+
+<h2>
+<a NAME="6.4"></a><font color="#330000">6.4. Okay, well what mail program
+should I use then?</font></h2>
+
+<blockquote><font color="#330000">Well, there is nothing stopping you from
+using Pine with nano (or Pine with Pico for that matter).&nbsp; But if
+you want to use programs that are considered Free Software, you may want
+to look into <a href="http://www.mutt.org">mutt</a>.&nbsp; It is a full-screen,
+console based mail program that actually has a lot more flexibility than
+Pine, but has a keymap included in the distribution that allows you to
+use the same keystrokes as Pine would to send and receive mail.&nbsp; It's
+also licensed under the GPL.</font></blockquote>
+
+<h2>
+<a NAME="6.5"></a><font color="#330000">6.5. Why doesn't UW simply change
+their license?</font></h2>
+
+<blockquote><font color="#330000">You're really not asking the right person
+here.&nbsp; I (Chris) waited along time to see if UW would change their
+license because of the amount of high quality software being released and
+developed under the GPL without being taken advantage of by malicious corporate
+entities or other baddies, but no such luck so far.</font></blockquote>
+
+<h2>
+<a NAME="6.6"></a><font color="#330000">6.6. What if tomorrow UW changes
+the license to be truly Free Software?</font></h2>
+
+<blockquote><font color="#330000">Honestly nothing would make me happier
+than to see that happen.&nbsp; Nano would continue to be developed independently
+until such time as Pico had all the features nano did or the projects merged.&nbsp;
+That just does not seem very likely given that there has been no sign of
+any changes in the past few years in a positive direction.</font></blockquote>
+
+<hr WIDTH="100%">
+<h1>
+<a NAME="7"></a><font color="#330000">7. Miscellaneous</font></h1>
+
+<h2>
+<a NAME="7.1"></a><font color="#330000">7.1. Nano related mailing lists.</font></h2>
+
+<blockquote><font color="#330000">There are two mailing lists for nano
+hosted at <a href="http://www.sourceforge.net">SourceForge</a>, nano-announce
+and nano-devel.&nbsp; Nano-announce is a very low traffic list where new
+versions of nano are announced (surprise!)&nbsp; Nano-devel is a sometimes
+low, sometimes very high traffic list for dicussing the present and future
+development of nano.&nbsp; Here are links to where you can sign up for
+a given list:</font><font color="#330000"></font>
+<p><font color="#330000">nano-announce - <a href="http://lists.sourceforge.net/mailman/listinfo/nano-announce">http://lists.sourceforge.net/mailman/listinfo/nano-announce</a></font>
+<br><font color="#330000">nano-devel - <a href="http://lists.sourceforge.net/mailman/listinfo/nano-devel">http://lists.sourceforge.net/mailman/listinfo/nano-devel</a></font></blockquote>
+
+<h2>
+<a NAME="7.2"></a><font color="#330000">7.2. I want to send the development
+team a big load of cash (or just a thank you).</font></h2>
+
+<blockquote><font color="#330000">That's fine.&nbsp; Send it <a href="mailto:nano-devel@lists.sourceforge.net">our
+way</a>!&nbsp; Better yet, fix a <a href="http://www.asty.org/nano/dist/BUGS">bug</a>
+in the program or implement a <a href="http://www.asty.org/nano/dist/TODO">cool
+feature</a> and send us that instead (though cash is fine too).</font></blockquote>
+
+<h2>
+<a NAME="7.3"></a><font color="#330000">7.3. How do I submit a patch?</font></h2>
+
+<blockquote><font color="#330000">See Section <a href="#7.2">7.2</a>.</font></blockquote>
+
+<h2>
+<a NAME="7.4"></a><font color="#330000">7.4. How do I join the development
+team?</font></h2>
+
+<blockquote><font color="#330000">The easiest way is to consistently send
+in good patches that add some needed functionality, fix a bug or two and/or
+make the program more optimized/efficient.&nbsp; Then ask nicely and you
+will probably be added to the SourceForge development list and be given
+CVS write after awhile.&nbsp; There is a lot of responsibility that goes
+along with being a team member, so don't think it's just something to add
+to your resume.</font></blockquote>
+
+<h2>
+<a NAME="7.5"></a><font color="#330000">7.5. Can I have CVS write access?</font></h2>
+
+<blockquote><font color="#330000">Re-read Section </font><a href="#7.4">7.4</a><font color="#330000">
+and you should know the answer.</font></blockquote>
+
+<h1>
+<a NAME="8"></a>8. ChangeLog</h1>
+
+<blockquote>06/31/2000 - Initial framework.</blockquote>
+
+</body>
+</html>

files.c

@@ -125,7 +125,7 @@ filestruct *read_line(char *buf, filestruct * prev, int *line1ins)
 
 int read_file(int fd, char *filename)
 {
-    long size, lines = 0, linetemp = 0;
+    long size, num_lines = 0, linetemp = 0;
     char input[2];		/* buffer */
     char *buf;
     long i = 0, bufx = 128;
@@ -133,6 +133,7 @@ int read_file(int fd, char *filename)
     int line1ins = 0;
 
     buf = nmalloc(bufx);
+    buf[0] = '\0';
 
     if (fileptr != NULL && fileptr->prev != NULL) {
 	fileptr = fileptr->prev;
@@ -148,7 +149,7 @@ int read_file(int fd, char *filename)
 	linetemp = 0;
 	if (input[0] == '\n') {
 	    fileptr = read_line(buf, fileptr, &line1ins);
-	    lines++;
+	    num_lines++;
 	    buf[0] = 0;
 	    i = 0;
 	} else {
@@ -171,13 +172,13 @@ int read_file(int fd, char *filename)
     /* Did we not get a newline but still have stuff to do? */
     if (buf[0]) {
 	fileptr = read_line(buf, fileptr, &line1ins);
-	lines++;
+	num_lines++;
 	buf[0] = 0;
     }
     /* Did we even GET a file? */
     if (totsize == 0) {
 	new_file();
-	statusbar(_("Read %d lines"), lines);
+	statusbar(_("Read %d lines"), num_lines);
 	return 1;
     }
 
@@ -194,8 +195,8 @@ int read_file(int fd, char *filename)
 	/* Update the edit buffer */
 	load_file();
     }
-    statusbar(_("Read %d lines"), lines);
-    totlines += lines;
+    statusbar(_("Read %d lines"), num_lines);
+    totlines += num_lines;
 
     free(buf);
     close(fd);
@@ -281,7 +282,7 @@ int do_insertfile(void)
  * print out how many lines we wrote on the statusbar.
  * 
  * Note that tmp is only set to 1 for storing temporary files internal
- * to the editor, and is completely different from temp_opt.
+ * to the editor, and is completely different from TEMP_OPT.
  */
 int write_file(char *name, int tmp)
 {
@@ -299,11 +300,21 @@ int write_file(char *name, int tmp)
     fileptr = fileage;
 
 
+    /* Check to see if the file is a regular file and FOLLOW_SYMLINKS is
+       set.  If so then don't do the delete and recreate code which would
+       cause unexpected behavior */
+    lstat(name, &st);
+
     /* Open the file and truncate it.  Trust the symlink. */
-    if (ISSET(FOLLOW_SYMLINKS) && !tmp) {
+    if ((ISSET(FOLLOW_SYMLINKS) || !S_ISLNK(st.st_mode)) && !tmp) {
+
 	if ((fd = open(name, O_WRONLY | O_CREAT | O_TRUNC,
 		       S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH |
 		       S_IWOTH)) == -1) {
+	    if (ISSET(TEMP_OPT)) {
+		UNSET(TEMP_OPT);
+		return do_writeout(1);
+	    }
 	    statusbar(_("Could not open file for writing: %s"),
 		      strerror(errno));
 	    return -1;
@@ -320,14 +331,16 @@ int write_file(char *name, int tmp)
 	strcat(buf, name);
 	strcat(buf, ".XXXXXX");
 	if ((fd = mkstemp(buf)) == -1) {
+	    if (ISSET(TEMP_OPT)) {
+		UNSET(TEMP_OPT);
+		return do_writeout(1);
+    	    }
 	    statusbar(_("Could not open file for writing: %s"),
 		      strerror(errno));
 	    return -1;
 	}
     }
 
-
-
     dump_buffer(fileage);
     while (fileptr != NULL && fileptr->next != NULL) {
 	/* Next line is so we discount the "magic line" */
@@ -430,10 +443,21 @@ int do_writeout(int exiting)
 
     strncpy(answer, filename, 132);
 
-    if ((exiting) && (temp_opt) && (filename)) {
-	i = write_file(answer, 0);
-	display_main_list();
-	return i;
+    if ((exiting) && (ISSET(TEMP_OPT))) {
+	if (filename[0])
+	{
+	    i = write_file(answer, 0);
+	    display_main_list();
+	    return i;
+	}
+	else
+	{
+	    UNSET(TEMP_OPT);
+	    do_exit();
+
+	    /* They cancelled, abort quit */
+	    return -1;
+	}
     }
 
     while (1) {

nano.c

@@ -58,9 +58,8 @@
 #endif
 
 /* Former globals, now static */
-char *last_search;		/* Last string we searched for */
-char *last_replace;		/* Last replacement string */
-int temp_opt = 0;		/* Editing temp file (pico -t option) */
+char *last_search = "\0";		/* Last string we searched for */
+char *last_replace = "\0";		/* Last replacement string */
 int fill = 0;			/* Fill - where to wrap lines, basically */
 static char *alt_speller;	/* Alternative spell command */
 struct termios oldterm;		/* The user's original term settings */
@@ -95,10 +94,15 @@ void die(char *msg, ...)
     va_end(ap);
 
     /* if we can't save we have REAL bad problems,
-     * but we might as well TRY.  FIXME: This should probabally base it
-     * off of the current filename */
-    write_file("nano.save", 0);
-
+     * but we might as well TRY. */
+    if(filename[0] == '\0') {
+	write_file("nano.save", 0);
+    } else {
+	char buf[BUFSIZ];
+	strncpy(buf,filename,BUFSIZ);
+	strncat(buf,".save",BUFSIZ - strlen(buf));
+	write_file(buf, 0);
+    }
     /* Restore the old term settings */
     tcsetattr(0, TCSANOW, &oldterm);
 
@@ -323,6 +327,10 @@ void usage(void)
 	   (" -c 		--const			Constantly show cursor position\n"));
     printf(_
 	   (" -h 		--help			Show this message\n"));
+#ifndef NANO_SMALL
+    printf(_
+	   (" -k 		--cut			Let ^K cut from cursor to end of line\n"));
+#endif
     printf(_
 	   (" -i 		--autoindent		Automatically indent new lines\n"));
     printf(_
@@ -361,6 +369,9 @@ void usage(void)
     printf(_(" -V 		Print version information and exit\n"));
     printf(_(" -c 		Constantly show cursor position\n"));
     printf(_(" -h 		Show this message\n"));
+#ifndef NANO_SMALL
+    printf(_(" -k 		Let ^K cut from cursor to end of line\n"));
+#endif
     printf(_(" -i 		Automatically indent new lines\n"));
     printf(_
 	   (" -l 		Don't follow symbolic links, overwrite.\n"));
@@ -833,7 +844,9 @@ void do_wrap(filestruct * inptr, char input_char)
 
 
     totlines++;
-    totsize++;
+    /* Everything about it makes me want this line here but it causes
+     * totsize to be high by one for some reason.  Sigh. (Rob) */
+    /* totsize++; */
 
     renumber(inptr);
     edit_update_top(edittop);
@@ -1043,6 +1056,7 @@ void exit_spell(char *tmpfilename, char *foo)
 
     if (remove(tmpfilename) == -1)
 	statusbar(_("Error deleting tempfile, ack!"));
+    display_main_list();
 }
 
 /*
@@ -1080,7 +1094,6 @@ int do_spell(void)
     }
 
     endwin();
-    resetty();
     if (alt_speller) {
 	if ((i = system(foo)) == -1 || i == 32512) {
 	    statusbar(_("Could not invoke spell program \"%s\""),
@@ -1093,7 +1106,8 @@ int do_spell(void)
 	exit_spell(temp, foo);
 	return 0;
     }
-    initscr();
+/*    initscr(); */
+    refresh();
 
     free_filestruct(fileage);
     global_init();
@@ -1113,7 +1127,7 @@ int do_exit(void)
     if (!ISSET(MODIFIED))
 	finish(0);
 
-    if (temp_opt) {
+    if (ISSET(TEMP_OPT)) {
 	i = 1;
     } else {
 	i =
@@ -1387,56 +1401,61 @@ int do_justify(void)
 
 	unlink_node(tmpnode);
 	delete_node(tmpnode);
-
     }
 
+    totsize -= strlen(current->data);
+
     justify_format(current->data);
 
     slen = strlen(current->data);
-    while ((strlenpt(current->data) > (fill))
-	   && !no_spaces(current->data)) {
-	int i = 0;
-	int len2 = 0;
-	filestruct *tmpline = nmalloc(sizeof(filestruct));
+    totsize += slen;
 
-	/* Start at fill , unless line isn't that long (but it appears at least
-	 * fill long with tabs.
-	 */
-	if (slen > fill)
-	    i = fill;
-	else
-	    i = slen;
-	for (; i > 0; i--) {
-	    if (isspace(current->data[i]) &&
-		((strlenpt(current->data) - strlen(current->data + i)) <=
-		 fill)) break;
-	}
-	if (!i)
-	    break;
+    if((strlenpt(current->data) > (fill))
+           && !no_spaces(current->data)) {
+	do {
+	    int i = 0;
+	    int len2 = 0;
+	    filestruct *tmpline = nmalloc(sizeof(filestruct));
 
-	current->data[i] = '\0';
+	    /* Start at fill , unless line isn't that long (but it 
+	     * appears at least fill long with tabs.
+	     */
+	    if (slen > fill)
+		i = fill;
+	    else
+		i = slen;
+	    for (; i > 0; i--) {
+		if (isspace(current->data[i]) &&
+		    ((strlenpt(current->data) - strlen(current->data +i)) <=
+		     fill)) break;
+	    }
+	    if (!i)
+	        break;
 
-	len2 = strlen(current->data + i + 1);
-	tmpline->data = nmalloc(len2 + 1);
+	    current->data[i] = '\0';
 
-	/* Skip the white space in current. */
-	memcpy(tmpline->data, current->data + i + 1, len2);
-	tmpline->data[len2] = '\0';
+	    len2 = strlen(current->data + i + 1);
+	    tmpline->data = nmalloc(len2 + 1);
 
-	current->data = nrealloc(current->data, i + 1);
+	    /* Skip the white space in current. */
+	    memcpy(tmpline->data, current->data + i + 1, len2);
+	    tmpline->data[len2] = '\0';
 
-	tmpline->prev = current;
-	tmpline->next = current->next;
-	if (current->next != NULL)
-	    current->next->prev = tmpline;
+	    current->data = nrealloc(current->data, i + 1);
 
-	current->next = tmpline;
-	current = tmpline;
-	slen -= i + 1;
-	current_y++;
+	    tmpline->prev = current;
+	    tmpline->next = current->next;
+	    if (current->next != NULL)
+		current->next->prev = tmpline;
+
+	    current->next = tmpline;
+	    current = tmpline;
+	    slen -= i + 1;
+	    current_y++;
+        } while ((strlenpt(current->data) > (fill))
+		&& !no_spaces(current->data));
     }
 
-
     if (current->next)
 	current = current->next;
     else
@@ -1457,7 +1476,6 @@ int do_justify(void)
 	fix_editbot();
     }
 
-
     edit_refresh();
     statusbar("Justify Complete");
     return 1;
@@ -1542,6 +1560,9 @@ int main(int argc, char *argv[])
 	{"nowrap", 0, 0, 'w'},
 	{"nohelp", 0, 0, 'x'},
 	{"help", 0, 0, 'h'},
+#ifndef NANO_SMALL
+	{"cut", 0, 0, 'k'},
+#endif
 	{"autoindent", 0, 0, 'i'},
 	{"tempfile", 0, 0, 't'},
 	{"speller", 1, 0, 's'},
@@ -1566,10 +1587,10 @@ int main(int argc, char *argv[])
 #endif
 
 #ifdef HAVE_GETOPT_LONG
-    while ((optchr = getopt_long(argc, argv, "?T:RVchilmpr:s:tvwxz",
+    while ((optchr = getopt_long(argc, argv, "?T:RVchiklmpr:s:tvwxz",
 				 long_options, &option_index)) != EOF) {
 #else
-    while ((optchr = getopt(argc, argv, "h?T:RVcilmpr:s:tvwxz")) != EOF) {
+    while ((optchr = getopt(argc, argv, "h?T:RVciklmpr:s:tvwxz")) != EOF) {
 #endif
 
 	switch (optchr) {
@@ -1604,6 +1625,11 @@ int main(int argc, char *argv[])
 	case 'i':
 	    SET(AUTOINDENT);
 	    break;
+#ifndef NANO_SMALL
+	case 'k':
+	    SET(CUT_TO_END);
+	    break;
+#endif
 	case 'l':
 	    UNSET(FOLLOW_SYMLINKS);
 	    break;
@@ -1625,7 +1651,7 @@ int main(int argc, char *argv[])
 	    strcpy(alt_speller, optarg);
 	    break;
 	case 't':
-	    temp_opt = 1;
+	    SET(TEMP_OPT);
 	    break;
 	case 'v':
 	    SET(VIEW_MODE);
@@ -1676,12 +1702,10 @@ int main(int argc, char *argv[])
     /* First back up the old settings so they can be restored, duh */
     tcgetattr(0, &oldterm);
 
-    /* Adam's code to blow away intr character so ^C can show cursor pos */
-    tcgetattr(0, &term);
-    for (i = 0; i < NCCS; i++) {
-	if (term.c_cc[i] == CINTR || term.c_cc[i] == CQUIT)
-	    term.c_cc[i] = 0;
-    }
+    term = oldterm;
+    term.c_cc[VINTR] = _POSIX_VDISABLE;
+    term.c_cc[VQUIT] = _POSIX_VDISABLE;
+    term.c_lflag &= ~IEXTEN;
     tcsetattr(0, TCSANOW, &term);
 
     /* now ncurses init stuff... */
@@ -1757,14 +1781,14 @@ int main(int argc, char *argv[])
     else
 	edit_update(fileage);
 
-    edit_refresh();
-    reset_cursor();
-
 #ifdef HAVE_TABSIZE
     if (usrtabsize > 0)
 	TABSIZE = usrtabsize;
 #endif
 
+    edit_refresh();
+    reset_cursor();
+
     while (1) {
 	kbinput = wgetch(edit);
 	if (kbinput == 27) {	/* Grab Alt-key stuff first */

nano.h

@@ -104,6 +104,8 @@ typedef struct shortcut {
 #define USE_MOUSE		(1<<13)
 #define USE_REGEXP              (1<<14)
 #define REGEXP_COMPILED         (1<<15)
+#define TEMP_OPT         	(1<<16)
+#define CUT_TO_END         	(1<<17)
 
 /* Control key sequences, chaning these would be very very bad */
 

po/cat-id-tbl.c

@@ -120,96 +120,99 @@ Usage: nano [GNU long option] [option] +LINE <file>\n\
   {" -V \t\t--version\t\tPrint version information and exit\n", 92},
   {" -c \t\t--const\t\t\tConstantly show cursor position\n", 93},
   {" -h \t\t--help\t\t\tShow this message\n", 94},
-  {" -i \t\t--autoindent\t\tAutomatically indent new lines\n", 95},
-  {" -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n", 96},
-  {" -m \t\t--mouse\t\t\tEnable mouse\n", 97},
+  {" -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n", 95},
+  {" -i \t\t--autoindent\t\tAutomatically indent new lines\n", 96},
+  {" -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n", 97},
+  {" -m \t\t--mouse\t\t\tEnable mouse\n", 98},
   {"\
- -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n", 98},
-  {" -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n", 99},
-  {" -s [prog] \t--speller=[prog]\tEnable alternate speller\n", 100},
-  {" -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n", 101},
-  {" -v \t\t--view\t\t\tView (read only) mode\n", 102},
-  {" -w \t\t--nowrap\t\tDon't wrap long lines\n", 103},
-  {" -x \t\t--nohelp\t\tDon't show help window\n", 104},
-  {" -z \t\t--suspend\t\tEnable suspend\n", 105},
-  {" +LINE\t\t\t\t\tStart at line number LINE\n", 106},
+ -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n", 99},
+  {" -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n", 100},
+  {" -s [prog] \t--speller=[prog]\tEnable alternate speller\n", 101},
+  {" -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n", 102},
+  {" -v \t\t--view\t\t\tView (read only) mode\n", 103},
+  {" -w \t\t--nowrap\t\tDon't wrap long lines\n", 104},
+  {" -x \t\t--nohelp\t\tDon't show help window\n", 105},
+  {" -z \t\t--suspend\t\tEnable suspend\n", 106},
+  {" +LINE\t\t\t\t\tStart at line number LINE\n", 107},
   {"\
 Usage: nano [option] +LINE <file>\n\
-\n", 107},
-  {"Option\t\tMeaning\n", 108},
-  {" -T [num]\tSet width of a tab to num\n", 109},
-  {" -R\t\tUse regular expressions for search\n", 110},
-  {" -V \t\tPrint version information and exit\n", 111},
-  {" -c \t\tConstantly show cursor position\n", 112},
-  {" -h \t\tShow this message\n", 113},
-  {" -i \t\tAutomatically indent new lines\n", 114},
-  {" -l \t\tDon't follow symbolic links, overwrite.\n", 115},
-  {" -m \t\tEnable mouse\n", 116},
-  {" -r [#cols] \tSet fill cols to (wrap lines at) #cols\n", 117},
-  {" -s [prog]  \tEnable alternate speller\n", 118},
-  {" -p \t\tMake bottom 2 lines more Pico-like\n", 119},
-  {" -t \t\tAuto save on exit, don't prompt\n", 120},
-  {" -v \t\tView (read only) mode\n", 121},
-  {" -w \t\tDon't wrap long lines\n", 122},
-  {" -x \t\tDon't show help window\n", 123},
-  {" -z \t\tEnable suspend\n", 124},
-  {" +LINE\t\tStart at line number LINE\n", 125},
-  {" nano version %s by Chris Allegretta (compiled %s, %s)\n", 126},
-  {" Email: nano@asty.org\tWeb: http://www.asty.org/nano\n", 127},
-  {"Mark Set", 128},
-  {"Mark UNset", 129},
-  {"check_wrap called with inptr->data=\"%s\"\n", 130},
-  {"current->data now = \"%s\"\n", 131},
-  {"After, data = \"%s\"\n", 132},
-  {"Error deleting tempfile, ack!", 133},
-  {"Could not create a temporary filename: %s", 134},
-  {"Could not invoke spell program \"%s\"", 135},
-  {"Could not invoke \"ispell\"", 136},
-  {"Finished checking spelling", 137},
-  {"Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? ", 138},
-  {"Cannot resize top win", 139},
-  {"Cannot move top win", 140},
-  {"Cannot resize edit win", 141},
-  {"Cannot move edit win", 142},
-  {"Cannot resize bottom win", 143},
-  {"Cannot move bottom win", 144},
-  {"Main: set up windows\n", 145},
-  {"Main: bottom win\n", 146},
-  {"Main: open file\n", 147},
-  {"I got Alt-[-%c! (%d)\n", 148},
-  {"I got Alt-%c! (%d)\n", 149},
-  {"Case Sensitive Regexp Search%s", 150},
-  {"Regexp Search%s", 151},
-  {"Case Sensitive Search%s", 152},
-  {"Search%s", 153},
-  {"Search Cancelled", 154},
-  {"Search Wrapped", 155},
-  {"Replaced %d occurences", 156},
-  {"Replaced 1 occurence", 157},
-  {"Replace Cancelled", 158},
-  {"Replace with [%s]", 159},
-  {"Replace with", 160},
-  {"Replace this instance?", 161},
-  {"Enter line number", 162},
-  {"Aborted", 163},
-  {"Come on, be reasonable", 164},
-  {"Only %d lines available, skipping to last line", 165},
-  {"actual_x_from_start for xplus=%d returned %d\n", 166},
-  {"input '%c' (%d)\n", 167},
-  {"New Buffer", 168},
-  {"  File: ...", 169},
-  {"Modified", 170},
-  {"Moved to (%d, %d) in edit buffer\n", 171},
-  {"current->data = \"%s\"\n", 172},
-  {"I got \"%s\"\n", 173},
-  {"Yes", 174},
-  {"All", 175},
-  {"No", 176},
-  {"do_cursorpos: linepct = %f, bytepct = %f\n", 177},
-  {"line %d of %d (%.0f%%), character %d of %d (%.0f%%)", 178},
-  {"Dumping file buffer to stderr...\n", 179},
-  {"Dumping cutbuffer to stderr...\n", 180},
-  {"Dumping a buffer to stderr...\n", 181},
+\n", 108},
+  {"Option\t\tMeaning\n", 109},
+  {" -T [num]\tSet width of a tab to num\n", 110},
+  {" -R\t\tUse regular expressions for search\n", 111},
+  {" -V \t\tPrint version information and exit\n", 112},
+  {" -c \t\tConstantly show cursor position\n", 113},
+  {" -h \t\tShow this message\n", 114},
+  {" -k \t\tLet ^K cut from cursor to end of line\n", 115},
+  {" -i \t\tAutomatically indent new lines\n", 116},
+  {" -l \t\tDon't follow symbolic links, overwrite.\n", 117},
+  {" -m \t\tEnable mouse\n", 118},
+  {" -r [#cols] \tSet fill cols to (wrap lines at) #cols\n", 119},
+  {" -s [prog]  \tEnable alternate speller\n", 120},
+  {" -p \t\tMake bottom 2 lines more Pico-like\n", 121},
+  {" -t \t\tAuto save on exit, don't prompt\n", 122},
+  {" -v \t\tView (read only) mode\n", 123},
+  {" -w \t\tDon't wrap long lines\n", 124},
+  {" -x \t\tDon't show help window\n", 125},
+  {" -z \t\tEnable suspend\n", 126},
+  {" +LINE\t\tStart at line number LINE\n", 127},
+  {" nano version %s by Chris Allegretta (compiled %s, %s)\n", 128},
+  {" Email: nano@asty.org\tWeb: http://www.asty.org/nano\n", 129},
+  {"Mark Set", 130},
+  {"Mark UNset", 131},
+  {"check_wrap called with inptr->data=\"%s\"\n", 132},
+  {"current->data now = \"%s\"\n", 133},
+  {"After, data = \"%s\"\n", 134},
+  {"Error deleting tempfile, ack!", 135},
+  {"Could not create a temporary filename: %s", 136},
+  {"Could not invoke spell program \"%s\"", 137},
+  {"Could not invoke \"ispell\"", 138},
+  {"Finished checking spelling", 139},
+  {"Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? ", 140},
+  {"Cannot resize top win", 141},
+  {"Cannot move top win", 142},
+  {"Cannot resize edit win", 143},
+  {"Cannot move edit win", 144},
+  {"Cannot resize bottom win", 145},
+  {"Cannot move bottom win", 146},
+  {"Main: set up windows\n", 147},
+  {"Main: bottom win\n", 148},
+  {"Main: open file\n", 149},
+  {"I got Alt-[-%c! (%d)\n", 150},
+  {"I got Alt-%c! (%d)\n", 151},
+  {"Case Sensitive Regexp Search%s%s", 152},
+  {"Regexp Search%s%s", 153},
+  {"Case Sensitive Search%s%s", 154},
+  {"Search%s%s", 155},
+  {" (to replace)", 156},
+  {"Search Cancelled", 157},
+  {"Search Wrapped", 158},
+  {"Replaced %d occurences", 159},
+  {"Replaced 1 occurence", 160},
+  {"Replace Cancelled", 161},
+  {"Replace with [%s]", 162},
+  {"Replace with", 163},
+  {"Replace this instance?", 164},
+  {"Enter line number", 165},
+  {"Aborted", 166},
+  {"Come on, be reasonable", 167},
+  {"Only %d lines available, skipping to last line", 168},
+  {"actual_x_from_start for xplus=%d returned %d\n", 169},
+  {"input '%c' (%d)\n", 170},
+  {"New Buffer", 171},
+  {"  File: ...", 172},
+  {"Modified", 173},
+  {"Moved to (%d, %d) in edit buffer\n", 174},
+  {"current->data = \"%s\"\n", 175},
+  {"I got \"%s\"\n", 176},
+  {"Yes", 177},
+  {"All", 178},
+  {"No", 179},
+  {"do_cursorpos: linepct = %f, bytepct = %f\n", 180},
+  {"line %d of %d (%.0f%%), character %d of %d (%.0f%%)", 181},
+  {"Dumping file buffer to stderr...\n", 182},
+  {"Dumping cutbuffer to stderr...\n", 183},
+  {"Dumping a buffer to stderr...\n", 184},
 };
 
-int _msg_tbl_length = 181;
+int _msg_tbl_length = 184;

po/de.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 0.9.11\n"
-"POT-Creation-Date: 2000-07-07 21:26-0400\n"
-"PO-Revision-Date: 2000-06-21 12:19+0200\n"
+"Project-Id-Version: nano 0.9.14pre1\n"
+"POT-Creation-Date: 2000-07-27 20:16-0400\n"
+"PO-Revision-Date: 2000-07-27 11:44+0200\n"
 "Last-Translator: Florian König <floki@bigfoot.com>\n"
 "Language-Team: German <floki@bigfoot.com>\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 msgid "add_to_cutbuffer called with inptr->data = %s\n"
 msgstr "add_to_cutbuffer aufgerufen mit inptr->data = %s\n"
 
-#: cut.c:148
+#: cut.c:149
 msgid "Blew away cutbuffer =)\n"
 msgstr "Inhalt der Zwischenablage verworfen\n"
 
@@ -27,83 +27,83 @@ msgstr "Inhalt der Zwischenablage verworfen\n"
 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:180 files.c:197
+#: files.c:181 files.c:198
 #, c-format
 msgid "Read %d lines"
 msgstr "%d Zeilen gelesen"
 
-#: files.c:215 search.c:163 search.c:181
+#: files.c:216 search.c:172 search.c:190
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" nicht gefunden"
 
 #. We have a new file
-#: files.c:219
+#: files.c:220
 msgid "New File"
 msgstr "Neue Datei"
 
-#: files.c:228
+#: files.c:229
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr "Datei \"%s\" ist ein Verzeichnis"
 
-#: files.c:233
+#: files.c:234
 msgid "Reading File"
 msgstr "Lese Datei"
 
-#: files.c:246
+#: files.c:247
 msgid "File to insert [from ./] "
 msgstr "Datei zum Einfügen [von ./] "
 
-#: files.c:271 files.c:295 files.c:462 nano.c:1135
+#: files.c:272 files.c:296 files.c:486 nano.c:1149
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: files.c:307 files.c:323 files.c:338 files.c:355 files.c:361
+#: files.c:318 files.c:338 files.c:351 files.c:368 files.c:374
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Konnte nicht in Datei schreiben: %s"
 
-#: files.c:315
+#: files.c:326
 msgid "Could not open file: Path length exceeded."
 msgstr "Konnte Datei nicht öffnen: Pfad zu lang."
 
-#: files.c:343
+#: files.c:356
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Schrieb >%s\n"
 
-#: files.c:370
+#: files.c:383
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Konnte %s nicht schließen: %s"
 
 #. Try a rename??
-#: files.c:391 files.c:402 files.c:407
+#: files.c:404 files.c:415 files.c:420
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Konnte nicht in %s schreiben: %s"
 
-#: files.c:413
+#: files.c:426
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Konnte Rechte %o für %s nicht setzen: %s"
 
-#: files.c:420
+#: files.c:433
 #, c-format
 msgid "Wrote %d lines"
 msgstr "%d Zeilen geschrieben"
 
-#: files.c:441
+#: files.c:465
 msgid "File Name to write"
 msgstr "Dateiname zum Speichern"
 
-#: files.c:446
+#: files.c:470
 #, c-format
 msgid "filename is %s"
 msgstr "Dateiname ist %s"
 
-#: files.c:451
+#: files.c:475
 msgid "File exists, OVERWRITE ?"
 msgstr "Datei exisitiert, ÜBERSCHREIBEN ?"
 
@@ -125,7 +125,7 @@ msgstr "Zu einer Zeile springen"
 
 #: global.c:120
 msgid "Justify the current paragraph"
-msgstr "Paragraph ausrichten"
+msgstr "Absatz ausrichten"
 
 #: global.c:121
 msgid "Replace text within the editor"
@@ -197,7 +197,7 @@ msgstr "Zur letzten Zeile springen"
 
 #: global.c:138
 msgid "Refresh (redraw) the current screen"
-msgstr "Bildschirm auffrischen"
+msgstr "Bildschirm auffrischen (neu zeichnen)"
 
 #: global.c:139
 msgid "Mark text at the current cursor location"
@@ -351,9 +351,9 @@ msgstr "Abbrechen"
 
 #: global.c:295
 msgid "No Replace"
-msgstr ""
+msgstr "Keine Ersetzung"
 
-#: nano.c:111
+#: nano.c:115
 msgid ""
 "\n"
 "Buffer written to 'nano.save'\n"
@@ -361,11 +361,11 @@ msgstr ""
 "\n"
 "Puffer in 'nano.save' geschrieben\n"
 
-#: nano.c:118
+#: nano.c:122
 msgid "Key illegal in VIEW mode"
 msgstr "Unzulässige Taste im View Modus"
 
-#: nano.c:158
+#: nano.c:162
 msgid ""
 " nano help text\n"
 "\n"
@@ -388,9 +388,9 @@ msgstr ""
 " Nano wurde konzipiert um die Funktionalität und die Benutzerfreundlichkeit "
 "des UW Pico Texteditors zu imitieren. Es gibt vier Hauptbereiche: Die "
 "Titelzeile zeigt die Version des Programms, den Dateinamen der aktuellen "
-"Datei und ob die Datei verändert wurde oder nicht. Das Hauptfenster zeigt "
-"die geöffnete Datei. Die Statuszeile (die dritte Zeile von unten) und zeigt "
-"wichtige Meldungen. Die untersten zwei Zeilen listet die meistgebrauchten "
+"Datei und ob die Datei verändert wurde oder nicht. Das Hauptfenster enthält "
+"die geöffnete Datei. Die Statuszeile (die dritte Zeile von unten) zeigt "
+"wichtige Meldungen. Die untersten zwei Zeilen listen die meistgebrauchten "
 "Tastenkombinationen von nano auf.\n"
 "\n"
 " Tastenkombinationen werden wie folgt abgekürzt: Kombinationen mit der "
@@ -399,15 +399,15 @@ msgstr ""
 "Optionale Tasten sind eingeklammert.\n"
 "\n"
 
-#: nano.c:259
+#: nano.c:263
 msgid "free_node(): free'd a node, YAY!\n"
 msgstr "free_node(): Knoten freigegeben.\n"
 
-#: nano.c:264
+#: nano.c:268
 msgid "free_node(): free'd last node.\n"
 msgstr "free_node(): letzter Knoten freigegeben.\n"
 
-#: nano.c:309
+#: nano.c:313
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
@@ -415,87 +415,91 @@ msgstr ""
 "Aufruf: nano [lange GNU Option] [Option] +ZEILE <Datei>\n"
 "\n"
 
-#: nano.c:310
+#: nano.c:314
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Option\t\tlange Option\t\tBedeutung\n"
 
-#: nano.c:313
+#: nano.c:317
 msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n"
 msgstr " -T \t\t--tabsize=[Anzahl]\tTabulator-Größe auf Anzahl setzen\n"
 
-#: nano.c:317
-msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
-msgstr ""
-
 #: nano.c:321
+msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
+msgstr " -R\t\t--regexp\t\tRegulären Ausdruck zur Suche verwenden\n"
+
+#: nano.c:325
 msgid " -V \t\t--version\t\tPrint version information and exit\n"
 msgstr " -V \t\t--version\t\tVersionsinfo ausgeben und beenden\n"
 
-#: nano.c:323
+#: nano.c:327
 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
 msgstr " -c \t\t--const\t\t\tCursorposition ständig anzeigen\n"
 
-#: nano.c:325
+#: nano.c:329
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr " -h \t\t--help\t\t\tDiese Meldung anzeigen\n"
 
-#: nano.c:327
+#: nano.c:332
+msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
+msgstr " -k \t\t--cut\t\t\t^K schneidet vom Cursor bis zum Zeilenende aus\n"
+
+#: nano.c:335
 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
 msgstr " -i \t\t--autoindent\t\tNeue Zeilen automatisch einrücken\n"
 
-#: nano.c:329
+#: nano.c:337
 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n"
 msgstr ""
 " -l \t\t--nofollow\t\tSymbolischen Links nicht folgen, sondern "
 "überschreiben.\n"
 
-#: nano.c:332
+#: nano.c:340
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr " -m \t\t--mouse\t\t\tMaus aktivieren\n"
 
-#: nano.c:337
+#: nano.c:345
 msgid ""
 " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
 msgstr ""
 " -r [#Spalten] \t--fill=[#Spalten]\tSpalten auffüllen (Zeilenumbruch bei) "
 "#Spalten\n"
 
-#: nano.c:339
+#: nano.c:347
 msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n"
 msgstr " -p\t \t--pico\t\t\tErscheinungsbild von Pico stärker imitieren\n"
 
-#: nano.c:341
+#: nano.c:349
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr ""
 " -s [Programm] \t--speller=[Programm]\tAlternative Rechtschreibprüfung\n"
 
-#: nano.c:343
+#: nano.c:351
 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\t--tempfile\t\tBeim Beenden ohne Rückfrage speichern\n"
 
-#: nano.c:345
+#: nano.c:353
 msgid " -v \t\t--view\t\t\tView (read only) mode\n"
 msgstr ""
 " -v \t\t--view\t\t\tNur zum Lesen öffnen (keine Veränderungen möglich)\n"
 
-#: nano.c:347
+#: nano.c:355
 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
 msgstr " -w \t\t--nowrap\t\tLange Zeilen nicht in neue Zeilen umbrechen\n"
 
-#: nano.c:349
+#: nano.c:357
 msgid " -x \t\t--nohelp\t\tDon't show help window\n"
 msgstr " -x \t\t--nohelp\t\tHilfe-Fenster nicht anzeigen\n"
 
-#: nano.c:351
+#: nano.c:359
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr ""
 " -z \t\t--suspend\t\tSuspend (anhalten und zurück zur Shell) aktivieren\n"
 
-#: nano.c:353
+#: nano.c:361
 msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
 msgstr " +ZEILE\t\t\t\t\tBei Zeile ZEILE beginnen\n"
 
-#: nano.c:355
+#: nano.c:363
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
@@ -503,260 +507,270 @@ msgstr ""
 "Aufruf: nano [Option] +ZEILE <Datei>\n"
 "\n"
 
-#: nano.c:356
+#: nano.c:364
 msgid "Option\t\tMeaning\n"
 msgstr "Option\t\tBedeutung\n"
 
-#: nano.c:358
+#: nano.c:366
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr " -T [Anzahl]\tTabulator-Größe auf Anzahl setzen\n"
 
-#: nano.c:360
+#: nano.c:368
 msgid " -R\t\tUse regular expressions for search\n"
-msgstr ""
+msgstr " -R\t\tRegulären Ausdruck zur Suche verwenden\n"
 
-#: nano.c:361
+#: nano.c:369
 msgid " -V \t\tPrint version information and exit\n"
 msgstr " -V \t\tVersionsinfo ausgeben und beenden\n"
 
-#: nano.c:362
+#: nano.c:370
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr " -c \t\tCursorposition ständig anzeigen\n"
 
-#: nano.c:363
+#: nano.c:371
 msgid " -h \t\tShow this message\n"
 msgstr " -h \t\tDiese Meldung anzeigen\n"
 
-#: nano.c:364
+#: nano.c:373
+msgid " -k \t\tLet ^K cut from cursor to end of line\n"
+msgstr " -k \t\t^K schneidet vom Cursor bis zum Zeilenende aus\n"
+
+#: nano.c:375
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr " -i \t\tNeue Zeilen automatisch einrücken\n"
 
-#: nano.c:366
+#: nano.c:377
 msgid " -l \t\tDon't follow symbolic links, overwrite.\n"
 msgstr " -l \t\tSymbolischen Links nicht folgen, sondern überschreiben\n"
 
-#: nano.c:369
+#: nano.c:380
 msgid " -m \t\tEnable mouse\n"
 msgstr " -m \t\tMaus aktivieren\n"
 
-#: nano.c:373
+#: nano.c:384
 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
 msgstr " -r [#Spalten] \tSpalten auffüllen (Zeilenumbruch bei) #Spalten\n"
 
-#: nano.c:374
+#: nano.c:385
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr " -s [Programm]  \tAlternative Rechtschreibprüfung\n"
 
-#: nano.c:375
+#: nano.c:386
 msgid " -p \t\tMake bottom 2 lines more Pico-like\n"
 msgstr " -p \t\tErscheinungsbild von Pico stärker imitieren\n"
 
-#: nano.c:376
+#: nano.c:387
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\tBeim Beenden ohne Rückfrage speichern\n"
 
-#: nano.c:377
+#: nano.c:388
 msgid " -v \t\tView (read only) mode\n"
 msgstr " -v \t\tNur zum Lesen öffnen (keine Veränderungen möglich)\n"
 
-#: nano.c:378
+#: nano.c:389
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr " -w \t\tLange Zeilen nicht in neue Zeilen umbrechen\n"
 
-#: nano.c:379
+#: nano.c:390
 msgid " -x \t\tDon't show help window\n"
 msgstr " -x \t\tHilfe-Fenster nicht anzeigen\n"
 
-#: nano.c:380
+#: nano.c:391
 msgid " -z \t\tEnable suspend\n"
 msgstr " -z \t\tSuspend (anhalten und zurück zur Shell) aktivieren\n"
 
-#: nano.c:381
+#: nano.c:392
 msgid " +LINE\t\tStart at line number LINE\n"
 msgstr " +ZEILE\t\tBei Zeile ZEILE beginnen\n"
 
-#: nano.c:388
+#: nano.c:399
 #, c-format
 msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n"
 msgstr " nano Version %s von Chris Allegretta (compiliert um %s, %s)\n"
 
-#: nano.c:390
+#: nano.c:401
 msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n"
 msgstr " Email: nano@asty.org\tWWW: http://www.asty.org/nano\n"
 
-#: nano.c:415
+#: nano.c:426
 msgid "Mark Set"
 msgstr "Markierung gesetzt"
 
-#: nano.c:420
+#: nano.c:431
 msgid "Mark UNset"
 msgstr "Markierung gelöscht"
 
-#: nano.c:862
+#: nano.c:875
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap aufgerufen mit inptr->data=\"%s\"\n"
 
-#: nano.c:922
+#: nano.c:935
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data jetzt = \"%s\"\n"
 
-#: nano.c:975
+#: nano.c:988
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Nachher, data = \"%s\"\n"
 
-#: nano.c:1045
+#: nano.c:1058
 msgid "Error deleting tempfile, ack!"
 msgstr "Konnte temporäre Datei nicht löschen"
 
-#: nano.c:1062
+#: nano.c:1076
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Konnte keine temporäre Datei erzeugen: %s"
 
-#: nano.c:1086
+#: nano.c:1099
 #, c-format
 msgid "Could not invoke spell program \"%s\""
 msgstr "Konnte Rechtschreibprogramm \"%s\" nicht aufrufen"
 
 #. Why 32512? I dont know!
-#: nano.c:1092
+#: nano.c:1105
 msgid "Could not invoke \"ispell\""
 msgstr "Konnte \"ispell\" nicht aufrufen"
 
-#: nano.c:1104
+#: nano.c:1118
 msgid "Finished checking spelling"
 msgstr "Rechtschreibprüfung abgeschlossen"
 
-#: nano.c:1122
+#: nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Veränderten Puffer speichern (\"Nein\" verwirft die Änderungen) ? "
 
-#: nano.c:1245
+#: nano.c:1259
 msgid "Cannot resize top win"
 msgstr "Kann die Größe des oberen Fensters nicht verändern"
 
-#: nano.c:1247
+#: nano.c:1261
 msgid "Cannot move top win"
 msgstr "Kann oberes Fenster nicht verschieben"
 
-#: nano.c:1249
+#: nano.c:1263
 msgid "Cannot resize edit win"
 msgstr "Kann Größe des Bearbeitungsfensters nicht verändern"
 
-#: nano.c:1251
+#: nano.c:1265
 msgid "Cannot move edit win"
 msgstr "Kann Bearbeitungsfenster nicht verschieben"
 
-#: nano.c:1253
+#: nano.c:1267
 msgid "Cannot resize bottom win"
 msgstr "Kann Größe des unteren Fensters nicht verändern"
 
-#: nano.c:1255
+#: nano.c:1269
 msgid "Cannot move bottom win"
 msgstr "Kann unteres Fenster nicht verschieben"
 
-#: nano.c:1718
+#: nano.c:1742
 msgid "Main: set up windows\n"
 msgstr "Hauptprogramm: Fenster konfigurieren\n"
 
-#: nano.c:1740
+#: nano.c:1764
 msgid "Main: bottom win\n"
 msgstr "Hauptprogramm: unteres Fenster\n"
 
-#: nano.c:1746
+#: nano.c:1770
 msgid "Main: open file\n"
 msgstr "Hauptprogramm: Datei öffnen\n"
 
-#: nano.c:1819
+#: nano.c:1843
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Erhielt Alt-[-%c! (%d)\n"
 
-#: nano.c:1835
+#: nano.c:1859
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Erhielt Alt-%c! (%d)\n"
 
 #: search.c:71
-#, fuzzy, c-format
-msgid "Case Sensitive Regexp Search%s"
-msgstr "Suche mit Unterscheidung von Groß- und Kleinschreibung%s"
+#, c-format
+msgid "Case Sensitive Regexp Search%s%s"
+msgstr ""
+"Suche mit Unterscheidung von Groß- und Kleinschreibung nach regulärem "
+"Ausdruck%s%s"
 
 #: search.c:73
-#, fuzzy, c-format
-msgid "Regexp Search%s"
-msgstr "Suche%s"
+#, c-format
+msgid "Regexp Search%s%s"
+msgstr "Suche nach regulärem Ausdruck%s%s"
 
 #: search.c:76
 #, c-format
-msgid "Case Sensitive Search%s"
-msgstr "Suche mit Unterscheidung von Groß- und Kleinschreibung%s"
+msgid "Case Sensitive Search%s%s"
+msgstr "Suche mit Unterscheidung von Groß- und Kleinschreibung%s%s"
 
 #: search.c:78
 #, c-format
-msgid "Search%s"
-msgstr "Suche%s"
+msgid "Search%s%s"
+msgstr "Suche%s%s"
 
-#: search.c:86
+#: search.c:81
+msgid " (to replace)"
+msgstr " (zu ersetzen)"
+
+#: search.c:89
 msgid "Search Cancelled"
 msgstr "Suche abgebrochen"
 
-#: search.c:177
+#: search.c:186
 msgid "Search Wrapped"
 msgstr "Suche in neue Zeile umgebrochen"
 
-#: search.c:232
+#: search.c:240
 #, c-format
 msgid "Replaced %d occurences"
-msgstr "%d mal Ersetzung vorgenommen"
+msgstr "%d Ersetzungen vorgenommen"
 
-#: search.c:234
+#: search.c:242
 msgid "Replaced 1 occurence"
 msgstr "1 Ersetzung vorgenommen"
 
-#: search.c:373 search.c:395 search.c:418
+#: search.c:381 search.c:402 search.c:425
 msgid "Replace Cancelled"
 msgstr "Ersetzung abgebrochen"
 
-#: search.c:391
+#: search.c:398
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Ersetzen mit [%s]"
 
 #. last_search is empty
-#: search.c:416
+#: search.c:423
 msgid "Replace with"
 msgstr "Ersetzen mit"
 
-#: search.c:457
+#: search.c:464
 msgid "Replace this instance?"
 msgstr "Ersetzen?"
 
 #. Ask for it
-#: search.c:508
+#: search.c:515
 msgid "Enter line number"
 msgstr "Zeilennummer eingeben"
 
-#: search.c:510
+#: search.c:517
 msgid "Aborted"
 msgstr "Abgebrochen"
 
-#: search.c:530
+#: search.c:537
 msgid "Come on, be reasonable"
 msgstr "Komm schon, sei vernünftig"
 
-#: search.c:535
+#: search.c:542
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Nur %d Zeilen vorhanden, springe zur letzten Zeile"
 
 #: winio.c:119
-#, fuzzy, c-format
+#, c-format
 msgid "actual_x_from_start for xplus=%d returned %d\n"
-msgstr "actual_x für xplus=%d gab %d zurück\n"
+msgstr "actual_x_from_start für xplus=%d gab %d zurück\n"
 
 #: winio.c:409
 #, c-format
@@ -823,50 +837,28 @@ msgstr "Gebe Inhalt der Zwischenablage nach stderr aus...\n"
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Gebe einen Puffer nach stderr aus...\n"
 
-#, fuzzy
-#~ msgid "To Replace"
-#~ msgstr "Ersetzen"
-
-#, fuzzy
-#~ msgid "To Search"
-#~ msgstr "Suche"
-
-#~ msgid " Y"
-#~ msgstr " J"
-
-#~ msgid " A"
-#~ msgstr " A"
-
-#~ msgid " N"
-#~ msgstr " N"
-
-#~ msgid "^C"
-#~ msgstr "^C"
-
-#~ msgid "nano: malloc: out of memory!"
-#~ msgstr "nano: malloc: Kein Speicher verfügbar!"
-
-#~ msgid "nano.save"
-#~ msgstr "nano.save"
-
-#~ msgid "nano: realloc: out of memory!"
-#~ msgstr "nano: realloc: Kein Speicher verfügbar!"
-
 #~ msgid "%s: %s"
 #~ msgstr "%s: %s"
 
-#~ msgid " [%s]"
-#~ msgstr " [%s]"
-
-#~ msgid "$"
-#~ msgstr "DM"
-
 #~ msgid ".XXXXXX"
 #~ msgstr ".XXXXXX"
 
 #~ msgid "\n"
 #~ msgstr "\n"
 
+#~ msgid "nano.save"
+#~ msgstr "nano.save"
+
+#~ msgid ".save"
+#~ msgstr ".save"
+
+#~ msgid "Sorry, this function not available with nano-tiny option"
+#~ msgstr ""
+#~ "Tut mir leid, dies Funktion ist im Minimalmodus von nano nicht verfügbar"
+
+#~ msgid " "
+#~ msgstr " "
+
 #~ msgid "nano."
 #~ msgstr "nano."
 
@@ -891,8 +883,11 @@ msgstr "Gebe einen Puffer nach stderr aus...\n"
 #~ msgid "(@%c)\t"
 #~ msgstr "(@%c)\t"
 
-#~ msgid "%s\n"
-#~ msgstr "%s\n"
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "regexp"
+#~ msgstr "regulärer Ausdruck"
 
 #~ msgid "version"
 #~ msgstr "Version"
@@ -912,6 +907,9 @@ msgstr "Gebe einen Puffer nach stderr aus...\n"
 #~ msgid "help"
 #~ msgstr "help"
 
+#~ msgid "cut"
+#~ msgstr "cut"
+
 #~ msgid "autoindent"
 #~ msgstr "autoindent"
 
@@ -922,7 +920,7 @@ msgstr "Gebe einen Puffer nach stderr aus...\n"
 #~ msgstr "speller"
 
 #~ msgid "fill"
-#~ msgstr "fille"
+#~ msgstr "fill"
 
 #~ msgid "mouse"
 #~ msgstr "mouse"
@@ -930,17 +928,30 @@ msgstr "Gebe einen Puffer nach stderr aus...\n"
 #~ msgid "pico"
 #~ msgstr "pico"
 
-#, fuzzy
-#~ msgid "?Vchilmpr:s:tvwxz"
-#~ msgstr "?Vchimpr:s:tvwxz"
+#~ msgid "nofollow"
+#~ msgstr "nofollow"
 
-#, fuzzy
-#~ msgid "h?Vcilmpr:s:tvwxz"
-#~ msgstr "h?Vcilmpr:s:tvwxz"
+#~ msgid "tabsize"
+#~ msgstr "tabsize"
+
+#~ msgid "?T:RVchiklmpr:s:tvwxz"
+#~ msgstr "?T:RVchiklmpr:s:tvwxz"
+
+#~ msgid "h?T:RVciklmpr:s:tvwxz"
+#~ msgstr "h?T:RVciklmpr:s:tvwxz"
 
 #~ msgid "I got %c (%d)!\n"
 #~ msgstr "Erhielt %c (%d)!\n"
 
+#~ msgid " [%s]"
+#~ msgstr " [%s]"
+
+#~ msgid "Replace failed: unknown subexpression!"
+#~ msgstr "Ersetzung gescheitert: unbekannter Unterausdruck"
+
+#~ msgid "$"
+#~ msgstr "DM"
+
 #~ msgid "File: "
 #~ msgstr "Datei: "
 
@@ -953,6 +964,18 @@ msgstr "Gebe einen Puffer nach stderr aus...\n"
 #~ msgid ": "
 #~ msgstr ": "
 
+#~ msgid " Y"
+#~ msgstr " J"
+
+#~ msgid " A"
+#~ msgstr " A"
+
+#~ msgid " N"
+#~ msgstr " N"
+
+#~ msgid "^C"
+#~ msgstr "^C"
+
 #~ msgid "[ "
 #~ msgstr "[ "
 
@@ -962,6 +985,18 @@ msgstr "Gebe einen Puffer nach stderr aus...\n"
 #~ msgid "(%ld) %s\n"
 #~ msgstr "(%ld) %s\n"
 
+#~ msgid "To Replace"
+#~ msgstr "Ersetzen"
+
+#~ msgid "To Search"
+#~ msgstr "Suche"
+
+#~ msgid "nano: malloc: out of memory!"
+#~ msgstr "nano: malloc: Kein Speicher verfügbar!"
+
+#~ msgid "nano: realloc: out of memory!"
+#~ msgstr "nano: realloc: Kein Speicher verfügbar!"
+
 #~ msgid "Suspend"
 #~ msgstr "Suspend"
 

po/es.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 0.9.11\n"
-"POT-Creation-Date: 2000-07-07 21:26-0400\n"
-"PO-Revision-Date: 2000-06-20 02:56+0200\n"
+"Project-Id-Version: 0.9.13\n"
+"POT-Creation-Date: 2000-07-27 20:16-0400\n"
+"PO-Revision-Date: 2000-07-13 04:57+0200\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Spanish <jordi@sindominio.net>\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 msgid "add_to_cutbuffer called with inptr->data = %s\n"
 msgstr "add_to_cutbuffer llamado con inptr->data = %s\n"
 
-#: cut.c:148
+#: cut.c:149
 msgid "Blew away cutbuffer =)\n"
 msgstr "Nos hemos cargado el cutbuffer =)\n"
 
@@ -27,83 +27,83 @@ msgstr "Nos hemos cargado el cutbuffer =)\n"
 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:180 files.c:197
+#: files.c:181 files.c:198
 #, c-format
 msgid "Read %d lines"
 msgstr "%d líneas leídas"
 
-#: files.c:215 search.c:163 search.c:181
+#: files.c:216 search.c:172 search.c:190
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" no encontrado"
 
 #. We have a new file
-#: files.c:219
+#: files.c:220
 msgid "New File"
 msgstr "Nuevo Fichero"
 
-#: files.c:228
+#: files.c:229
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr "Fichero \"%s\" es un directorio"
 
-#: files.c:233
+#: files.c:234
 msgid "Reading File"
 msgstr "Leyendo Fichero"
 
-#: files.c:246
+#: files.c:247
 msgid "File to insert [from ./] "
 msgstr "Fichero a insertar [desde ./] "
 
-#: files.c:271 files.c:295 files.c:462 nano.c:1135
+#: files.c:272 files.c:296 files.c:486 nano.c:1149
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: files.c:307 files.c:323 files.c:338 files.c:355 files.c:361
+#: files.c:318 files.c:338 files.c:351 files.c:368 files.c:374
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "No pude abrir el fichero para escribir: %s"
 
-#: files.c:315
+#: files.c:326
 msgid "Could not open file: Path length exceeded."
 msgstr "El fichero no pudo ser abierto: longitud del path excedida."
 
-#: files.c:343
+#: files.c:356
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Escribí >%s\n"
 
-#: files.c:370
+#: files.c:383
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "No pude cerrar %s: %s"
 
 #. Try a rename??
-#: files.c:391 files.c:402 files.c:407
+#: files.c:404 files.c:415 files.c:420
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "No pude abrir %s para escribir: %s"
 
-#: files.c:413
+#: files.c:426
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "No pude establecer permisos %o en %s: %s"
 
-#: files.c:420
+#: files.c:433
 #, c-format
 msgid "Wrote %d lines"
 msgstr "%d líneas escritas"
 
-#: files.c:441
+#: files.c:465
 msgid "File Name to write"
 msgstr "Nombre de Fichero a escribir"
 
-#: files.c:446
+#: files.c:470
 #, c-format
 msgid "filename is %s"
 msgstr "filename es %s"
 
-#: files.c:451
+#: files.c:475
 msgid "File exists, OVERWRITE ?"
 msgstr "El fichero existe, SOBREESCRIBIR ?"
 
@@ -350,9 +350,9 @@ msgstr "Cancelar"
 
 #: global.c:295
 msgid "No Replace"
-msgstr ""
+msgstr "No Reemplazar"
 
-#: nano.c:111
+#: nano.c:115
 msgid ""
 "\n"
 "Buffer written to 'nano.save'\n"
@@ -360,11 +360,11 @@ msgstr ""
 "\n"
 "Buffer escrito en 'nano.save'\n"
 
-#: nano.c:118
+#: nano.c:122
 msgid "Key illegal in VIEW mode"
 msgstr "Tecla ilegal en modo VISUALIZACIÓN"
 
-#: nano.c:158
+#: nano.c:162
 msgid ""
 " nano help text\n"
 "\n"
@@ -399,15 +399,15 @@ msgstr ""
 "opcionales están representadas entre paréntesis:\n"
 "\n"
 
-#: nano.c:259
+#: nano.c:263
 msgid "free_node(): free'd a node, YAY!\n"
 msgstr "free_node(): liberado un nodo, YEAH!\n"
 
-#: nano.c:264
+#: nano.c:268
 msgid "free_node(): free'd last node.\n"
 msgstr "free_node(): liberado el último nodo.\n"
 
-#: nano.c:309
+#: nano.c:313
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
@@ -415,81 +415,85 @@ msgstr ""
 "Uso: nano [opción larga GNU] [opción] +LÍNEA <fichero>\n"
 "\n"
 
-#: nano.c:310
+#: nano.c:314
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Opcion\t\tOpcion larga\t\tSignificado\n"
 
-#: nano.c:313
+#: nano.c:317
 msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n"
 msgstr " -T \t\t--tabsize=[num]\t\tFijar el ancho de tab a num\n"
 
-#: nano.c:317
-msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
-msgstr ""
-
 #: nano.c:321
+msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
+msgstr " -R\t\t--regexp\t\tUsar expresiones regulares para las búsquedas\n"
+
+#: nano.c:325
 msgid " -V \t\t--version\t\tPrint version information and exit\n"
 msgstr " -V \t\t--version\t\tImprimir versión y salir\n"
 
-#: nano.c:323
+#: nano.c:327
 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
 msgstr " -c \t\t--const\t\t\tMostrar siempre la posición del cursor\n"
 
-#: nano.c:325
+#: nano.c:329
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr " -h \t\t--help\t\t\tMostrar este mensaje\n"
 
-#: nano.c:327
+#: nano.c:332
+msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
+msgstr " -k \t\t--cut\t\t\t^K corta desde el cursor al final de línea\n"
+
+#: nano.c:335
 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
 msgstr " -i \t\t--autoindent\t\tIndentar automáticamente nuevas líneas\n"
 
-#: nano.c:329
+#: nano.c:337
 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n"
 msgstr ""
 " -l \t\t--nofollow\t\tNo seguir enlaces simbólicos, sobreescribirlos.\n"
 
-#: nano.c:332
+#: nano.c:340
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr " -m \t\t--mouse\t\t\tHabilitar ratón\n"
 
-#: nano.c:337
+#: nano.c:345
 msgid ""
 " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
 msgstr " -r [#cols] \t--fill=[#cols]\t\tRellenar columnas (wrapear en) #cols\n"
 
-#: nano.c:339
+#: nano.c:347
 msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n"
 msgstr " -p\t \t--pico\t\t\tHacer el menú más parecido a Pico\n"
 
-#: nano.c:341
+#: nano.c:349
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr " -s [prog] \t--speller=[prog]\tHabilitar corrector alternativo\n"
 
-#: nano.c:343
+#: nano.c:351
 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\t--tempfile\t\tAutosalvar al salir, sin preguntar\n"
 
-#: nano.c:345
+#: nano.c:353
 msgid " -v \t\t--view\t\t\tView (read only) mode\n"
 msgstr " -v \t\t--view\t\t\tModo visualización (sólo lectura)\n"
 
-#: nano.c:347
+#: nano.c:355
 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
 msgstr " -w \t\t--nowrap\t\tNo wrapear líneas largas\n"
 
-#: nano.c:349
+#: nano.c:357
 msgid " -x \t\t--nohelp\t\tDon't show help window\n"
 msgstr " -x \t\t--nohelp\t\tNo mostrar la ventana de ayuda\n"
 
-#: nano.c:351
+#: nano.c:359
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr " -z \t\t--suspend\t\tHabilitar suspensión\n"
 
-#: nano.c:353
+#: nano.c:361
 msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
 msgstr " +LINE\t\t\t\t\tComenzar en la línea número LÍNEA\n"
 
-#: nano.c:355
+#: nano.c:363
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
@@ -497,252 +501,260 @@ msgstr ""
 "Uso: nano [opción] +LÍNEA <fichero>\n"
 "\n"
 
-#: nano.c:356
+#: nano.c:364
 msgid "Option\t\tMeaning\n"
 msgstr "Opción\t\tSignificado\n"
 
-#: nano.c:358
+#: nano.c:366
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr " -T [num]\tFijar el ancho de tab a num\n"
 
-#: nano.c:360
+#: nano.c:368
 msgid " -R\t\tUse regular expressions for search\n"
-msgstr ""
+msgstr " -R\t\tUsar expresiones regulares para las búsquedas\n"
 
-#: nano.c:361
+#: nano.c:369
 msgid " -V \t\tPrint version information and exit\n"
 msgstr " -V \t\tImprimir información sobre la versión y salir\n"
 
-#: nano.c:362
+#: nano.c:370
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr " -c \t\tMostrar constantemente la posición del cursor\n"
 
-#: nano.c:363
+#: nano.c:371
 msgid " -h \t\tShow this message\n"
 msgstr " -h \t\tMostrar este mensaje\n"
 
-#: nano.c:364
+#: nano.c:373
+msgid " -k \t\tLet ^K cut from cursor to end of line\n"
+msgstr " -k \t\t^K corta desde el cursor al final de línea\n"
+
+#: nano.c:375
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr " -v \t\tIndentar automáticamente nuevas líneas\n"
 
-#: nano.c:366
+#: nano.c:377
 msgid " -l \t\tDon't follow symbolic links, overwrite.\n"
 msgstr " -l \t\tNo seguir enlaces simbólicos, sobreescribirlos.\n"
 
-#: nano.c:369
+#: nano.c:380
 msgid " -m \t\tEnable mouse\n"
 msgstr " -m \t\tHabilitar ratón\n"
 
-#: nano.c:373
+#: nano.c:384
 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
 msgstr " -r [#cols] \tRellenar columnas (wrapear líneas en) #cols\n"
 
-#: nano.c:374
+#: nano.c:385
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr " -s [prog] \tHabilitar corrector alternativo\n"
 
-#: nano.c:375
+#: nano.c:386
 msgid " -p \t\tMake bottom 2 lines more Pico-like\n"
 msgstr " -p \t\tHacer el menú más parecido a Pico\n"
 
-#: nano.c:376
+#: nano.c:387
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\tAutosalvar al salir, no preguntar\n"
 
-#: nano.c:377
+#: nano.c:388
 msgid " -v \t\tView (read only) mode\n"
 msgstr " -v \t\tModo visualización (sólo lectura)\n"
 
-#: nano.c:378
+#: nano.c:389
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr " -w \t\tNo wrapear líneas largas\n"
 
-#: nano.c:379
+#: nano.c:390
 msgid " -x \t\tDon't show help window\n"
 msgstr " -x \t\tNo mostrar la ventana de ayuda\n"
 
-#: nano.c:380
+#: nano.c:391
 msgid " -z \t\tEnable suspend\n"
 msgstr " -z \t\tHabilitar suspensión\n"
 
-#: nano.c:381
+#: nano.c:392
 msgid " +LINE\t\tStart at line number LINE\n"
 msgstr " +LÍNEA\t\tComenzar en la línea número LÍNEA\n"
 
-#: nano.c:388
+#: nano.c:399
 #, c-format
 msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n"
 msgstr " nano versión %s por Chris Allegretta (compilado %s, %s)\n"
 
-#: nano.c:390
+#: nano.c:401
 msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n"
 msgstr " Correo-e: nano@asty.org\tWeb: http://www.asty.org/nano\n"
 
-#: nano.c:415
+#: nano.c:426
 msgid "Mark Set"
 msgstr "Marca Establecida"
 
-#: nano.c:420
+#: nano.c:431
 msgid "Mark UNset"
 msgstr "Marca Borrada"
 
-#: nano.c:862
+#: nano.c:875
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap llamada con inptr->data=\"%s\"\n"
 
-#: nano.c:922
+#: nano.c:935
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data ahora = \"%d\"\n"
 
-#: nano.c:975
+#: nano.c:988
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Después, data = \"%s\"\n"
 
-#: nano.c:1045
+#: nano.c:1058
 msgid "Error deleting tempfile, ack!"
 msgstr "Error borrando el fichero temporal, ouch!"
 
-#: nano.c:1062
+#: nano.c:1076
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "No pude crear un fichero temporal: %s"
 
-#: nano.c:1086
+#: nano.c:1099
 #, c-format
 msgid "Could not invoke spell program \"%s\""
 msgstr "No se pudo llamar al corrector \"%s\""
 
 #. Why 32512? I dont know!
-#: nano.c:1092
+#: nano.c:1105
 msgid "Could not invoke \"ispell\""
 msgstr "No pude llamar a \"ispell\""
 
-#: nano.c:1104
+#: nano.c:1118
 msgid "Finished checking spelling"
 msgstr "Revisión de ortografía finalizada"
 
-#: nano.c:1122
+#: nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Salvar el buffer modificado (RESPONDER \"No\" DESTRUIRÁ LOS CAMBIOS) ?"
 
-#: nano.c:1245
+#: nano.c:1259
 msgid "Cannot resize top win"
 msgstr "No se puede cambiar el tamaño de la ventana superior"
 
-#: nano.c:1247
+#: nano.c:1261
 msgid "Cannot move top win"
 msgstr "No se puede mover la ventana superior"
 
-#: nano.c:1249
+#: nano.c:1263
 msgid "Cannot resize edit win"
 msgstr "No se puede cambiar el tamaño de la ventana de edición"
 
-#: nano.c:1251
+#: nano.c:1265
 msgid "Cannot move edit win"
 msgstr "No se puede mover la ventana de edición"
 
-#: nano.c:1253
+#: nano.c:1267
 msgid "Cannot resize bottom win"
 msgstr "No se puede cambiar el tamaño de la ventana inferior"
 
-#: nano.c:1255
+#: nano.c:1269
 msgid "Cannot move bottom win"
 msgstr "No se puede mover la ventana inferior"
 
-#: nano.c:1718
+#: nano.c:1742
 msgid "Main: set up windows\n"
 msgstr "Main: configurar las ventanas\n"
 
-#: nano.c:1740
+#: nano.c:1764
 msgid "Main: bottom win\n"
 msgstr "Main: ventana inferior\n"
 
-#: nano.c:1746
+#: nano.c:1770
 msgid "Main: open file\n"
 msgstr "Main: abrir fichero\n"
 
-#: nano.c:1819
+#: nano.c:1843
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Pillé Alt-[-%c! (%d)\n"
 
-#: nano.c:1835
+#: nano.c:1859
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Pillé Alt-%c! (%d)\n"
 
 #: search.c:71
-#, fuzzy, c-format
-msgid "Case Sensitive Regexp Search%s"
-msgstr "Búsqueda con Mayúsculas/Minúsculas%s"
+#, c-format
+msgid "Case Sensitive Regexp Search%s%s"
+msgstr "Búsqueda con Regexp y Mayúsculas/Minúsculas%s%s"
 
 #: search.c:73
-#, fuzzy, c-format
-msgid "Regexp Search%s"
-msgstr "Buscar%s"
+#, c-format
+msgid "Regexp Search%s%s"
+msgstr "Busqueda con Regexp%s%s"
 
 #: search.c:76
 #, c-format
-msgid "Case Sensitive Search%s"
-msgstr "Búsqueda con Mayúsculas/Minúsculas%s"
+msgid "Case Sensitive Search%s%s"
+msgstr "Búsqueda con Mayúsculas/Minúsculas%s%s"
 
 #: search.c:78
 #, c-format
-msgid "Search%s"
-msgstr "Buscar%s"
+msgid "Search%s%s"
+msgstr "Buscar%s%s"
 
-#: search.c:86
+#: search.c:81
+msgid " (to replace)"
+msgstr " (a reemplazar)"
+
+#: search.c:89
 msgid "Search Cancelled"
 msgstr "Búsqueda Cancelada"
 
-#: search.c:177
+#: search.c:186
 msgid "Search Wrapped"
 msgstr "Búsqueda Recomenzada"
 
-#: search.c:232
+#: search.c:240
 #, c-format
 msgid "Replaced %d occurences"
 msgstr "%d ocurrencias reemplazadas"
 
-#: search.c:234
+#: search.c:242
 msgid "Replaced 1 occurence"
 msgstr "1 ocurrencia reemplazada"
 
-#: search.c:373 search.c:395 search.c:418
+#: search.c:381 search.c:402 search.c:425
 msgid "Replace Cancelled"
 msgstr "Reemplazar Cancelado"
 
-#: search.c:391
+#: search.c:398
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Reemplazar con [%s]"
 
 #. last_search is empty
-#: search.c:416
+#: search.c:423
 msgid "Replace with"
 msgstr "Reemplazar con"
 
-#: search.c:457
+#: search.c:464
 msgid "Replace this instance?"
 msgstr "Reemplazar esta instancia?"
 
 #. Ask for it
-#: search.c:508
+#: search.c:515
 msgid "Enter line number"
 msgstr "Introduce número de línea"
 
-#: search.c:510
+#: search.c:517
 msgid "Aborted"
 msgstr "Abortado"
 
-#: search.c:530
+#: search.c:537
 msgid "Come on, be reasonable"
 msgstr "Venga ya, se razonable"
 
-#: search.c:535
+#: search.c:542
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Sólo hay %d líneas, saltando hasta la última"
@@ -817,9 +829,6 @@ msgstr "Volcando el cutbuffer a stderr...\n"
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Volcando un buffer a stderr...\n"
 
-#~ msgid "To Replace"
-#~ msgstr "Reemplazar"
-
 #~ msgid "To Search"
 #~ msgstr "Buscar"
 

po/fi.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 0.9.11\n"
-"POT-Creation-Date: 2000-07-07 21:26-0400\n"
+"POT-Creation-Date: 2000-07-27 20:16-0400\n"
 "PO-Revision-Date: 2000-06-21 23:08+03:00\n"
 "Last-Translator: Pauli Virtanen <pauli.virtanen@saunalahti.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 msgid "add_to_cutbuffer called with inptr->data = %s\n"
 msgstr "add_to_cutbuffer funktion parametri inptr->data = %s\n"
 
-#: cut.c:148
+#: cut.c:149
 msgid "Blew away cutbuffer =)\n"
 msgstr "Leiketila katosi =)\n"
 
@@ -26,83 +26,83 @@ msgstr "Leiketila katosi =)\n"
 msgid "read_line: not on first line and prev is NULL"
 msgstr "read_line: ei ensimmäisellä rivillä ja prev on NULL"
 
-#: files.c:180 files.c:197
+#: files.c:181 files.c:198
 #, c-format
 msgid "Read %d lines"
 msgstr "%d riviä luettu"
 
-#: files.c:215 search.c:163 search.c:181
+#: files.c:216 search.c:172 search.c:190
 #, c-format
 msgid "\"%s\" not found"
 msgstr "Tiedostoa \"%s\" ei ole"
 
 #. We have a new file
-#: files.c:219
+#: files.c:220
 msgid "New File"
 msgstr "Uusi tiedosto"
 
-#: files.c:228
+#: files.c:229
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr "\"%s\" on hakemisto"
 
-#: files.c:233
+#: files.c:234
 msgid "Reading File"
 msgstr "Tiedostoa luetaan"
 
-#: files.c:246
+#: files.c:247
 msgid "File to insert [from ./] "
 msgstr "Lisättävä tiedosto [hakemistossa ./]"
 
-#: files.c:271 files.c:295 files.c:462 nano.c:1135
+#: files.c:272 files.c:296 files.c:486 nano.c:1149
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#: files.c:307 files.c:323 files.c:338 files.c:355 files.c:361
+#: files.c:318 files.c:338 files.c:351 files.c:368 files.c:374
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Tiedostoa ei voitu avata luettavaksi: %s"
 
-#: files.c:315
+#: files.c:326
 msgid "Could not open file: Path length exceeded."
 msgstr "Tiedostoa ei voitu avata: liian pitkä tiedostonnimi."
 
-#: files.c:343
+#: files.c:356
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Kirjoitettu: >%s\n"
 
-#: files.c:370
+#: files.c:383
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Tiedosto %s ei sulkeutunut: %s"
 
 #. Try a rename??
-#: files.c:391 files.c:402 files.c:407
+#: files.c:404 files.c:415 files.c:420
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Tiedostoa %s ei voitu avata kirjoitettavaksi: %s"
 
-#: files.c:413
+#: files.c:426
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Oikeuksia %o ei voitu asettaa tiedostolle %s: %s"
 
-#: files.c:420
+#: files.c:433
 #, c-format
 msgid "Wrote %d lines"
 msgstr "%d riviä kirjoitettu"
 
-#: files.c:441
+#: files.c:465
 msgid "File Name to write"
 msgstr "Kirjoitettavan tiedoston nimi"
 
-#: files.c:446
+#: files.c:470
 #, c-format
 msgid "filename is %s"
 msgstr "tiedoston nimi on %s"
 
-#: files.c:451
+#: files.c:475
 msgid "File exists, OVERWRITE ?"
 msgstr "Tiedosto on jo olemassa, korvataanko?"
 
@@ -351,7 +351,7 @@ msgstr "Peru"
 msgid "No Replace"
 msgstr ""
 
-#: nano.c:111
+#: nano.c:115
 msgid ""
 "\n"
 "Buffer written to 'nano.save'\n"
@@ -359,11 +359,11 @@ msgstr ""
 "\n"
 "Teksti kirjoitettu tiedostoon 'nano.save'\n"
 
-#: nano.c:118
+#: nano.c:122
 msgid "Key illegal in VIEW mode"
 msgstr "Virheellinen näppäin katselutilassa"
 
-#: nano.c:158
+#: nano.c:162
 msgid ""
 " nano help text\n"
 "\n"
@@ -396,99 +396,103 @@ msgstr ""
 "ovat sulkeissa:\n"
 "\n"
 
-#: nano.c:259
+#: nano.c:263
 msgid "free_node(): free'd a node, YAY!\n"
 msgstr "free_node(): node vapautettu, YAY!\n"
 
-#: nano.c:264
+#: nano.c:268
 msgid "free_node(): free'd last node.\n"
 msgstr "free_node(): viimeinen node vapautettu.\n"
 
-#: nano.c:309
+#: nano.c:313
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
 msgstr ""
 "Käyttö: nano [GNU pitkät komentoriviasetukset] [asetukset] +RIVI <tiedosto>\n"
 
-#: nano.c:310
+#: nano.c:314
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Asetus\t\tPitkä asetus\t\tMerkitys\n"
 
-#: nano.c:313
+#: nano.c:317
 msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n"
 msgstr " -T \t\t--tabsize=[leveys]\tAseta sarkaimen leveys\n"
 
-#: nano.c:317
+#: nano.c:321
 msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
 msgstr ""
 
-#: nano.c:321
+#: nano.c:325
 msgid " -V \t\t--version\t\tPrint version information and exit\n"
 msgstr " -V \t\t--version\t\tTulosta versiotiedot ja lopeta\n"
 
-#: nano.c:323
+#: nano.c:327
 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
 msgstr " -c \t\t--const\t\t\tNäytä kohdistimen sijainti jatkuvasti\n"
 
-#: nano.c:325
+#: nano.c:329
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr " -h \t\t--help\t\t\tNäytä tämä ohje\n"
 
-#: nano.c:327
+#: nano.c:332
+msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
+msgstr ""
+
+#: nano.c:335
 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
 msgstr " -i \t\t--autoindent\t\tSisennä uudet rivit automaattisesti\n"
 
-#: nano.c:329
+#: nano.c:337
 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n"
 msgstr ""
 " -l \t\t--nofollow\t\tÄlä seuraa symbolisia linkkejä, vaan\n"
 "\t\t\t\t\tkorvaa ne tiedostoilla.\n"
 
-#: nano.c:332
+#: nano.c:340
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr " -m \t\t--mouse\t\t\tKäytä hiirtä\n"
 
-#: nano.c:337
+#: nano.c:345
 msgid ""
 " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
 msgstr " -r [#lkm] \t--fill=[#lkm]\t\tRivitä annettua pidemmät rivit\n"
 
-#: nano.c:339
+#: nano.c:347
 msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n"
 msgstr " -p\t \t--pico\t\t\tNäytä 2 alinta riviä kuin Pico\n"
 
-#: nano.c:341
+#: nano.c:349
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr " -s [ohjelma] \t--speller=[ohjelma]\tKäytä annettua oikolukuohjelmaa\n"
 
-#: nano.c:343
+#: nano.c:351
 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
 msgstr ""
 " -t \t\t--tempfile\t\tTallenna tiedosto kysymättä\n"
 "\t\t\t\t\tpoistettaessa \n"
 
-#: nano.c:345
+#: nano.c:353
 msgid " -v \t\t--view\t\t\tView (read only) mode\n"
 msgstr " -v \t\t--view\t\t\tKatselutila (vain luku)\n"
 
-#: nano.c:347
+#: nano.c:355
 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
 msgstr " -w \t\t--nowrap\t\tÄlä rivitä pitkiä rivejä\n"
 
-#: nano.c:349
+#: nano.c:357
 msgid " -x \t\t--nohelp\t\tDon't show help window\n"
 msgstr " -x \t\t--nohelp\t\tÄlä näytä ohjeikkunaa\n"
 
-#: nano.c:351
+#: nano.c:359
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr " -z \t\t--suspend\t\tMahdollista keskeyttäminen\n"
 
-#: nano.c:353
+#: nano.c:361
 msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
 msgstr " +RIVI\t\t\t\t\tSiirry riville RIVI\n"
 
-#: nano.c:355
+#: nano.c:363
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
@@ -496,252 +500,261 @@ msgstr ""
 "Käyttö: nano [asetukset] +RIVI <tiedosto>\n"
 "\n"
 
-#: nano.c:356
+#: nano.c:364
 msgid "Option\t\tMeaning\n"
 msgstr "Asetus\t\tMerkitys\n"
 
-#: nano.c:358
+#: nano.c:366
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr " -T [leveys]\tAseta sarkaimen leveys\n"
 
-#: nano.c:360
+#: nano.c:368
 msgid " -R\t\tUse regular expressions for search\n"
 msgstr ""
 
-#: nano.c:361
+#: nano.c:369
 msgid " -V \t\tPrint version information and exit\n"
 msgstr " -V \t\tTulosta versiotiedot ja lopeta\n"
 
-#: nano.c:362
+#: nano.c:370
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr " -c \t\tNäytä kohdistimen sijainti jatkuvasti\n"
 
-#: nano.c:363
+#: nano.c:371
 msgid " -h \t\tShow this message\n"
 msgstr " -h \t\tNäytä tämä ohje\n"
 
-#: nano.c:364
+#: nano.c:373
+msgid " -k \t\tLet ^K cut from cursor to end of line\n"
+msgstr ""
+
+#: nano.c:375
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr " -i \t\tSisennä uudet rivit automaattisesti\n"
 
-#: nano.c:366
+#: nano.c:377
 msgid " -l \t\tDon't follow symbolic links, overwrite.\n"
 msgstr " -l \t\tÄlä seuraa symbolisia linkkejä, vaan korvaa ne tiedostoilla.\n"
 
-#: nano.c:369
+#: nano.c:380
 msgid " -m \t\tEnable mouse\n"
 msgstr " -m \t\tKäytä hiirtä\n"
 
-#: nano.c:373
+#: nano.c:384
 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
 msgstr " -r [#lkm] \tRivitä annettua pidemmät rivit\n"
 
-#: nano.c:374
+#: nano.c:385
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr " -s [ohjelma]  \tKäytä annettua oikolukuohjelmaa\n"
 
-#: nano.c:375
+#: nano.c:386
 msgid " -p \t\tMake bottom 2 lines more Pico-like\n"
 msgstr " -p \t\tNäytä 2 alinta riviä kuin Pico\n"
 
-#: nano.c:376
+#: nano.c:387
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\tTallenna tiedosto kysymättä poistettaessa\n"
 
-#: nano.c:377
+#: nano.c:388
 msgid " -v \t\tView (read only) mode\n"
 msgstr " -v \t\tKatselutila (vain luku)\n"
 
-#: nano.c:378
+#: nano.c:389
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr " -w \t\tÄlä rivitä pitkiä rivejä\n"
 
-#: nano.c:379
+#: nano.c:390
 msgid " -x \t\tDon't show help window\n"
 msgstr " -x \t\tÄlä näytä ohjeikkunaa\n"
 
-#: nano.c:380
+#: nano.c:391
 msgid " -z \t\tEnable suspend\n"
 msgstr " -z \t\tMahdollista keskeyttäminen\n"
 
-#: nano.c:381
+#: nano.c:392
 msgid " +LINE\t\tStart at line number LINE\n"
 msgstr " +RIVI\t\tSiirry riville RIVI\n"
 
-#: nano.c:388
+#: nano.c:399
 #, c-format
 msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n"
 msgstr " nano, versio %s. Chris Allegretta (käännetty %s, %s)\n"
 
-#: nano.c:390
+#: nano.c:401
 msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n"
 msgstr " Maili: nano@asty.org\tNetti: http://www.asty.org/nano\n"
 
-#: nano.c:415
+#: nano.c:426
 msgid "Mark Set"
 msgstr "Teksti merkitty"
 
-#: nano.c:420
+#: nano.c:431
 msgid "Mark UNset"
 msgstr "Merkintä poistettu"
 
-#: nano.c:862
+#: nano.c:875
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap -funktion parametri inptr->data=\"%s\"\n"
 
-#: nano.c:922
+#: nano.c:935
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data nyt = \"%s\"\n"
 
-#: nano.c:975
+#: nano.c:988
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Jälkeenpäin, data = \"%s\"\n"
 
-#: nano.c:1045
+#: nano.c:1058
 msgid "Error deleting tempfile, ack!"
 msgstr "Väliaikaistiedostoa poistettaessa tapahtui virhe."
 
-#: nano.c:1062
+#: nano.c:1076
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Väliaikaista tiedostonnimeä ei voitu luoda: %s"
 
-#: nano.c:1086
+#: nano.c:1099
 #, c-format
 msgid "Could not invoke spell program \"%s\""
 msgstr "Oikoluinta \"%s\" ei voitu käynnistää"
 
 #. Why 32512? I dont know!
-#: nano.c:1092
+#: nano.c:1105
 msgid "Could not invoke \"ispell\""
 msgstr "\"ispell\" -ohjelmaa ei voitu käynnistää"
 
-#: nano.c:1104
+#: nano.c:1118
 msgid "Finished checking spelling"
 msgstr "Oikoluku on valmis"
 
-#: nano.c:1122
+#: nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Tallenna muutettu teksti (Muutokset häviävät, jos vastaat \"ei\") ? "
 
-#: nano.c:1245
+#: nano.c:1259
 msgid "Cannot resize top win"
 msgstr "Yläikkunan kokoa ei voi muuttaa"
 
-#: nano.c:1247
+#: nano.c:1261
 msgid "Cannot move top win"
 msgstr "Yläikkunaa ei voi siirtää"
 
-#: nano.c:1249
+#: nano.c:1263
 msgid "Cannot resize edit win"
 msgstr "Muokkausikkunan kokoa ei voi muuttaa"
 
-#: nano.c:1251
+#: nano.c:1265
 msgid "Cannot move edit win"
 msgstr "Muokkausikkunaa ei voi siirtää"
 
-#: nano.c:1253
+#: nano.c:1267
 msgid "Cannot resize bottom win"
 msgstr "Alaikkunan kokoa ei voi muuttaa"
 
-#: nano.c:1255
+#: nano.c:1269
 msgid "Cannot move bottom win"
 msgstr "Alaikkunaa ei voi siirtää"
 
-#: nano.c:1718
+#: nano.c:1742
 msgid "Main: set up windows\n"
 msgstr "Päätila: ikkunoiden asettelu\n"
 
-#: nano.c:1740
+#: nano.c:1764
 msgid "Main: bottom win\n"
 msgstr "Päätila: alaikkuna\n"
 
-#: nano.c:1746
+#: nano.c:1770
 msgid "Main: open file\n"
 msgstr "Päätila: avaa tiedosto\n"
 
-#: nano.c:1819
+#: nano.c:1843
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Vastaanotettu Alt-[-%c! (%d)\n"
 
-#: nano.c:1835
+#: nano.c:1859
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Vastaanotettu Alt-%c! (%d)\n"
 
 #: search.c:71
 #, fuzzy, c-format
-msgid "Case Sensitive Regexp Search%s"
-msgstr "Kirjainkoosta välittävä etsintä%s"
+msgid "Case Sensitive Regexp Search%s%s"
+msgstr "Kirjainkoosta välittävä etsintä%s%s"
 
 #: search.c:73
 #, fuzzy, c-format
-msgid "Regexp Search%s"
-msgstr "Etsintä%s"
+msgid "Regexp Search%s%s"
+msgstr "Etsintä%s%s"
 
 #: search.c:76
-#, c-format
-msgid "Case Sensitive Search%s"
-msgstr "Kirjainkoosta välittävä etsintä%s"
+#, fuzzy, c-format
+msgid "Case Sensitive Search%s%s"
+msgstr "Kirjainkoosta välittävä etsintä%s%s"
 
 #: search.c:78
-#, c-format
-msgid "Search%s"
-msgstr "Etsintä%s"
+#, fuzzy, c-format
+msgid "Search%s%s"
+msgstr "Etsintä%s%s"
 
-#: search.c:86
+#: search.c:81
+#, fuzzy
+msgid " (to replace)"
+msgstr " (korvaa)"
+
+#: search.c:89
 msgid "Search Cancelled"
 msgstr "Etsintä peruttu"
 
-#: search.c:177
+#: search.c:186
 msgid "Search Wrapped"
 msgstr "Etsintä jatkuu"
 
-#: search.c:232
+#: search.c:240
 #, c-format
 msgid "Replaced %d occurences"
 msgstr "%d kohtaa korvattu"
 
-#: search.c:234
+#: search.c:242
 msgid "Replaced 1 occurence"
 msgstr "1 kohta korvattu"
 
-#: search.c:373 search.c:395 search.c:418
+#: search.c:381 search.c:402 search.c:425
 msgid "Replace Cancelled"
 msgstr "Korvaus peruttu"
 
-#: search.c:391
+#: search.c:398
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Korvaa merkkijonolla [%s]"
 
 #. last_search is empty
-#: search.c:416
+#: search.c:423
 msgid "Replace with"
 msgstr "Korvaa merkkijonolla"
 
-#: search.c:457
+#: search.c:464
 msgid "Replace this instance?"
 msgstr "Korvataanko tämä kohta?"
 
 #. Ask for it
-#: search.c:508
+#: search.c:515
 msgid "Enter line number"
 msgstr "Kirjoita rivin numero"
 
-#: search.c:510
+#: search.c:517
 msgid "Aborted"
 msgstr "Keskeytetty"
 
-#: search.c:530
+#: search.c:537
 msgid "Come on, be reasonable"
 msgstr "Jotakin järkevää, kiitos?"
 
-#: search.c:535
+#: search.c:542
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Vain %d riviä olemassa, siirrytään viimeiselle riville"
@@ -816,9 +829,6 @@ msgstr "Sy
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Syötetään teksti stderriin...\n"
 
-#~ msgid "To Replace"
-#~ msgstr "Korvattava"
-
 #~ msgid "To Search"
 #~ msgstr "Etsittävä"
 

po/fr.po

@@ -1,14 +1,14 @@
 # French messages for the nano editor
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Pierre Tane <tanep@bigfoot.com>, 2000.
-#
+# Updated 2000-07-09 by Clement Laforet 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.8.9\n"
-"POT-Creation-Date: 2000-07-07 21:26-0400\n"
-"PO-Revision-Date: 2000-03-24 01:32+0100\n"
-"Last-Translator: Pierre Tane <tanep@bigfoot.com>\n"
+"POT-Creation-Date: 2000-07-27 20:16-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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -19,7 +19,7 @@ msgstr ""
 msgid "add_to_cutbuffer called with inptr->data = %s\n"
 msgstr "add_to_cutbuffer appelé avec inptr->data = %s\n"
 
-#: cut.c:148
+#: cut.c:149
 msgid "Blew away cutbuffer =)\n"
 msgstr "cutbuffer annihilé -)\n"
 
@@ -29,97 +29,97 @@ msgstr ""
 "read_line: la position actuelle n'est pas la première ligne et la précédente "
 "est NULL"
 
-#: files.c:180 files.c:197
+#: files.c:181 files.c:198
 #, c-format
 msgid "Read %d lines"
 msgstr "%d lignes lues"
 
-#: files.c:215 search.c:163 search.c:181
+#: files.c:216 search.c:172 search.c:190
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" non trouvé"
 
 #. We have a new file
-#: files.c:219
+#: files.c:220
 msgid "New File"
 msgstr "Nouveau fichier"
 
-#: files.c:228
+#: files.c:229
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr "Le fichier \"%s\" est un répertoire"
 
-#: files.c:233
+#: files.c:234
 msgid "Reading File"
 msgstr "Lecture du fichier"
 
-#: files.c:246
+#: files.c:247
 msgid "File to insert [from ./] "
 msgstr "Fichier à insérer [depuis ./] "
 
-#: files.c:271 files.c:295 files.c:462 nano.c:1135
+#: files.c:272 files.c:296 files.c:486 nano.c:1149
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: files.c:307 files.c:323 files.c:338 files.c:355 files.c:361
+#: files.c:318 files.c:338 files.c:351 files.c:368 files.c:374
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Impossible d'ouvrir le fichier en écriture: %s"
 
-#: files.c:315
+#: files.c:326
 msgid "Could not open file: Path length exceeded."
 msgstr "Impossible d'ouvrir le fichier: la longueur du chemin a été dépassée"
 
-#: files.c:343
+#: files.c:356
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Écrit >%s\n"
 
-#: files.c:370
+#: files.c:383
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Impossible de fermer %s: %s"
 
 #. Try a rename??
-#: files.c:391 files.c:402 files.c:407
+#: files.c:404 files.c:415 files.c:420
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Impossible d'ouvrir %s en écriture: %s"
 
-#: files.c:413
+#: files.c:426
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Impossible de donner les permissions %o à %s: %s"
 
-#: files.c:420
+#: files.c:433
 #, c-format
 msgid "Wrote %d lines"
 msgstr "%d lignes écrites"
 
-#: files.c:441
+#: files.c:465
 msgid "File Name to write"
 msgstr "Nom du fichier dans lequel écrire"
 
-#: files.c:446
+#: files.c:470
 #, c-format
 msgid "filename is %s"
 msgstr "Le nom du fichier est %s"
 
-#: files.c:451
+#: files.c:475
 msgid "File exists, OVERWRITE ?"
-msgstr ""
+msgstr "Fichier existant, écrire par-dessus ?"
 
 #: global.c:116
 msgid "Invoke the help menu"
-msgstr ""
+msgstr "Appelle le menu d'aide"
 
 #: global.c:117
 msgid "Write the current file to disk"
-msgstr ""
+msgstr "Ecrit le fichier en cours sur le disque"
 
 #: global.c:118
 msgid "Exit from nano"
-msgstr ""
+msgstr "Quitte Nano"
 
 #: global.c:119
 #, fuzzy
@@ -128,193 +128,193 @@ msgstr "Entrer le num
 
 #: global.c:120
 msgid "Justify the current paragraph"
-msgstr ""
+msgstr "Justifie le paragraphe courant"
 
 #: global.c:121
 msgid "Replace text within the editor"
-msgstr ""
+msgstr "Remplace le texte dans l'éditeur"
 
 #: global.c:122
 msgid "Insert another file into the current one"
-msgstr ""
+msgstr "Insère un autre fichier dans le fichier courant"
 
 #: global.c:123
 msgid "Search for text within the editor"
-msgstr ""
+msgstr "Recherche d'une chaîne dans l'éditeur"
 
 #: global.c:124
 msgid "Move to the previous screen"
-msgstr ""
+msgstr "Retourne a l'écran précèdent"
 
 #: global.c:125
 msgid "Move to the next screen"
-msgstr ""
+msgstr "Aller au prochain écran"
 
 #: global.c:126
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr ""
+msgstr "Supprime la ligne courante et la stocke en mémoire"
 
 #: global.c:127
 msgid "Uncut from the cutbuffer into the current line"
-msgstr ""
+msgstr "Copie la chaîne en mémoire vers la ligne courante"
 
 #: global.c:128
 msgid "Show the posititon of the cursor"
-msgstr ""
+msgstr "Affiche la position du curseur"
 
 #: global.c:129
 msgid "Invoke the spell checker (if available)"
-msgstr ""
+msgstr "Appel du correcteur orthographique (s'il est disponible)"
 
 #: global.c:130
 msgid "Move up one line"
-msgstr ""
+msgstr "Déplace d'une ligne vers le haut"
 
 #: global.c:131
 msgid "Move down one line"
-msgstr ""
+msgstr "Déplace d'une ligne vers le bas"
 
 #: global.c:132
 msgid "Move forward one character"
-msgstr ""
+msgstr "Déplace d'un caractère en avant"
 
 #: global.c:133
 msgid "Move back one character"
-msgstr ""
+msgstr "Déplace d'un caractère en arriere"
 
 #: global.c:134
 msgid "Move to the beginning of the current line"
-msgstr ""
+msgstr "Déplace vers le début de la ligne courante"
 
 #: global.c:135
 msgid "Move to the end of the current line"
-msgstr ""
+msgstr "Déplace vers la fin de la ligne courante"
 
 #: global.c:136
 msgid "Go to the first line of the file"
-msgstr ""
+msgstr "Va à la première ligne du fichier"
 
 #: global.c:137
 msgid "Go to the last line of the file"
-msgstr ""
+msgstr "Va à la dernière ligne du fichier"
 
 #: global.c:138
 msgid "Refresh (redraw) the current screen"
-msgstr ""
+msgstr "Rafraichit (redessine) l'ecran courant"
 
 #: global.c:139
 msgid "Mark text at the current cursor location"
-msgstr ""
+msgstr "Marquer le texte à la position actuelle du curseur"
 
 #: global.c:140
 msgid "Delete the character under the cursor"
-msgstr ""
+msgstr "Supprime le caractère où se trouve le curseur"
 
 #: global.c:142
 msgid "Delete the character to the left of the cursor"
-msgstr ""
+msgstr "Supprime le caractère à la gauche du curseur"
 
 #: global.c:143
 msgid "Insert a tab character"
-msgstr ""
+msgstr "Insère une tabulation"
 
 #: global.c:144
 msgid "Insert a carriage return at the cursor position"
-msgstr ""
+msgstr "Insère un retour-chariot à la position du curseur"
 
 #: global.c:146
 msgid "Make the current search or replace case (in)sensitive"
-msgstr ""
+msgstr "Exécuter rechercher/remplacer avec/sans rspect de la casse"
 
 #: global.c:147
 msgid "Cancel the current function"
-msgstr ""
+msgstr "Annule la fonction courante"
 
 #: global.c:152 global.c:262 global.c:334
 msgid "Get Help"
-msgstr ""
+msgstr "Appelle l'aide"
 
 #: global.c:155 global.c:163
 msgid "WriteOut"
-msgstr ""
+msgstr "Sauvegarde"
 
 #: global.c:159 global.c:323
 msgid "Exit"
-msgstr ""
+msgstr "Quitte"
 
 #: global.c:167 global.c:258 global.c:279 global.c:298
 msgid "Goto Line"
-msgstr ""
+msgstr "-> ligne"
 
 #: global.c:172 global.c:250
 msgid "Justify"
-msgstr ""
+msgstr "Justifier"
 
 #: global.c:175 global.c:246 global.c:276
 #, fuzzy
 msgid "Replace"
-msgstr "Rempacer par"
+msgstr "Remplacer par"
 
 #: global.c:179
 #, fuzzy
 msgid "Read File"
-msgstr "Lecture du fichier"
+msgstr "Lect. fichier"
 
 #: global.c:183
 msgid "Where Is"
-msgstr ""
+msgstr "Recherche"
 
 #: global.c:187 global.c:315
 msgid "Prev Page"
-msgstr ""
+msgstr "Page préc."
 
 #: global.c:191 global.c:319
 msgid "Next Page"
-msgstr ""
+msgstr "Page suiv."
 
 #: global.c:195
 msgid "Cut Text"
-msgstr ""
+msgstr "Couper"
 
 #: global.c:198
 msgid "UnCut Txt"
-msgstr ""
+msgstr "Annul. Coup"
 
 #: global.c:202
 msgid "Cur Pos"
-msgstr ""
+msgstr "Pos. curseur"
 
 #: global.c:206
 msgid "To Spell"
-msgstr ""
+msgstr "Corriger"
 
 #: global.c:210
 msgid "Up"
-msgstr ""
+msgstr "Haut"
 
 #: global.c:213
 msgid "Down"
-msgstr ""
+msgstr "Bas"
 
 #: global.c:216
 msgid "Forward"
-msgstr ""
+msgstr "En avant"
 
 #: global.c:219
 msgid "Back"
-msgstr ""
+msgstr "En arrière"
 
 #: global.c:222
 msgid "Home"
-msgstr ""
+msgstr "Debut Doc."
 
 #: global.c:225
 msgid "End"
-msgstr ""
+msgstr "Fin Doc0"
 
 #: global.c:228
 msgid "Refresh"
-msgstr ""
+msgstr "Rafraîchir"
 
 #: global.c:231
 #, fuzzy
@@ -323,31 +323,32 @@ msgstr "Marque enregistr
 
 #: global.c:234
 msgid "Delete"
-msgstr ""
+msgstr "Supprimer"
 
 #: global.c:238
 msgid "Backspace"
-msgstr ""
+msgstr "Backspace"
 
+# No translation...
 #: global.c:242
 msgid "Tab"
-msgstr ""
+msgstr "Tabulation"
 
 #: global.c:253
 msgid "Enter"
-msgstr ""
+msgstr "Entrée"
 
 #: global.c:266 global.c:286 global.c:305
 msgid "First Line"
-msgstr ""
+msgstr "Première ligne"
 
 #: global.c:269 global.c:289 global.c:308
 msgid "Last Line"
-msgstr ""
+msgstr "Dernière Ligne"
 
 #: global.c:272 global.c:292
 msgid "Case Sens"
-msgstr ""
+msgstr "Casse respectée"
 
 #: global.c:282 global.c:301 global.c:311 global.c:327 global.c:331
 #: global.c:337 winio.c:997
@@ -356,9 +357,9 @@ msgstr "Annuler"
 
 #: global.c:295
 msgid "No Replace"
-msgstr ""
+msgstr "Pas de remplacement"
 
-#: nano.c:111
+#: nano.c:115
 msgid ""
 "\n"
 "Buffer written to 'nano.save'\n"
@@ -366,11 +367,11 @@ msgstr ""
 "\n"
 "Buffer écrit dans 'nano.save'\n"
 
-#: nano.c:118
+#: nano.c:122
 msgid "Key illegal in VIEW mode"
 msgstr "Touche illégale en mode VISUALISATION"
 
-#: nano.c:158
+#: nano.c:162
 msgid ""
 " nano help text\n"
 "\n"
@@ -388,16 +389,31 @@ msgid ""
 "Optional keys are shown in parentheses:\n"
 "\n"
 msgstr ""
+"Message d'aide de Nano\n"
+"L'éditeur Nano est conçu pour émuler les fonctions et la facilité "
+"d'utili-sation de l'éditeur PICO. Il y a quatre sections principales dans "
+"cet éditeur : la ligne du haut affiche la version du programme, le "
+"fichieractuellement édité, et s'il a été modifié ou non. Ensuite il y a "
+"lafenêtre principale d'édition qui affiche le fichier en cours de "
+"modification.La ligne d'état est la troisième en partant du bas, elle "
+"affiche les messages importants. Les deux dernières sont consacrées aux "
+"raccourcisles plus courrament utilisés :\n"
+"La notation des raccourcis est comme ceci : la touche \"Control\" est "
+"notéepar l'accent circonflexe (^). Les séquences utilisant la touche \"Alt\" "
+"sontnotées par un arrowbase (@). Les combinaisons sont disponibles dansla "
+"fenêtre principale de l'éditeur.Les touches optionnelles sont affichées "
+"entre parenthèses :\n"
+"\n"
 
-#: nano.c:259
+#: nano.c:263
 msgid "free_node(): free'd a node, YAY!\n"
 msgstr "free_node(): libération d'un noeud, OUAIS!\n"
 
-#: nano.c:264
+#: nano.c:268
 msgid "free_node(): free'd last node.\n"
 msgstr "free_node(): libération du dernier noeud \n"
 
-#: nano.c:309
+#: nano.c:313
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
@@ -405,87 +421,95 @@ msgstr ""
 "Utilisation: nano [option longue GNU] [option] +LIGNE <fichier>\n"
 "\n"
 
-#: nano.c:310
+#: nano.c:314
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Option\t\tOption Longue\t\tSignification\n"
 
-#: nano.c:313
+#: nano.c:317
 msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n"
 msgstr ""
-
-#: nano.c:317
-msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
-msgstr ""
+"-T \t\t--tabsize=[num]\t\tDefini la profondeur d'une tabulation à num\n"
 
 #: nano.c:321
+msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
+msgstr ""
+"-R\t\t--regexp\t\tUtilise les expressions regulières pour la recherche\n"
+
+#: nano.c:325
 msgid " -V \t\t--version\t\tPrint version information and exit\n"
 msgstr " -V \t\t--version\t\tAfficher les informations de version et sortir\n"
 
-#: nano.c:323
+#: nano.c:327
 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
 msgstr " -c \t\t--const\t\t\tAfficher constamment la position du curseur\n"
 
-#: nano.c:325
+#: nano.c:329
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr " -h \t\t--help\t\t\tAfficher ce message\n"
 
-#: nano.c:327
+#: nano.c:332
+msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
+msgstr ""
+
+#: nano.c:335
 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
 msgstr ""
 " -i \t\t--autoindent\t\tIndenter automatiquement les nouvelles lignes\n"
 
-#: nano.c:329
+#: nano.c:337
 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n"
 msgstr ""
+" -l \t\t--nofollow\t\tNe suit pas les liens symboliques. Outrepasse "
+"l'écriture\n"
 
-#: nano.c:332
+#: nano.c:340
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr " -m \t\t--mouse\t\t\tActiver le support souris\n"
 
-#: nano.c:337
+#: nano.c:345
 msgid ""
 " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
 msgstr ""
 " -r [#cols] \t--fill=[#cols]\t\tMettre la colonne de fin de ligne à (couper "
 "les lignes à) #cols\n"
 
-#: nano.c:339
+#: nano.c:347
 msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n"
 msgstr ""
 " -p\t \t--pico\t\t\tRendre les deux lignes du bas plus semblables à Pico\n"
 
-#: nano.c:341
+#: nano.c:349
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr ""
 " -s [prog] \t--speller=[prog]\tActiver un vérificateur orthographique "
 "alternatif\n"
 
-#: nano.c:343
+#: nano.c:351
 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
 msgstr ""
 " -t \t\t--tempfile\t\tSauver automatiquement à la sortie, sans demander\n"
 
-#: nano.c:345
+#: nano.c:353
 msgid " -v \t\t--view\t\t\tView (read only) mode\n"
 msgstr " -v \t\t--view\t\t\tMode Visualisation (lecture seule)\n"
 
-#: nano.c:347
+#: nano.c:355
 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
 msgstr " -w \t\t--nowrap\t\tNe pas couper les lignes trop longues\n"
 
-#: nano.c:349
+#: nano.c:357
 msgid " -x \t\t--nohelp\t\tDon't show help window\n"
 msgstr " -x \t\t--nohelp\t\tNe pas afficher la fenêtre d'aide\n"
 
-#: nano.c:351
+#: nano.c:359
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr " -z \t\t--suspend\t\tAutoriser la suspension\n"
 
-#: nano.c:353
+#: nano.c:361
 msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
 msgstr " +LIGNE\t\t\t\t\tCommencer à la ligne LIGNE\n"
 
-#: nano.c:355
+#: nano.c:363
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
@@ -493,254 +517,263 @@ msgstr ""
 "Utilisation: nano [option] +LIGNE <fichier>\n"
 "\n"
 
-#: nano.c:356
+#: nano.c:364
 msgid "Option\t\tMeaning\n"
 msgstr "Option\t\tSignification\n"
 
-#: nano.c:358
+#: nano.c:366
 msgid " -T [num]\tSet width of a tab to num\n"
-msgstr ""
+msgstr "-T [num]\tDéfini la pronfondeur de tabulation à num\n"
 
-#: nano.c:360
+#: nano.c:368
 msgid " -R\t\tUse regular expressions for search\n"
-msgstr ""
+msgstr "-R\t\tUtilisation des expressions régulières pour la recherche\n"
 
-#: nano.c:361
+#: nano.c:369
 msgid " -V \t\tPrint version information and exit\n"
 msgstr " -V \t\tAfficher les informations de version et sortir\n"
 
-#: nano.c:362
+#: nano.c:370
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr " -c \t\tAfficher constamment la position du curseur\n"
 
-#: nano.c:363
+#: nano.c:371
 msgid " -h \t\tShow this message\n"
 msgstr " -h \t\tAfficher ce message\n"
 
-#: nano.c:364
+#: nano.c:373
+msgid " -k \t\tLet ^K cut from cursor to end of line\n"
+msgstr ""
+
+#: nano.c:375
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr " -i \t\tIndenter automatiquement les nouvelles lignes\n"
 
-#: nano.c:366
+#: nano.c:377
 msgid " -l \t\tDon't follow symbolic links, overwrite.\n"
-msgstr ""
+msgstr "-l \t\tNe pas suivre les liens symboliques. Outrepasse à l'écriture\n"
 
-#: nano.c:369
+#: nano.c:380
 msgid " -m \t\tEnable mouse\n"
 msgstr " -m \t\tActiver la souris\n"
 
-#: nano.c:373
+#: nano.c:384
 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
 msgstr ""
 " -r [#cols] \tMettre la colonne de fin de ligne à (couper les lignes à) "
 "#cols\n"
 
-#: nano.c:374
+#: nano.c:385
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr " -s [prog]  \tActiver un vérificateur orthographique alternatif\n"
 
-#: nano.c:375
+#: nano.c:386
 msgid " -p \t\tMake bottom 2 lines more Pico-like\n"
 msgstr " -p \t\tRendre les 2 lignes du bas plus semblables à Pico\n"
 
-#: nano.c:376
+#: nano.c:387
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\tSauver automatiquement à la sortie, sans demander\n"
 
-#: nano.c:377
+#: nano.c:388
 msgid " -v \t\tView (read only) mode\n"
 msgstr " -v \t\tMode Visualisation seule (lecture seule)\n"
 
-#: nano.c:378
+#: nano.c:389
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr " -w \t\tNe pas couper les lignes longues\n"
 
-#: nano.c:379
+#: nano.c:390
 msgid " -x \t\tDon't show help window\n"
 msgstr " -x \t\tNe pas afficher la fenêtre d'aide\n"
 
-#: nano.c:380
+#: nano.c:391
 msgid " -z \t\tEnable suspend\n"
 msgstr " -z \t\tAutoriser la suspension\n"
 
-#: nano.c:381
+#: nano.c:392
 msgid " +LINE\t\tStart at line number LINE\n"
 msgstr " +LIGNE\t\tDémarrer à la ligne LIGNE\n"
 
-#: nano.c:388
+#: nano.c:399
 #, c-format
 msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n"
 msgstr " nano version %s de Chris Allegretta (compilée %s, %s)\n"
 
-#: nano.c:390
+#: nano.c:401
 msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n"
 msgstr " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n"
 
-#: nano.c:415
+#: nano.c:426
 msgid "Mark Set"
 msgstr "Marque enregistrée"
 
-#: nano.c:420
+#: nano.c:431
 msgid "Mark UNset"
 msgstr "Marque effacée"
 
-#: nano.c:862
+#: nano.c:875
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap appelée avec inptr->data=\"%s\"\n"
 
-#: nano.c:922
+#: nano.c:935
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data vaut maintenant \"%s\"\n"
 
-#: nano.c:975
+#: nano.c:988
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Après, data = \"%s\"\n"
 
-#: nano.c:1045
+#: nano.c:1058
 msgid "Error deleting tempfile, ack!"
 msgstr "Erreur lors de l'effacement du fichier temporaire, zut!"
 
-#: nano.c:1062
+#: nano.c:1076
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Impossible de créer un nom de fichier temporaire: %s"
 
-#: nano.c:1086
+#: nano.c:1099
 #, c-format
 msgid "Could not invoke spell program \"%s\""
 msgstr "Impossible d'invoquer le programme spell \"%s\""
 
 #. Why 32512? I dont know!
-#: nano.c:1092
+#: nano.c:1105
 msgid "Could not invoke \"ispell\""
 msgstr "Impossible d'invoquer \"ispell\""
 
-#: nano.c:1104
+#: nano.c:1118
 msgid "Finished checking spelling"
 msgstr "Vérification orthographique terminée"
 
-#: nano.c:1122
+#: nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Sauver le buffer modifié (RÉPONDRE \"No\" EFFACERA LES CHANGEMENTS"
 
-#: nano.c:1245
+#: nano.c:1259
 msgid "Cannot resize top win"
 msgstr "Impossible de redimensionner la fenêtre du haut"
 
-#: nano.c:1247
+#: nano.c:1261
 msgid "Cannot move top win"
 msgstr "Impossible de bouger la fenêtre du haut"
 
-#: nano.c:1249
+#: nano.c:1263
 msgid "Cannot resize edit win"
 msgstr "Impossible de redimensionner la fenêtre d'édition"
 
-#: nano.c:1251
+#: nano.c:1265
 msgid "Cannot move edit win"
 msgstr "Impossible de bouger la fenêtre d'édition"
 
-#: nano.c:1253
+#: nano.c:1267
 msgid "Cannot resize bottom win"
 msgstr "Impossible de redimensionner la fenêtre du bas"
 
-#: nano.c:1255
+#: nano.c:1269
 msgid "Cannot move bottom win"
 msgstr "Impossible de bouger la fenêtre du bas"
 
-#: nano.c:1718
+#: nano.c:1742
 msgid "Main: set up windows\n"
 msgstr "Main: configuration des fenêtres\n"
 
-#: nano.c:1740
+#: nano.c:1764
 msgid "Main: bottom win\n"
 msgstr "Main: fenêtre du bas\n"
 
-#: nano.c:1746
+#: nano.c:1770
 msgid "Main: open file\n"
 msgstr "Main: ouvrir fichier\n"
 
-#: nano.c:1819
+#: nano.c:1843
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "J'ai reçu Alt-[-%c! (%d)\n"
 
-#: nano.c:1835
+#: nano.c:1859
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "J'ai reçu Alt-%c! (%d)\n"
 
 #: search.c:71
 #, fuzzy, c-format
-msgid "Case Sensitive Regexp Search%s"
-msgstr "Recherche sensible ) la casse%s"
+msgid "Case Sensitive Regexp Search%s%s"
+msgstr "Recherche sensible ) la casse%s%s"
 
 #: search.c:73
-#, c-format
-msgid "Regexp Search%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Regexp Search%s%s"
+msgstr "Recherche Regexp%s%s"
 
 #: search.c:76
-#, c-format
-msgid "Case Sensitive Search%s"
-msgstr "Recherche sensible ) la casse%s"
+#, fuzzy, c-format
+msgid "Case Sensitive Search%s%s"
+msgstr "Recherche sensible ) la casse%s%s"
 
 #: search.c:78
-#, c-format
-msgid "Search%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Search%s%s"
+msgstr "Recherche%s%s"
 
-#: search.c:86
+#: search.c:81
+#, fuzzy
+msgid " (to replace)"
+msgstr " (remplacer par)"
+
+#: search.c:89
 msgid "Search Cancelled"
 msgstr "Recherche annulée"
 
-#: search.c:177
+#: search.c:186
 msgid "Search Wrapped"
 msgstr "La recherche a bouclé"
 
-#: search.c:232
+#: search.c:240
 #, c-format
 msgid "Replaced %d occurences"
 msgstr "%d occurences remplacées"
 
-#: search.c:234
+#: search.c:242
 msgid "Replaced 1 occurence"
 msgstr "1 occurence remplacée"
 
-#: search.c:373 search.c:395 search.c:418
+#: search.c:381 search.c:402 search.c:425
 msgid "Replace Cancelled"
 msgstr "Remplacement annulé"
 
-#: search.c:391
+#: search.c:398
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Remplacer par [%s]"
 
 #. last_search is empty
-#: search.c:416
+#: search.c:423
 msgid "Replace with"
 msgstr "Rempacer par"
 
-#: search.c:457
+#: search.c:464
 msgid "Replace this instance?"
 msgstr "Remplacer cette occurence?"
 
 #. Ask for it
-#: search.c:508
+#: search.c:515
 msgid "Enter line number"
 msgstr "Entrer le numéro de ligne"
 
-#: search.c:510
+#: search.c:517
 msgid "Aborted"
 msgstr "Annulé"
 
-#: search.c:530
+#: search.c:537
 msgid "Come on, be reasonable"
 msgstr "Allez, soyez raisonnable"
 
-#: search.c:535
+#: search.c:542
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Seulement %d lignes sont disponibles, saut jusqu'à la dernière ligne"

po/id.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano-0.9.10\n"
-"POT-Creation-Date: 2000-07-07 21:26-0400\n"
+"POT-Creation-Date: 2000-07-27 20:16-0400\n"
 "PO-Revision-Date: 2000-06-08 20:56+07:00\n"
 "Last-Translator: Tedi Heriyanto <tedi-h@usa.net>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 msgid "add_to_cutbuffer called with inptr->data = %s\n"
 msgstr "add_to_cutbuffer dipangil dgn inptr->data = %s\n"
 
-#: cut.c:148
+#: cut.c:149
 msgid "Blew away cutbuffer =)\n"
 msgstr "Hapus cutbuffer =>\n"
 
@@ -26,83 +26,83 @@ msgstr "Hapus cutbuffer =>\n"
 msgid "read_line: not on first line and prev is NULL"
 msgstr "read_line: tidak di baris pertama dan sebelumnya adalah NULL"
 
-#: files.c:180 files.c:197
+#: files.c:181 files.c:198
 #, c-format
 msgid "Read %d lines"
 msgstr "Membaca %d baris"
 
-#: files.c:215 search.c:163 search.c:181
+#: files.c:216 search.c:172 search.c:190
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" tidak ditemukan"
 
 #. We have a new file
-#: files.c:219
+#: files.c:220
 msgid "New File"
 msgstr "File Baru"
 
-#: files.c:228
+#: files.c:229
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr "File \"%s\" adalah sebuah direktori"
 
-#: files.c:233
+#: files.c:234
 msgid "Reading File"
 msgstr "Membaca File"
 
-#: files.c:246
+#: files.c:247
 msgid "File to insert [from ./] "
 msgstr "File untuk disisipkan "
 
-#: files.c:271 files.c:295 files.c:462 nano.c:1135
+#: files.c:272 files.c:296 files.c:486 nano.c:1149
 msgid "Cancelled"
 msgstr "Dibatalkan"
 
-#: files.c:307 files.c:323 files.c:338 files.c:355 files.c:361
+#: files.c:318 files.c:338 files.c:351 files.c:368 files.c:374
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Tidak dapat membuka file untuk menulis: %s"
 
-#: files.c:315
+#: files.c:326
 msgid "Could not open file: Path length exceeded."
 msgstr "Tidak dapat membuka file: panjang path terlampaui"
 
-#: files.c:343
+#: files.c:356
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Tulis >%s\n"
 
-#: files.c:370
+#: files.c:383
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Tidak dapat menutup %s: %s"
 
 #. Try a rename??
-#: files.c:391 files.c:402 files.c:407
+#: files.c:404 files.c:415 files.c:420
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Tidak dapat membuka %s untuk menulis: %s"
 
-#: files.c:413
+#: files.c:426
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Tidak dapat menset permisi %o pada %s: %s"
 
-#: files.c:420
+#: files.c:433
 #, c-format
 msgid "Wrote %d lines"
 msgstr "Menulis %d baris"
 
-#: files.c:441
+#: files.c:465
 msgid "File Name to write"
 msgstr "Nama file untuk ditulis"
 
-#: files.c:446
+#: files.c:470
 #, c-format
 msgid "filename is %s"
 msgstr "Namafile adalah %s"
 
-#: files.c:451
+#: files.c:475
 msgid "File exists, OVERWRITE ?"
 msgstr "File ada, DITIMPA ?"
 
@@ -352,7 +352,7 @@ msgstr "Batal"
 msgid "No Replace"
 msgstr ""
 
-#: nano.c:111
+#: nano.c:115
 msgid ""
 "\n"
 "Buffer written to 'nano.save'\n"
@@ -360,11 +360,11 @@ msgstr ""
 "\n"
 "Buffer ditulis ke 'nano.save'\n"
 
-#: nano.c:118
+#: nano.c:122
 msgid "Key illegal in VIEW mode"
 msgstr "Kunci ilegal dalam mode VIEW"
 
-#: nano.c:158
+#: nano.c:162
 msgid ""
 " nano help text\n"
 "\n"
@@ -399,95 +399,99 @@ msgstr ""
 "Kunci-kunci opsional ditunjukkan dalam kurung:\n"
 "\n"
 
-#: nano.c:259
+#: nano.c:263
 msgid "free_node(): free'd a node, YAY!\n"
 msgstr "free_node(): bebaskan sebuah node, YAY!\n"
 
-#: nano.c:264
+#: nano.c:268
 msgid "free_node(): free'd last node.\n"
 msgstr "free_node(): bebaskan node terakhir.\n"
 
-#: nano.c:309
+#: nano.c:313
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
 msgstr "Pemakaian: nano [GNU long option] [option] +LINE <file>\n"
 
-#: nano.c:310
+#: nano.c:314
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Option: Long option     Arti\n"
 
-#: nano.c:313
+#: nano.c:317
 msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n"
 msgstr ""
 
-#: nano.c:317
+#: nano.c:321
 msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
 msgstr ""
 
-#: nano.c:321
+#: nano.c:325
 msgid " -V \t\t--version\t\tPrint version information and exit\n"
 msgstr "-V      --version       Tampilkan versi dan keluar\n"
 
-#: nano.c:323
+#: nano.c:327
 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
 msgstr "-c      --const         Menampilkan posisi kursor secara konstan\n"
 
-#: nano.c:325
+#: nano.c:329
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr "-h      --help          Tampilkan pesan ini\n"
 
-#: nano.c:327
+#: nano.c:332
+msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
+msgstr ""
+
+#: nano.c:335
 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
 msgstr "-i      --autoindent    Indentasi baris barus secara otomatis\n"
 
-#: nano.c:329
+#: nano.c:337
 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n"
 msgstr "-l      --nofollow      Jangan ikuti link simbolik, timpa.\n"
 
-#: nano.c:332
+#: nano.c:340
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr "-m      --mouse         Aktifkan mouse\n"
 
-#: nano.c:337
+#: nano.c:345
 msgid ""
 " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
 msgstr "-r [#cols]      --fill=[#cols]  Set fill col ke (wrap line di) #cols\n"
 
-#: nano.c:339
+#: nano.c:347
 msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n"
 msgstr "-p      --pico  Buat dua baris terbawah seperti Pico\n"
 
-#: nano.c:341
+#: nano.c:349
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr "-s [prog]       --speller=[prog]        Aktifkan speller alternatif\n"
 
-#: nano.c:343
+#: nano.c:351
 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
 msgstr ""
 "-t      --tempfile      Autosave saat keluar, jangan minta konfirmasi\n"
 
-#: nano.c:345
+#: nano.c:353
 msgid " -v \t\t--view\t\t\tView (read only) mode\n"
 msgstr "-v      --view  Mode Tampil (baca saja)\n"
 
-#: nano.c:347
+#: nano.c:355
 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
 msgstr "-w      --nowrap        Jangan wrap baris panjang\n"
 
-#: nano.c:349
+#: nano.c:357
 msgid " -x \t\t--nohelp\t\tDon't show help window\n"
 msgstr "-x      --nohelp        Jangan tampilkan jendela bantuan\n"
 
-#: nano.c:351
+#: nano.c:359
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr "-z      --suspend       Aktifkan suspend\n"
 
-#: nano.c:353
+#: nano.c:361
 msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
 msgstr "+LINE                   Mulai pada nomor baris LINE\n"
 
-#: nano.c:355
+#: nano.c:363
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
@@ -495,252 +499,261 @@ msgstr ""
 "Pemakaian: nano [option] +LINE <file>\n"
 "\n"
 
-#: nano.c:356
+#: nano.c:364
 msgid "Option\t\tMeaning\n"
 msgstr "Option          Arti\n"
 
-#: nano.c:358
+#: nano.c:366
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr " -T [num]\tGanti lebar tabulasi manjadi num\n"
 
-#: nano.c:360
+#: nano.c:368
 msgid " -R\t\tUse regular expressions for search\n"
 msgstr ""
 
-#: nano.c:361
+#: nano.c:369
 msgid " -V \t\tPrint version information and exit\n"
 msgstr "-V     Tampilkan informasi versi dan keluar\n"
 
-#: nano.c:362
+#: nano.c:370
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr "-c     Menampilkan posisi kursor secara konstan\n"
 
-#: nano.c:363
+#: nano.c:371
 msgid " -h \t\tShow this message\n"
 msgstr "-h     Tampilkan pesan ini\n"
 
-#: nano.c:364
+#: nano.c:373
+msgid " -k \t\tLet ^K cut from cursor to end of line\n"
+msgstr ""
+
+#: nano.c:375
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr "-i     Indent baris barus secara otomatis\n"
 
-#: nano.c:366
+#: nano.c:377
 msgid " -l \t\tDon't follow symbolic links, overwrite.\n"
 msgstr "-l     Jangan ikuti link simbolik, timpa.\n"
 
-#: nano.c:369
+#: nano.c:380
 msgid " -m \t\tEnable mouse\n"
 msgstr "-m     Aktifkan mouse\n"
 
-#: nano.c:373
+#: nano.c:384
 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
 msgstr "-r [#cols]   Set fill col ke (wrap line di) #cols\n"
 
-#: nano.c:374
+#: nano.c:385
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr "-s [prog]    Aktifkan speller alternatif\n"
 
-#: nano.c:375
+#: nano.c:386
 msgid " -p \t\tMake bottom 2 lines more Pico-like\n"
 msgstr "-p     Buat dua baris terbawah seperti Pico\n"
 
-#: nano.c:376
+#: nano.c:387
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr "-t     Autosave saat keluar, jangan minta konfirmasi.\n"
 
-#: nano.c:377
+#: nano.c:388
 msgid " -v \t\tView (read only) mode\n"
 msgstr "-v     Mode Tampil (baca saja)\n"
 
-#: nano.c:378
+#: nano.c:389
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr "-w     Jangan wrap baris panjang\n"
 
-#: nano.c:379
+#: nano.c:390
 msgid " -x \t\tDon't show help window\n"
 msgstr "-x     Jangan tampilkan jendela bantuan\n"
 
-#: nano.c:380
+#: nano.c:391
 msgid " -z \t\tEnable suspend\n"
 msgstr "-z     Aktifkan suspend\n"
 
-#: nano.c:381
+#: nano.c:392
 msgid " +LINE\t\tStart at line number LINE\n"
 msgstr "+LINE    Mulai pada nomor baris LINE\n"
 
-#: nano.c:388
+#: nano.c:399
 #, c-format
 msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n"
 msgstr "nano versi %s oleh Chris Allegretta (compiled %s, %s)\n"
 
-#: nano.c:390
+#: nano.c:401
 msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n"
 msgstr "Email: nano@asty.org    Web: http://www.asty.org/nano\n"
 
-#: nano.c:415
+#: nano.c:426
 msgid "Mark Set"
 msgstr "Set Tanda"
 
-#: nano.c:420
+#: nano.c:431
 msgid "Mark UNset"
 msgstr "Unset Tanda"
 
-#: nano.c:862
+#: nano.c:875
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap dipanggil dengan inptr->data=\"%s\"\n"
 
-#: nano.c:922
+#: nano.c:935
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data sekarang =\"%s\"\n"
 
-#: nano.c:975
+#: nano.c:988
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Setelah, data= \"%s\"\n"
 
-#: nano.c:1045
+#: nano.c:1058
 msgid "Error deleting tempfile, ack!"
 msgstr "Kesalahan menghapus tempfile, ack!"
 
-#: nano.c:1062
+#: nano.c:1076
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Tidak dapat membuat nama file sementara: %s"
 
-#: nano.c:1086
+#: nano.c:1099
 #, c-format
 msgid "Could not invoke spell program \"%s\""
 msgstr "Tidak dapat memanggil program ejaan \"%s\""
 
 #. Why 32512? I dont know!
-#: nano.c:1092
+#: nano.c:1105
 msgid "Could not invoke \"ispell\""
 msgstr "Tidak dapat memanggil \"ispell\""
 
-#: nano.c:1104
+#: nano.c:1118
 msgid "Finished checking spelling"
 msgstr "Selesai memeriksa ejaan"
 
-#: nano.c:1122
+#: nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Simpan buffer termodifikasi (JAWAB \"No\" AKAN MENGHAPUS PERUBAHAN) ?"
 
-#: nano.c:1245
+#: nano.c:1259
 msgid "Cannot resize top win"
 msgstr "Tidak dapat menganti ukuran jendela atas"
 
-#: nano.c:1247
+#: nano.c:1261
 msgid "Cannot move top win"
 msgstr "Tidak dapat memindahkan jendela atas"
 
-#: nano.c:1249
+#: nano.c:1263
 msgid "Cannot resize edit win"
 msgstr "Tidak dapat mengganti ukuran jendela edit"
 
-#: nano.c:1251
+#: nano.c:1265
 msgid "Cannot move edit win"
 msgstr "Tidak dapat memindah jendela edit"
 
-#: nano.c:1253
+#: nano.c:1267
 msgid "Cannot resize bottom win"
 msgstr "Tidak dapat mengganti ukuran jendela bawah"
 
-#: nano.c:1255
+#: nano.c:1269
 msgid "Cannot move bottom win"
 msgstr "Tidak dapat memindah jendela bawah"
 
-#: nano.c:1718
+#: nano.c:1742
 msgid "Main: set up windows\n"
 msgstr "Main: menset jendela\n"
 
-#: nano.c:1740
+#: nano.c:1764
 msgid "Main: bottom win\n"
 msgstr "Main: jendela bawah\n"
 
-#: nano.c:1746
+#: nano.c:1770
 msgid "Main: open file\n"
 msgstr "Main: membuka file\n"
 
-#: nano.c:1819
+#: nano.c:1843
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Saya mendapat Alt-%c! (%d)\n"
 
-#: nano.c:1835
+#: nano.c:1859
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Saya mendapat Alt-%c! (%d)\n"
 
 #: search.c:71
 #, fuzzy, c-format
-msgid "Case Sensitive Regexp Search%s"
-msgstr "Pencarian case sensitif%s"
+msgid "Case Sensitive Regexp Search%s%s"
+msgstr "Pencarian case sensitif%s%s"
 
 #: search.c:73
 #, fuzzy, c-format
-msgid "Regexp Search%s"
-msgstr "Pencarian%s"
+msgid "Regexp Search%s%s"
+msgstr "Pencarian%s%s"
 
 #: search.c:76
-#, c-format
-msgid "Case Sensitive Search%s"
-msgstr "Pencarian case sensitif%s"
+#, fuzzy, c-format
+msgid "Case Sensitive Search%s%s"
+msgstr "Pencarian case sensitif%s%s"
 
 #: search.c:78
-#, c-format
-msgid "Search%s"
-msgstr "Pencarian%s"
+#, fuzzy, c-format
+msgid "Search%s%s"
+msgstr "Pencarian%s%s"
 
-#: search.c:86
+#: search.c:81
+#, fuzzy
+msgid " (to replace)"
+msgstr " (ganti)"
+
+#: search.c:89
 msgid "Search Cancelled"
 msgstr "Batalkan pencarian"
 
-#: search.c:177
+#: search.c:186
 msgid "Search Wrapped"
 msgstr "Pancarian diulangi dari awal"
 
-#: search.c:232
+#: search.c:240
 #, c-format
 msgid "Replaced %d occurences"
 msgstr "%d tempat terganti"
 
-#: search.c:234
+#: search.c:242
 msgid "Replaced 1 occurence"
 msgstr "Terganti 1 tempat"
 
-#: search.c:373 search.c:395 search.c:418
+#: search.c:381 search.c:402 search.c:425
 msgid "Replace Cancelled"
 msgstr "Batalkan penggantian"
 
-#: search.c:391
+#: search.c:398
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Ganti dengan [%s]"
 
 #. last_search is empty
-#: search.c:416
+#: search.c:423
 msgid "Replace with"
 msgstr "Ganti dengan"
 
-#: search.c:457
+#: search.c:464
 msgid "Replace this instance?"
 msgstr "Ganti kata ini?"
 
 #. Ask for it
-#: search.c:508
+#: search.c:515
 msgid "Enter line number"
 msgstr "Masukkan nomor baris"
 
-#: search.c:510
+#: search.c:517
 msgid "Aborted"
 msgstr "Dibatalkan"
 
-#: search.c:530
+#: search.c:537
 msgid "Come on, be reasonable"
 msgstr "Ayo, yang masuk akal"
 
-#: search.c:535
+#: search.c:542
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Hanya %d baris tersedia, melompat ke baris akhir"
@@ -815,9 +828,6 @@ msgstr "Kirim cutbuffer ke stderr...\n"
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Kirim buffer ke stderr...\n"
 
-#~ msgid "To Replace"
-#~ msgstr "Mengganti"
-
 #~ msgid "To Search"
 #~ msgstr "Mencari"
 

po/it.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.8.7\n"
-"POT-Creation-Date: 2000-07-07 21:26-0400\n"
+"POT-Creation-Date: 2000-07-27 20:16-0400\n"
 "PO-Revision-Date: 2000-03-03 04:57+0100\n"
 "Last-Translator: Daniele Medri <madrid@linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 msgid "add_to_cutbuffer called with inptr->data = %s\n"
 msgstr "add_to_cutbuffer chiamato con inptr->data = %s\n"
 
-#: cut.c:148
+#: cut.c:149
 msgid "Blew away cutbuffer =)\n"
 msgstr ""
 
@@ -26,83 +26,83 @@ msgstr ""
 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:180 files.c:197
+#: files.c:181 files.c:198
 #, c-format
 msgid "Read %d lines"
 msgstr "Leggi %d linee"
 
-#: files.c:215 search.c:163 search.c:181
+#: files.c:216 search.c:172 search.c:190
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" non trovato"
 
 #. We have a new file
-#: files.c:219
+#: files.c:220
 msgid "New File"
 msgstr "Nuovo file"
 
-#: files.c:228
+#: files.c:229
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr "Il file \"%s\" è una directory"
 
-#: files.c:233
+#: files.c:234
 msgid "Reading File"
 msgstr "Lettura file"
 
-#: files.c:246
+#: files.c:247
 msgid "File to insert [from ./] "
 msgstr "File da inserire [da ./] "
 
-#: files.c:271 files.c:295 files.c:462 nano.c:1135
+#: files.c:272 files.c:296 files.c:486 nano.c:1149
 msgid "Cancelled"
 msgstr "Cancellato"
 
-#: files.c:307 files.c:323 files.c:338 files.c:355 files.c:361
+#: files.c:318 files.c:338 files.c:351 files.c:368 files.c:374
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Impossibile aprire il file in scrittura: %s"
 
-#: files.c:315
+#: files.c:326
 msgid "Could not open file: Path length exceeded."
 msgstr "Impossibile aprire il file: esagerata lunghezza del percorso."
 
-#: files.c:343
+#: files.c:356
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Scrivi >%s\n"
 
-#: files.c:370
+#: files.c:383
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Impossibile chiudere %s: %s"
 
 #. Try a rename??
-#: files.c:391 files.c:402 files.c:407
+#: files.c:404 files.c:415 files.c:420
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Impossibile aprire %s in scrittura: %s"
 
-#: files.c:413
+#: files.c:426
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Impossibile configurare i permessi di %o su %s: %s"
 
-#: files.c:420
+#: files.c:433
 #, c-format
 msgid "Wrote %d lines"
 msgstr "Scritte %d linee"
 
-#: files.c:441
+#: files.c:465
 msgid "File Name to write"
 msgstr "Salva con nome"
 
-#: files.c:446
+#: files.c:470
 #, c-format
 msgid "filename is %s"
 msgstr "Il nome file è %s"
 
-#: files.c:451
+#: files.c:475
 msgid "File exists, OVERWRITE ?"
 msgstr "File esistente, SOVRASCRIVERE?"
 
@@ -351,7 +351,7 @@ msgstr "Cancella"
 msgid "No Replace"
 msgstr ""
 
-#: nano.c:111
+#: nano.c:115
 msgid ""
 "\n"
 "Buffer written to 'nano.save'\n"
@@ -359,11 +359,11 @@ msgstr ""
 "\n"
 "Buffer scritto su 'nano.save'\n"
 
-#: nano.c:118
+#: nano.c:122
 msgid "Key illegal in VIEW mode"
 msgstr "Chiave illegale nella modalità VISTA"
 
-#: nano.c:158
+#: nano.c:162
 msgid ""
 " nano help text\n"
 "\n"
@@ -382,15 +382,15 @@ msgid ""
 "\n"
 msgstr ""
 
-#: nano.c:259
+#: nano.c:263
 msgid "free_node(): free'd a node, YAY!\n"
 msgstr "free_node(): liberado un nodo, YEAH!\n"
 
-#: nano.c:264
+#: nano.c:268
 msgid "free_node(): free'd last node.\n"
 msgstr "free_node(): liberado el último nodo.\n"
 
-#: nano.c:309
+#: nano.c:313
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
@@ -398,81 +398,85 @@ msgstr ""
 "Utilizzo: nano [GNU opzioni lunghe] [opzioni] +LINEA <file>\n"
 "\n"
 
-#: nano.c:310
+#: nano.c:314
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Opzioni\t\tLunghe opzioni\t\tSignificato\n"
 
-#: nano.c:313
+#: nano.c:317
 msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n"
 msgstr ""
 
-#: nano.c:317
+#: nano.c:321
 msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
 msgstr ""
 
-#: nano.c:321
+#: nano.c:325
 msgid " -V \t\t--version\t\tPrint version information and exit\n"
 msgstr " -V \t\t--versione\t\tStampa informazioni sulla versione ed esci\n"
 
-#: nano.c:323
+#: nano.c:327
 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
 msgstr " -c \t\t--const\t\t\tMostra sempre la posizione del cursore\n"
 
-#: nano.c:325
+#: nano.c:329
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr " -h \t\t--help\t\t\tMostra questo messaggio\n"
 
-#: nano.c:327
+#: nano.c:332
+msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
+msgstr ""
+
+#: nano.c:335
 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
 msgstr " -i \t\t--autoindent\t\tIndentar automáticamente nuevas líneas\n"
 
-#: nano.c:329
+#: nano.c:337
 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n"
 msgstr ""
 
-#: nano.c:332
+#: nano.c:340
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr " -m \t\t--mouse\t\t\tAttiva mouse\n"
 
-#: nano.c:337
+#: nano.c:345
 msgid ""
 " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
 msgstr " -r [#cols] \t--fill=[#cols]\t\tConfigura riempimento colonne\n"
 
-#: nano.c:339
+#: nano.c:347
 msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n"
 msgstr " -p\t \t--pico\t\t\tCrea in basso 2 linee come l'aspetto di Pico\n"
 
-#: nano.c:341
+#: nano.c:349
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr " -s [prog] \t--speller=[prog]\tAttiva correttore alternativo\n"
 
-#: nano.c:343
+#: nano.c:351
 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
 msgstr ""
 " -t \t\t--tempfile\t\tSalvataggio automatico in uscita senza richiesta\n"
 
-#: nano.c:345
+#: nano.c:353
 msgid " -v \t\t--view\t\t\tView (read only) mode\n"
 msgstr " -v \t\t--view\t\t\tVisualizzazione (sola lettura)\n"
 
-#: nano.c:347
+#: nano.c:355
 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
 msgstr " -w \t\t--nowrap\t\tNon interrompere linee lunghe\n"
 
-#: nano.c:349
+#: nano.c:357
 msgid " -x \t\t--nohelp\t\tDon't show help window\n"
 msgstr " -x \t\t--nohelp\t\tNon mostrare finestra aiuti\n"
 
-#: nano.c:351
+#: nano.c:359
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr " -z \t\t--suspend\t\tAbilita sospensione\n"
 
-#: nano.c:353
+#: nano.c:361
 msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
 msgstr " +LINE\t\t\t\t\tInizia alla linea numero\n"
 
-#: nano.c:355
+#: nano.c:363
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
@@ -480,254 +484,263 @@ msgstr ""
 "Uso: nano [opzioni] +LINEA <file>\n"
 "\n"
 
-#: nano.c:356
+#: nano.c:364
 msgid "Option\t\tMeaning\n"
 msgstr "Opzioni\t\tSignificato\n"
 
-#: nano.c:358
+#: nano.c:366
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr ""
 
-#: nano.c:360
+#: nano.c:368
 msgid " -R\t\tUse regular expressions for search\n"
 msgstr ""
 
-#: nano.c:361
+#: nano.c:369
 msgid " -V \t\tPrint version information and exit\n"
 msgstr " -V \t\tStampa informazioni sulla versione ed esci\n"
 
-#: nano.c:362
+#: nano.c:370
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr " -c \t\tMostra sempre la posizione del cursore\n"
 
-#: nano.c:363
+#: nano.c:371
 msgid " -h \t\tShow this message\n"
 msgstr " -h \t\tMostra questo messaggio\n"
 
-#: nano.c:364
+#: nano.c:373
+msgid " -k \t\tLet ^K cut from cursor to end of line\n"
+msgstr ""
+
+#: nano.c:375
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr " -v \t\tIndentazione automatica nuove linee\n"
 
-#: nano.c:366
+#: nano.c:377
 msgid " -l \t\tDon't follow symbolic links, overwrite.\n"
 msgstr " -l \t\tNon seguire i link simbolici, sovrascrivi.\n"
 
-#: nano.c:369
+#: nano.c:380
 msgid " -m \t\tEnable mouse\n"
 msgstr " -m \t\tAttiva mouse\n"
 
-#: nano.c:373
+#: nano.c:384
 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
 msgstr " -r [#cols] \tRiempimento colonne (interrompi linee a) #cols\n"
 
-#: nano.c:374
+#: nano.c:385
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr " -s [prog] \tAttiva correttore alternativo\n"
 
-#: nano.c:375
+#: nano.c:386
 msgid " -p \t\tMake bottom 2 lines more Pico-like\n"
 msgstr " -p \t\tCrea in basso 2 linee sullo stile di Pico\n"
 
-#: nano.c:376
+#: nano.c:387
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\tSalvataggio automatico in uscita senza avviso\n"
 
-#: nano.c:377
+#: nano.c:388
 msgid " -v \t\tView (read only) mode\n"
 msgstr " -v \t\tVisualizza (sola lettura)\n"
 
-#: nano.c:378
+#: nano.c:389
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr " -w \t\tNon interrompere linee lunghe\n"
 
-#: nano.c:379
+#: nano.c:390
 msgid " -x \t\tDon't show help window\n"
 msgstr " -x \t\tNon mostrare la finestra Aiuti\n"
 
-#: nano.c:380
+#: nano.c:391
 msgid " -z \t\tEnable suspend\n"
 msgstr " -z \t\tAttiva sospensione\n"
 
-#: nano.c:381
+#: nano.c:392
 msgid " +LINE\t\tStart at line number LINE\n"
 msgstr " +LINEA\t\tInizia alla LINEA numero\n"
 
-#: nano.c:388
+#: nano.c:399
 #, c-format
 msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n"
 msgstr " nano versione %s di Chris Allegretta (compilato %s, %s\n"
 
-#: nano.c:390
+#: nano.c:401
 msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n"
 msgstr "Email: nano@asty.org\tWeb: http://www.asty.org/nano\n"
 
-#: nano.c:415
+#: nano.c:426
 msgid "Mark Set"
 msgstr ""
 
-#: nano.c:420
+#: nano.c:431
 msgid "Mark UNset"
 msgstr ""
 
-#: nano.c:862
+#: nano.c:875
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap chiamata con inptr->data=\"%s\"\n"
 
-#: nano.c:922
+#: nano.c:935
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data ora = \"%d\"\n"
 
-#: nano.c:975
+#: nano.c:988
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Dopo, data = \"%s\"\n"
 
-#: nano.c:1045
+#: nano.c:1058
 msgid "Error deleting tempfile, ack!"
 msgstr ""
 
-#: nano.c:1062
+#: nano.c:1076
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Impossibile creare un nome file temporaneo: %s"
 
-#: nano.c:1086
+#: nano.c:1099
 #, c-format
 msgid "Could not invoke spell program \"%s\""
 msgstr "Impossibile invocare correttore ortografico \"%s\""
 
 #. Why 32512? I dont know!
-#: nano.c:1092
+#: nano.c:1105
 msgid "Could not invoke \"ispell\""
 msgstr "Impossibile invocare \"ispell\""
 
-#: nano.c:1104
+#: nano.c:1118
 msgid "Finished checking spelling"
 msgstr "Controllo ortografico terminato"
 
-#: nano.c:1122
+#: nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Salva il buffer modificato (RISPONDENDO \"No\" ANNULLERETE I CAMBIAMENTI "
 "AVVENUTI) ?"
 
-#: nano.c:1245
+#: nano.c:1259
 msgid "Cannot resize top win"
 msgstr "Impossibile ridimensionare la finestra superiore"
 
-#: nano.c:1247
+#: nano.c:1261
 msgid "Cannot move top win"
 msgstr "Impossibile spostare la finestra superiore"
 
-#: nano.c:1249
+#: nano.c:1263
 msgid "Cannot resize edit win"
 msgstr "Impossibile ridimensionare la finestra di modifica"
 
-#: nano.c:1251
+#: nano.c:1265
 msgid "Cannot move edit win"
 msgstr "Impossibile spostare finestra di modifica"
 
-#: nano.c:1253
+#: nano.c:1267
 msgid "Cannot resize bottom win"
 msgstr "Impossibile ridimensionare la finestra inferiore"
 
-#: nano.c:1255
+#: nano.c:1269
 msgid "Cannot move bottom win"
 msgstr "Impossibile spostare la finestra inferiore"
 
-#: nano.c:1718
+#: nano.c:1742
 msgid "Main: set up windows\n"
 msgstr "Main: configura finestre\n"
 
-#: nano.c:1740
+#: nano.c:1764
 msgid "Main: bottom win\n"
 msgstr "Main: finestra inferiore\n"
 
-#: nano.c:1746
+#: nano.c:1770
 msgid "Main: open file\n"
 msgstr "Main: apri file\n"
 
-#: nano.c:1819
+#: nano.c:1843
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Premuto Alt-[-%c! (%d)\n"
 
-#: nano.c:1835
+#: nano.c:1859
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Premuto Alt-%c! (%d)\n"
 
 #: search.c:71
 #, fuzzy, c-format
-msgid "Case Sensitive Regexp Search%s"
-msgstr "Ricerca case sensitive %s"
+msgid "Case Sensitive Regexp Search%s%s"
+msgstr "Ricerca case sensitive%s%s"
 
 #: search.c:73
 #, fuzzy, c-format
-msgid "Regexp Search%s"
-msgstr "Ricerca%s"
+msgid "Regexp Search%s%s"
+msgstr "Ricerca%s%s"
 
 #: search.c:76
-#, c-format
-msgid "Case Sensitive Search%s"
-msgstr "Ricerca case sensitive %s"
+#, fuzzy, c-format
+msgid "Case Sensitive Search%s%s"
+msgstr "Ricerca case sensitive%s%s"
 
 #: search.c:78
-#, c-format
-msgid "Search%s"
-msgstr "Ricerca%s"
+#, fuzzy, c-format
+msgid "Search%s%s"
+msgstr "Ricerca%s%s"
 
-#: search.c:86
+#: search.c:81
+#, fuzzy
+msgid " (to replace)"
+msgstr " (sostituisci)"
+
+#: search.c:89
 msgid "Search Cancelled"
 msgstr "Ricerca annullata"
 
-#: search.c:177
+#: search.c:186
 msgid "Search Wrapped"
 msgstr "Ricerca interrotta"
 
-#: search.c:232
+#: search.c:240
 #, c-format
 msgid "Replaced %d occurences"
 msgstr "Sostituite %d occorrenze"
 
-#: search.c:234
+#: search.c:242
 msgid "Replaced 1 occurence"
 msgstr "Sostituita 1 occorrenza"
 
-#: search.c:373 search.c:395 search.c:418
+#: search.c:381 search.c:402 search.c:425
 msgid "Replace Cancelled"
 msgstr "Sostituzione annullata"
 
-#: search.c:391
+#: search.c:398
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Sostituisci con [%s]"
 
 #. last_search is empty
-#: search.c:416
+#: search.c:423
 msgid "Replace with"
 msgstr "Sostituisci con"
 
-#: search.c:457
+#: search.c:464
 msgid "Replace this instance?"
 msgstr "Sostituisci questa istanza?"
 
 #. Ask for it
-#: search.c:508
+#: search.c:515
 msgid "Enter line number"
 msgstr "Inserire numero linea"
 
-#: search.c:510
+#: search.c:517
 msgid "Aborted"
 msgstr "Operazione fallita"
 
-#: search.c:530
+#: search.c:537
 msgid "Come on, be reasonable"
 msgstr "Avanti, sii ragionevole"
 
-#: search.c:535
+#: search.c:542
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Solo %d linee disponibili, vai all'ultima"
@@ -802,10 +815,6 @@ msgstr "Copia cutbuffer sullo stderr...\n"
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Copia un buffer sullo stderr...\n"
 
-#, fuzzy
-#~ msgid "To Replace"
-#~ msgstr "Sostituisci"
-
 #, fuzzy
 #~ msgid "To Search"
 #~ msgstr "Ricerca%s"

po/nano.pot

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-07 21:26-0400\n"
+"POT-Creation-Date: 2000-07-27 20:16-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 msgid "add_to_cutbuffer called with inptr->data = %s\n"
 msgstr ""
 
-#: cut.c:148
+#: cut.c:149
 msgid "Blew away cutbuffer =)\n"
 msgstr ""
 
@@ -27,83 +27,83 @@ msgstr ""
 msgid "read_line: not on first line and prev is NULL"
 msgstr ""
 
-#: files.c:180 files.c:197
+#: files.c:181 files.c:198
 #, c-format
 msgid "Read %d lines"
 msgstr ""
 
-#: files.c:215 search.c:163 search.c:181
+#: files.c:216 search.c:172 search.c:190
 #, c-format
 msgid "\"%s\" not found"
 msgstr ""
 
 #. We have a new file
-#: files.c:219
+#: files.c:220
 msgid "New File"
 msgstr ""
 
-#: files.c:228
+#: files.c:229
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr ""
 
-#: files.c:233
+#: files.c:234
 msgid "Reading File"
 msgstr ""
 
-#: files.c:246
+#: files.c:247
 msgid "File to insert [from ./] "
 msgstr ""
 
-#: files.c:271 files.c:295 files.c:462 nano.c:1135
+#: files.c:272 files.c:296 files.c:486 nano.c:1149
 msgid "Cancelled"
 msgstr ""
 
-#: files.c:307 files.c:323 files.c:338 files.c:355 files.c:361
+#: files.c:318 files.c:338 files.c:351 files.c:368 files.c:374
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr ""
 
-#: files.c:315
+#: files.c:326
 msgid "Could not open file: Path length exceeded."
 msgstr ""
 
-#: files.c:343
+#: files.c:356
 #, c-format
 msgid "Wrote >%s\n"
 msgstr ""
 
-#: files.c:370
+#: files.c:383
 #, c-format
 msgid "Could not close %s: %s"
 msgstr ""
 
 #. Try a rename??
-#: files.c:391 files.c:402 files.c:407
+#: files.c:404 files.c:415 files.c:420
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr ""
 
-#: files.c:413
+#: files.c:426
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr ""
 
-#: files.c:420
+#: files.c:433
 #, c-format
 msgid "Wrote %d lines"
 msgstr ""
 
-#: files.c:441
+#: files.c:465
 msgid "File Name to write"
 msgstr ""
 
-#: files.c:446
+#: files.c:470
 #, c-format
 msgid "filename is %s"
 msgstr ""
 
-#: files.c:451
+#: files.c:475
 msgid "File exists, OVERWRITE ?"
 msgstr ""
 
@@ -352,17 +352,17 @@ msgstr ""
 msgid "No Replace"
 msgstr ""
 
-#: nano.c:111
+#: nano.c:115
 msgid ""
 "\n"
 "Buffer written to 'nano.save'\n"
 msgstr ""
 
-#: nano.c:118
+#: nano.c:122
 msgid "Key illegal in VIEW mode"
 msgstr ""
 
-#: nano.c:158
+#: nano.c:162
 msgid ""
 " nano help text\n"
 "\n"
@@ -381,345 +381,357 @@ msgid ""
 "\n"
 msgstr ""
 
-#: nano.c:259
+#: nano.c:263
 msgid "free_node(): free'd a node, YAY!\n"
 msgstr ""
 
-#: nano.c:264
+#: nano.c:268
 msgid "free_node(): free'd last node.\n"
 msgstr ""
 
-#: nano.c:309
+#: nano.c:313
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
 msgstr ""
 
-#: nano.c:310
+#: nano.c:314
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr ""
 
-#: nano.c:313
+#: nano.c:317
 msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n"
 msgstr ""
 
-#: nano.c:317
+#: nano.c:321
 msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
 msgstr ""
 
-#: nano.c:321
+#: nano.c:325
 msgid " -V \t\t--version\t\tPrint version information and exit\n"
 msgstr ""
 
-#: nano.c:323
+#: nano.c:327
 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
 msgstr ""
 
-#: nano.c:325
+#: nano.c:329
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr ""
 
-#: nano.c:327
+#: nano.c:332
+msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
+msgstr ""
+
+#: nano.c:335
 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
 msgstr ""
 
-#: nano.c:329
+#: nano.c:337
 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n"
 msgstr ""
 
-#: nano.c:332
+#: nano.c:340
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr ""
 
-#: nano.c:337
+#: nano.c:345
 msgid ""
 " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
 msgstr ""
 
-#: nano.c:339
+#: nano.c:347
 msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n"
 msgstr ""
 
-#: nano.c:341
+#: nano.c:349
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr ""
 
-#: nano.c:343
+#: nano.c:351
 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
 msgstr ""
 
-#: nano.c:345
+#: nano.c:353
 msgid " -v \t\t--view\t\t\tView (read only) mode\n"
 msgstr ""
 
-#: nano.c:347
+#: nano.c:355
 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
 msgstr ""
 
-#: nano.c:349
+#: nano.c:357
 msgid " -x \t\t--nohelp\t\tDon't show help window\n"
 msgstr ""
 
-#: nano.c:351
+#: nano.c:359
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr ""
 
-#: nano.c:353
+#: nano.c:361
 msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
 msgstr ""
 
-#: nano.c:355
+#: nano.c:363
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
 msgstr ""
 
-#: nano.c:356
+#: nano.c:364
 msgid "Option\t\tMeaning\n"
 msgstr ""
 
-#: nano.c:358
+#: nano.c:366
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr ""
 
-#: nano.c:360
+#: nano.c:368
 msgid " -R\t\tUse regular expressions for search\n"
 msgstr ""
 
-#: nano.c:361
+#: nano.c:369
 msgid " -V \t\tPrint version information and exit\n"
 msgstr ""
 
-#: nano.c:362
+#: nano.c:370
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr ""
 
-#: nano.c:363
+#: nano.c:371
 msgid " -h \t\tShow this message\n"
 msgstr ""
 
-#: nano.c:364
-msgid " -i \t\tAutomatically indent new lines\n"
-msgstr ""
-
-#: nano.c:366
-msgid " -l \t\tDon't follow symbolic links, overwrite.\n"
-msgstr ""
-
-#: nano.c:369
-msgid " -m \t\tEnable mouse\n"
-msgstr ""
-
 #: nano.c:373
-msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
-msgstr ""
-
-#: nano.c:374
-msgid " -s [prog]  \tEnable alternate speller\n"
+msgid " -k \t\tLet ^K cut from cursor to end of line\n"
 msgstr ""
 
 #: nano.c:375
-msgid " -p \t\tMake bottom 2 lines more Pico-like\n"
-msgstr ""
-
-#: nano.c:376
-msgid " -t \t\tAuto save on exit, don't prompt\n"
+msgid " -i \t\tAutomatically indent new lines\n"
 msgstr ""
 
 #: nano.c:377
-msgid " -v \t\tView (read only) mode\n"
-msgstr ""
-
-#: nano.c:378
-msgid " -w \t\tDon't wrap long lines\n"
-msgstr ""
-
-#: nano.c:379
-msgid " -x \t\tDon't show help window\n"
+msgid " -l \t\tDon't follow symbolic links, overwrite.\n"
 msgstr ""
 
 #: nano.c:380
-msgid " -z \t\tEnable suspend\n"
+msgid " -m \t\tEnable mouse\n"
 msgstr ""
 
-#: nano.c:381
-msgid " +LINE\t\tStart at line number LINE\n"
+#: nano.c:384
+msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
+msgstr ""
+
+#: nano.c:385
+msgid " -s [prog]  \tEnable alternate speller\n"
+msgstr ""
+
+#: nano.c:386
+msgid " -p \t\tMake bottom 2 lines more Pico-like\n"
+msgstr ""
+
+#: nano.c:387
+msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr ""
 
 #: nano.c:388
+msgid " -v \t\tView (read only) mode\n"
+msgstr ""
+
+#: nano.c:389
+msgid " -w \t\tDon't wrap long lines\n"
+msgstr ""
+
+#: nano.c:390
+msgid " -x \t\tDon't show help window\n"
+msgstr ""
+
+#: nano.c:391
+msgid " -z \t\tEnable suspend\n"
+msgstr ""
+
+#: nano.c:392
+msgid " +LINE\t\tStart at line number LINE\n"
+msgstr ""
+
+#: nano.c:399
 #, c-format
 msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n"
 msgstr ""
 
-#: nano.c:390
+#: nano.c:401
 msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n"
 msgstr ""
 
-#: nano.c:415
+#: nano.c:426
 msgid "Mark Set"
 msgstr ""
 
-#: nano.c:420
+#: nano.c:431
 msgid "Mark UNset"
 msgstr ""
 
-#: nano.c:862
+#: nano.c:875
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr ""
 
-#: nano.c:922
+#: nano.c:935
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr ""
 
-#: nano.c:975
+#: nano.c:988
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr ""
 
-#: nano.c:1045
+#: nano.c:1058
 msgid "Error deleting tempfile, ack!"
 msgstr ""
 
-#: nano.c:1062
+#: nano.c:1076
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr ""
 
-#: nano.c:1086
+#: nano.c:1099
 #, c-format
 msgid "Could not invoke spell program \"%s\""
 msgstr ""
 
 #. Why 32512? I dont know!
-#: nano.c:1092
+#: nano.c:1105
 msgid "Could not invoke \"ispell\""
 msgstr ""
 
-#: nano.c:1104
+#: nano.c:1118
 msgid "Finished checking spelling"
 msgstr ""
 
-#: nano.c:1122
+#: nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 
-#: nano.c:1245
+#: nano.c:1259
 msgid "Cannot resize top win"
 msgstr ""
 
-#: nano.c:1247
+#: nano.c:1261
 msgid "Cannot move top win"
 msgstr ""
 
-#: nano.c:1249
+#: nano.c:1263
 msgid "Cannot resize edit win"
 msgstr ""
 
-#: nano.c:1251
+#: nano.c:1265
 msgid "Cannot move edit win"
 msgstr ""
 
-#: nano.c:1253
+#: nano.c:1267
 msgid "Cannot resize bottom win"
 msgstr ""
 
-#: nano.c:1255
+#: nano.c:1269
 msgid "Cannot move bottom win"
 msgstr ""
 
-#: nano.c:1718
+#: nano.c:1742
 msgid "Main: set up windows\n"
 msgstr ""
 
-#: nano.c:1740
+#: nano.c:1764
 msgid "Main: bottom win\n"
 msgstr ""
 
-#: nano.c:1746
+#: nano.c:1770
 msgid "Main: open file\n"
 msgstr ""
 
-#: nano.c:1819
+#: nano.c:1843
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr ""
 
-#: nano.c:1835
+#: nano.c:1859
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr ""
 
 #: search.c:71
 #, c-format
-msgid "Case Sensitive Regexp Search%s"
+msgid "Case Sensitive Regexp Search%s%s"
 msgstr ""
 
 #: search.c:73
 #, c-format
-msgid "Regexp Search%s"
+msgid "Regexp Search%s%s"
 msgstr ""
 
 #: search.c:76
 #, c-format
-msgid "Case Sensitive Search%s"
+msgid "Case Sensitive Search%s%s"
 msgstr ""
 
 #: search.c:78
 #, c-format
-msgid "Search%s"
+msgid "Search%s%s"
 msgstr ""
 
-#: search.c:86
+#: search.c:81
+msgid " (to replace)"
+msgstr ""
+
+#: search.c:89
 msgid "Search Cancelled"
 msgstr ""
 
-#: search.c:177
+#: search.c:186
 msgid "Search Wrapped"
 msgstr ""
 
-#: search.c:232
+#: search.c:240
 #, c-format
 msgid "Replaced %d occurences"
 msgstr ""
 
-#: search.c:234
+#: search.c:242
 msgid "Replaced 1 occurence"
 msgstr ""
 
-#: search.c:373 search.c:395 search.c:418
+#: search.c:381 search.c:402 search.c:425
 msgid "Replace Cancelled"
 msgstr ""
 
-#: search.c:391
+#: search.c:398
 #, c-format
 msgid "Replace with [%s]"
 msgstr ""
 
 #. last_search is empty
-#: search.c:416
+#: search.c:423
 msgid "Replace with"
 msgstr ""
 
-#: search.c:457
+#: search.c:464
 msgid "Replace this instance?"
 msgstr ""
 
 #. Ask for it
-#: search.c:508
+#: search.c:515
 msgid "Enter line number"
 msgstr ""
 
-#: search.c:510
+#: search.c:517
 msgid "Aborted"
 msgstr ""
 
-#: search.c:530
+#: search.c:537
 msgid "Come on, be reasonable"
 msgstr ""
 
-#: search.c:535
+#: search.c:542
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr ""

search.c

@@ -59,7 +59,7 @@ int search_init(int replacing)
 {
     int i;
     char buf[BUFSIZ];
-    char *prompt;
+    char *prompt, *reprompt = "";
  
     if (last_search[0]) {
 	snprintf(buf, BUFSIZ, " [%s]", last_search);
@@ -68,18 +68,21 @@ int search_init(int replacing)
     }
 
     if (ISSET(USE_REGEXP) && ISSET(CASE_SENSITIVE))
-        prompt = _("Case Sensitive Regexp Search%s");
+        prompt = _("Case Sensitive Regexp Search%s%s");
     else if (ISSET(USE_REGEXP))
-        prompt = _("Regexp Search%s");
+        prompt = _("Regexp Search%s%s");
     else 
     if (ISSET(CASE_SENSITIVE))
-        prompt = _("Case Sensitive Search%s");
+        prompt = _("Case Sensitive Search%s%s");
     else
-        prompt = _("Search%s");            
-        
+        prompt = _("Search%s%s");
+
+    if (replacing)
+	reprompt = _(" (to replace)");
+	        
     i = statusq(replacing ? replace_list : whereis_list,
 		replacing ? REPLACE_LIST_LEN : WHEREIS_LIST_LEN, "",
-		prompt, buf);
+		prompt, reprompt, buf);
 
     /* Cancel any search, or just return with no previous search */
     if ((i == -1) || (i < 0 && !last_search[0])) {
@@ -125,6 +128,7 @@ filestruct *findnextstr(int quiet, filestruct * begin, char *needle)
 {
     filestruct *fileptr;
     char *searchstr, *found = NULL, *tmp;
+    int past_editbot = 0;
 
     fileptr = current;
 
@@ -132,8 +136,12 @@ filestruct *findnextstr(int quiet, filestruct * begin, char *needle)
     /* Look for searchstr until EOF */
     while (fileptr != NULL &&
 	   (found = strstrwrapper(searchstr, needle)) == NULL) {
+
 	fileptr = fileptr->next;
 
+	if (!past_editbot && (fileptr == editbot))
+	    past_editbot = 1;
+
 	if (fileptr == begin)
 	    return NULL;
 
@@ -148,7 +156,8 @@ filestruct *findnextstr(int quiet, filestruct * begin, char *needle)
 	for (tmp = fileptr->data; tmp != found; tmp++)
 	    current_x++;
 
-	edit_update(current);
+	if (past_editbot)
+	    edit_update(current);
 	reset_cursor();
     } else {			/* We're at EOF, go back to the top, once */
 
@@ -213,7 +222,6 @@ int do_search(void)
 	search_abort();
 	return 0;
     } else if (i == -2) {
-	search_abort();
 	do_replace();
 	return 0;
     } else if (i == 1) {
@@ -377,7 +385,6 @@ int do_replace(void)
 	do_replace();
 	return 1;
     } else if (i == -2) {
-	replace_abort();
 	do_search();
 	return 0;
     } else if (i == -3) {
@@ -472,7 +479,7 @@ int do_replace(void)
 	    current->data = copy;
 
 	    /* Stop bug where we replace a substring of the replacement text */
-	    current_x += strlen(last_replace);
+	    current_x += strlen(last_replace) - 1;
 
 	    edit_refresh();
 	    set_modified();

winio.c

@@ -942,8 +942,8 @@ int statusq(shortcut s[], int slen, char *def, char *msg, ...)
 
     va_start(ap, msg);
     vsnprintf(foo, 132, msg, ap);
-    strncat(foo, ": ", 132);
     va_end(ap);
+    strncat(foo, ": ", 132);
 
     wattron(bottomwin, A_REVERSE);
     ret = nanogetstr(foo, def, s, slen, (strlen(foo) + 3));