off by one in toggle help code and set up for 0.9.17 release

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

BUGS

@@ -51,6 +51,10 @@
   written out to disk when saved..... (37). [FIXED]
 - Page up and page down do not work the same way as Pico (# of lines). (38)
  [FIXED]
+- When doing a search and the marker is set, the screen does not always
+  properly update the inverted text (39). [FIXED]
+- Searches for a string that only exist on one line multiple times will
+  fail after finding the last occurance (discovered by Ken Tyler) (40). [FIXED]
 ** Open BUGS **
 
 - Marked cutting sometimes leaves a newline in the file unintelligently,
@@ -63,5 +67,7 @@
   causes a random segfault (16) [FIXED?]
 - In replace, there is no way to accept the default replace string. (27)
 - totsize problems still abound in do_justify (33)
+- Alt-Z is current broken to toggle suspend.  I guess I still don't know
+  signals very well =-) (41).
 
 $Id$

ChangeLog

@@ -1,3 +1,57 @@
+nano-0.9.17 - 09/04/2000
+- General
+	- New shortcuts to toggle certain options that are normally only
+	  flags via Alt/Meta.  See Alt-C,E,I,K,M,P,X,Z.  New struct called
+	  toggles in nano.h, toggle_init(), toggle_init_one() in global.c
+	  called from shortcut_init(), and do_toggle in nano.c.  Also 
+	  moved the signal code into a separate function in nano.c called
+	  signal_init().  Moved "struct sigaction act"into a static in
+	  nano.c.
+	- Changed from Alt-key symbol (@) which is completely nonstandard
+	  to the *nix "Meta" symbol (M-).  Changed help_init to show
+	  the M-key usage and the help text to explain keys whcih generate
+	  Meta.  Moved the toggle Meta keystrokes to the first column
+	  instead of the third as they are the primary keystrokes for the
+	  functions.  Thanks Mini editor team :->
+	- Changed last_search and last_replace vars to statically 
+	  allocated (hence nulled) and moved to search.c (Matt Kraai).
+- global.c:
+  toggle_init()
+	- Changed "No auto wrap" and "No help mode" to "Auto wrap" and 
+	  "Help mode". See the change to do_toggle() below.
+- nano.c:
+  do_mouse()
+	- Patch for handling lines w/tabs and mouse better (Ben Roberts).
+  do_wrap()
+	- Made wrapping code less ambitious.
+  do_toggle()
+	- Added checks for no help and no wrap mode, and print opposite
+	  enable/disable message.
+  do_suspend(), do_cont():
+	- New functions, handle suspend signal in a Pico-like manner and
+	  work with Meta-Z.
+- winio.c:
+  total_refresh()
+	- Added edit_refresh() call to actually update the screen if messy.
+  edit_refresh_clearok()
+	- New function, does a total update for edit refresh, needed to fix
+	  lack of reversed text on searching with MARK_ISSET.
+  onekey()
+	- Off by one error fix (Rocco Corsi).
+  update_line()
+	- Added check for binary data >= 1 and <= 26, and use ^+letter
+	  to display it.   Should fix editing text files with binary
+	  data in them.  Placing of the cursor seems to be a bit screwed
+	  though...
+- search.c:
+  search_abort()
+	- Now calls edit_refresh_clearok when MARK_ISSET to handle screen
+	  ugliness bug (reported by Ken Tyler).
+  findnextstr():
+	- Added reset for placewewant (Ben Roberts).
+	- Fixed check for string that only occurs on the same line failing
+	  (discovered by Ken Tyler).
+
 nano-0.9.16 - 08/09/2000
 - cut.c:
   do_cut_text()

NEWS

@@ -1,3 +1,10 @@
+09/04/2000 - Nano 0.9.17, the Labor Day release, is released after a
+		quiet spell (almost an entire month since last release!)
+		New features include better (not yet perfect) binary
+		display support and toggle support for most of the program
+		flags (M-c, M-i, M-z, M-x, M-p, M-w, M-m, M-k and M-e for
+		-c, -i, -x, -p, -w, -k, and -R).
+
 08/09/2000 - Nano 0.9.16, after some struggling, is release.  This release
 		should fix a few of the holes that 0.9.15 dug.  The 
 		"cutting text on the first line" bug is fixed, as is the

TODO

@@ -11,6 +11,7 @@ Current Version:
 - Rewrite edit_refresh, if at all possible [DONE]
 - Implement justify function [DONE]
 - Cut to end of line [DONE]
+- Unjustify command (^U after ^J)
 
 For Next Version:
 - Undo/Redo key?

configure

@@ -710,7 +710,7 @@ fi
 
 PACKAGE=nano
 
-VERSION=0.9.16
+VERSION=0.9.16-cvs
 
 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,7 +1,7 @@
 # $Id$
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(nano.c)
-AM_INIT_AUTOMAKE(nano, 0.9.16)
+AM_INIT_AUTOMAKE(nano, 0.9.16-cvs)
 AM_CONFIG_HEADER(config.h:config.h.in)
 ALL_LINGUAS="es de fr it id fi"
 

faq.html

@@ -300,7 +300,7 @@ 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><b><font color="#330000">gzip -dc 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>
@@ -473,7 +473,7 @@ also licensed under the GPL.</font></blockquote>
 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
+here.&nbsp; I (Chris) waited a long 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>

global.c

@@ -39,7 +39,7 @@ int center_x = 0, center_y = 0;	/* Center of screen */
 WINDOW *edit;			/* The file portion of the editor  */
 WINDOW *topwin;			/* Top line of screen */
 WINDOW *bottomwin;		/* Bottom buffer */
-char *filename;			/* Name of the file */
+char filename[PATH_MAX];	/* Name of the file */
 int editwinrows = 0;		/* How many rows long is the edit
 				   window? */
 filestruct *current;		/* Current buffer pointer */
@@ -54,7 +54,7 @@ filestruct *editbot = NULL;	/* Same for the bottom */
 filestruct *filebot = NULL;	/* Last node in the file struct */
 filestruct *cutbuffer = NULL;	/* A place to store cut text */
 
-char *answer;			/* Answer str to many questions */
+char answer[132];		/* Answer str to many questions */
 int totlines = 0;		/* Total number of lines in the file */
 int totsize = 0;		/* Total number of bytes in the file */
 int placewewant = 0;		/* The collum we'd like the cursor
@@ -78,6 +78,7 @@ shortcut goto_list[GOTO_LIST_LEN];
 shortcut writefile_list[WRITEFILE_LIST_LEN];
 shortcut help_list[HELP_LIST_LEN];
 shortcut spell_list[SPELL_LIST_LEN];
+toggle toggles[TOGGLE_LEN];
 
 /* Regular expressions */
 
@@ -99,6 +100,52 @@ void sc_init_one(shortcut * s, int key, char *desc, char *help, int alt,
     s->func = func;
 }
 
+/* Initialize the toggles in the same manner */
+void toggle_init_one(toggle * t, int val, char *desc, int flag)
+{
+    t->val = val;
+    t->desc = desc;
+    t->flag = flag;
+}
+
+void toggle_init(void)
+{
+#ifndef NANO_SMALL
+    char *toggle_const_msg, *toggle_autoindent_msg, *toggle_suspend_msg,
+	*toggle_nohelp_msg, *toggle_picomode_msg, *toggle_mouse_msg,
+	*toggle_cuttoend_msg, *toggle_regexp_msg, *toggle_wrap_msg;
+
+    toggle_const_msg = _("Constant cursor position");
+    toggle_autoindent_msg = _("Auto indent");
+    toggle_suspend_msg = _("Suspend");
+    toggle_nohelp_msg = _("Help mode");
+    toggle_picomode_msg = _("Pico messages");
+    toggle_mouse_msg = _("Mouse support");
+    toggle_cuttoend_msg = _("Cut to end");
+    toggle_regexp_msg = _("Regular expressions");  
+    toggle_wrap_msg = _("Auto wrap");
+
+    toggle_init_one(&toggles[0], TOGGLE_CONST_KEY, toggle_const_msg, 
+	CONSTUPDATE);
+    toggle_init_one(&toggles[1], TOGGLE_AUTOINDENT_KEY, toggle_autoindent_msg, 
+	AUTOINDENT);
+    toggle_init_one(&toggles[2], TOGGLE_SUSPEND_KEY, toggle_suspend_msg, 
+	SUSPEND);
+    toggle_init_one(&toggles[3], TOGGLE_NOHELP_KEY, toggle_nohelp_msg, 
+	NO_HELP);
+    toggle_init_one(&toggles[4], TOGGLE_PICOMODE_KEY, toggle_picomode_msg, 
+	PICO_MSGS);
+    toggle_init_one(&toggles[5], TOGGLE_WRAP_KEY, toggle_wrap_msg, 
+	NO_WRAP);
+    toggle_init_one(&toggles[6], TOGGLE_MOUSE_KEY, toggle_mouse_msg, 
+	USE_MOUSE);
+    toggle_init_one(&toggles[7], TOGGLE_CUTTOEND_KEY, toggle_cuttoend_msg, 
+	CUT_TO_END);
+    toggle_init_one(&toggles[8], TOGGLE_REGEXP_KEY, toggle_regexp_msg, 
+	USE_REGEXP);
+#endif
+}
+
 void shortcut_init(void)
 {
     char *nano_help_msg = "", *nano_writeout_msg = "", *nano_exit_msg = "",
@@ -150,7 +197,6 @@ void shortcut_init(void)
     nano_cancel_msg = _("Cancel the current function");
 #endif
 
-
     if (ISSET(PICO_MSGS))
 	sc_init_one(&main_list[0], NANO_HELP_KEY, _("Get Help"),
 		    nano_help_msg, 0, 0, 0, VIEW, do_help);
@@ -340,4 +386,5 @@ void shortcut_init(void)
     sc_init_one(&spell_list[1], NANO_CANCEL_KEY, _("Cancel"),
 		nano_cancel_msg, 0, 0, 0, VIEW, 0);
 
+    toggle_init();
 }

nano.c

@@ -59,13 +59,12 @@
 #endif
 
 /* Former globals, now static */
-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 */
 static char *help_text_init = "";
 				/* Initial message, not including shortcuts */
+static struct sigaction act;	/* For all out fun signal handlers */
 
 /* What we do when we're all set to exit */
 RETSIGTYPE finish(int sigage)
@@ -148,10 +147,6 @@ void global_init(void)
     for (i = 0; i <= COLS - 1; i++)
 	hblank[i] = ' ';
     hblank[i] = 0;
-    last_search = nmalloc(132);
-    last_replace = nmalloc(132);
-    answer = nmalloc(132);
-
 }
 
 void init_help_msg(void)
@@ -171,9 +166,11 @@ void init_help_msg(void)
 	  "The bottom two lines show the most commonly used shortcuts "
 	  "in the editor.\n\n "
 	  "The notation for shortcuts is as follows: Control-key "
-	  "sequences are notated with a caret (^) symbol.  Alt-key "
-	  "sequences are notated with an at (@) symbol.  The following "
-	  "keystrokes are available in the main editor window. "
+	  "sequences are notated with a caret (^) symbol and are entered "
+	  "with the Control (Ctrl) key.  Escape-key sequences are notated "
+	  "with the Meta (M) symbol and can be entered using either the "
+	  "Esc, Alt or Meta key depending on your keyboard setup.  The "
+	  "following keystrokes are available in the main editor window. "
 	  "Optional keys are shown in parentheses:\n\n");
 #endif
 
@@ -819,18 +816,6 @@ void do_wrap(filestruct * inptr, char input_char)
 	free(temp->data);
 	free(temp);
 
-
-	/* The next line line may need to be wrapped as well. */
-	current_y = old_y + 1;
-	current_x = strlen(inptr->next->data);
-	while (current_x >= 0) {
-	    if (isspace(inptr->next->data[current_x])
-		&& (current_x < fill)) break;
-	    current_x--;
-	}
-	if (current_x >= 0)
-	    check_wrap(inptr->next, ' ');
-
 	current_x = old_x;
 	current_y = old_y;
     }
@@ -1155,6 +1140,7 @@ int do_exit(void)
 void do_mouse(void)
 {
     MEVENT mevent;
+    int foo = 0, tab_found = 0;
 
     if (getmouse(&mevent) == ERR)
 	return;
@@ -1197,6 +1183,23 @@ void do_mouse(void)
 	}
     }
     current_x = mevent.x;
+    placewewant = current_x;
+    while(foo < current_x) {
+	if(current->data[foo] == NANO_CONTROL_I) {
+	    current_x -= tabsize - (foo % tabsize);
+	    tab_found = 1;
+	} else if(current->data[foo] & 0x80)
+	    ;
+	else if(current->data[foo] < 32)
+	    current_x--;
+	foo++;
+    }
+    /* This is where tab_found comes in.  I can't figure out why,
+     * but without it any line with a tab will place the cursor
+     * one character behind.  Whatever, this fixes it. */
+    if(tab_found == 1)
+	current_x++;
+
     if (current_x > strlen(current->data))
 	current_x = strlen(current->data);
 
@@ -1214,6 +1217,29 @@ RETSIGTYPE handle_hup(int signal)
     finish(1);
 }
 
+/* What do we do when we catch the suspend signal */
+RETSIGTYPE do_suspend(int signal)
+{
+
+    act.sa_handler = SIG_DFL;
+    sigemptyset(&act.sa_mask);
+    sigaction(SIGTSTP, &act, NULL);
+
+    endwin();
+    fprintf(stderr,"\n\n\n\n\nUse \"fg\" to return to nano\n");
+    raise(SIGTSTP);
+}
+
+/* Restore the suspend handler when we come back into the prog */
+RETSIGTYPE do_cont(int signal)
+{
+
+    act.sa_handler = do_suspend;
+    sigemptyset(&act.sa_mask);
+    sigaction(SIGTSTP, &act, NULL);
+    initscr();
+    total_refresh();
+}
 
 void handle_sigwinch(int s)
 {
@@ -1284,6 +1310,52 @@ void handle_sigwinch(int s)
 #endif
 }
 
+void signal_init(void)
+{
+
+    /* Trap SIGINT and SIGQUIT  cuz we want them to do useful things. */
+    memset(&act, 0, sizeof(struct sigaction));
+    act.sa_handler = SIG_IGN;
+    sigaction(SIGINT, &act, NULL);
+
+    if (!ISSET(SUSPEND)) {
+	sigaction(SIGTSTP, &act, NULL);
+    }
+    else
+    {
+	act.sa_handler = do_suspend;
+	sigaction(SIGTSTP, &act, NULL);
+
+	act.sa_handler = do_cont;
+	sigaction (SIGCONT, &act, NULL);
+    }
+
+
+    /* Trap SIGHUP  cuz we want to write the file out. */
+    act.sa_handler = handle_hup;
+    sigaction(SIGHUP, &act, NULL);
+
+    act.sa_handler = handle_sigwinch;
+    sigaction(SIGWINCH, &act, NULL);
+
+}
+
+void mouse_init(void)
+{
+#ifndef NANO_SMALL
+#ifdef NCURSES_MOUSE_VERSION
+    if (ISSET(USE_MOUSE)) {
+	mousemask(BUTTON1_RELEASED, NULL);
+	mouseinterval(50);
+    }
+    else {
+	mousemask(0, NULL);
+    }
+#endif
+#endif
+
+}
+
 int do_tab(void)
 {
     do_char('\t');
@@ -1496,6 +1568,11 @@ void help_init(void)
 	if (main_list[i].help != NULL)
 	    allocsize += strlen(main_list[i].help) + 15;
 
+    /* And for the toggle list, we also allocate space for extra text. */
+    for (i = 0; i <= TOGGLE_LEN - 1; i++)
+	if (toggles[i].desc != NULL)
+	    allocsize += strlen(toggles[i].desc) + 30;
+
     allocsize += strlen(help_text_init);
 
     if (help_text != NULL)
@@ -1508,7 +1585,7 @@ void help_init(void)
     strcpy(help_text, help_text_init);
 
     /* Now add our shortcut info */
-    for (i = 0; i < MAIN_LIST_LEN; i++) {
+    for (i = 0; i < MAIN_LIST_LEN - 1; i++) {
 	sofar = snprintf(buf, BUFSIZ, "^%c	", main_list[i].val + 64);
 
 	if (main_list[i].misc1 > KEY_F0 && main_list[i].misc1 <= KEY_F(64))
@@ -1518,26 +1595,84 @@ void help_init(void)
 	    sofar += snprintf(&buf[sofar], BUFSIZ - sofar, "	");
 
 	if (main_list[i].altval > 0)
-	    sofar += snprintf(&buf[sofar], BUFSIZ - sofar, "(@%c)	",
+	    sofar += snprintf(&buf[sofar], BUFSIZ - sofar, "(M-%c)	",
 			     main_list[i].altval - 32);
 	else
 	    sofar += snprintf(&buf[sofar], BUFSIZ - sofar, "	");
 
+
 	if (main_list[i].help != NULL)
 	    snprintf(&buf[sofar], BUFSIZ - sofar, "%s", main_list[i].help);
 
+
+	strcat(help_text, buf);
+	strcat(help_text, "\n");
+    }
+
+    /* And the toggles... */
+    for (i = 0; i <= TOGGLE_LEN - 1; i++) {
+	sofar = snprintf(buf, BUFSIZ, 
+	"M-%c			", toggles[i].val - 32 );
+
+	if (toggles[i].desc != NULL)
+	    snprintf(&buf[sofar], BUFSIZ - sofar, "%s enable/disable", 
+		toggles[i].desc);
+
 	strcat(help_text, buf);
 	strcat(help_text, "\n");
     }
 
 }
 
+void do_toggle(int which)
+{
+#ifndef NANO_SMALL
+    char *enabled = "enabled";
+    char *disabled = "disabled";
+
+
+    if (ISSET(toggles[which].flag)) {
+	if (toggles[which].val == TOGGLE_NOHELP_KEY ||
+	   toggles[which].val == TOGGLE_WRAP_KEY)
+	    statusbar("%s %s", toggles[which].desc, enabled);
+	else
+	    statusbar("%s %s", toggles[which].desc, disabled);
+	UNSET(toggles[which].flag);
+    } else {
+	if (toggles[which].val == TOGGLE_NOHELP_KEY ||
+	   toggles[which].val == TOGGLE_WRAP_KEY)
+	    statusbar("%s %s", toggles[which].desc, disabled);
+	else
+	    statusbar("%s %s", toggles[which].desc, enabled);
+	SET(toggles[which].flag);
+    }
+    switch (toggles[which].val) {
+    case TOGGLE_PICOMODE_KEY:
+	shortcut_init();
+	display_main_list();
+	break;
+    case TOGGLE_SUSPEND_KEY:
+	signal_init();
+	break;
+    case TOGGLE_MOUSE_KEY:
+	mouse_init();
+	break;
+    case TOGGLE_NOHELP_KEY:
+	handle_sigwinch(1);
+	break;
+    }
+    SET(DISABLE_CURPOS);
+
+#else
+    nano_small_msg();
+#endif
+}
+
 int main(int argc, char *argv[])
 {
     int optchr;
     int kbinput;		/* Input from keyboard */
     long startline = 0;		/* Line to try and start at */
-    struct sigaction act;	/* For our lovely signals */
     int keyhandled = 0;		/* Have we handled the keystroke yet? */
     int tmpkey = 0, i;
     char *argv0;
@@ -1668,9 +1803,6 @@ int main(int argc, char *argv[])
 	|| (!argv0 && strstr(argv[0], "pico")))
 	SET(PICO_MSGS);
 
-    filename = nmalloc(PATH_MAX);
-    strcpy(filename, "");
-
     /* See if there's a non-option in argv (first non-option is the
        filename, if +LINE is not given) */
     if (argc == 1 || argc <= optind)
@@ -1712,22 +1844,7 @@ int main(int argc, char *argv[])
     shortcut_init();
     init_help_msg();
     help_init();
-
-    /* Trap SIGINT and SIGQUIT  cuz we want them to do useful things. */
-    memset(&act, 0, sizeof(struct sigaction));
-    act.sa_handler = SIG_IGN;
-    sigaction(SIGINT, &act, NULL);
-    sigaction(SIGQUIT, &act, NULL);
-
-    if (!ISSET(SUSPEND))
-	sigaction(SIGTSTP, &act, NULL);
-
-    /* Trap SIGHUP  cuz we want to write the file out. */
-    act.sa_handler = handle_hup;
-    sigaction(SIGHUP, &act, NULL);
-
-    act.sa_handler = handle_sigwinch;
-    sigaction(SIGWINCH, &act, NULL);
+    signal_init();
 
 #ifdef DEBUG
     fprintf(stderr, _("Main: set up windows\n"));
@@ -1737,14 +1854,7 @@ int main(int argc, char *argv[])
     edit = newwin(editwinrows, COLS, 2, 0);
     keypad(edit, TRUE);
 
-#ifndef NANO_SMALL
-#ifdef NCURSES_MOUSE_VERSION
-    if (ISSET(USE_MOUSE)) {
-	mousemask(BUTTON1_RELEASED, NULL);
-	mouseinterval(50);
-    }
-#endif
-#endif
+    mouse_init();
 
     /* And the other windows */
     topwin = newwin(2, COLS, 0, 0);
@@ -1838,9 +1948,19 @@ int main(int argc, char *argv[])
 		for (i = 0; i <= MAIN_LIST_LEN - 1; i++)
 		    if (kbinput == main_list[i].altval ||
 			kbinput == main_list[i].altval - 32) {
-			kbinput = main_list[i].val;
-			break;
+			    kbinput = main_list[i].val;
+			    break;
 		    }
+#ifndef NANO_SMALL
+		/* And for toggle switches */
+		for (i = 0; i <= TOGGLE_LEN - 1 && !keyhandled; i++)
+		    if (kbinput == toggles[i].val ||
+			kbinput == toggles[i].val - 32) {
+			    do_toggle(i);
+			    keyhandled = 1;
+			    break;
+		    }
+#endif
 #ifdef DEBUG
 		fprintf(stderr, _("I got Alt-%c! (%d)\n"), kbinput,
 			kbinput);
@@ -1850,7 +1970,7 @@ int main(int argc, char *argv[])
 	}
 	/* Look through the main shortcut list to see if we've hit a
 	   shortcut key */
-	for (i = 0; i < MAIN_LIST_LEN; i++) {
+	for (i = 0; i < MAIN_LIST_LEN && !keyhandled; i++) {
 	    if (kbinput == main_list[i].val ||
 		(main_list[i].misc1 && kbinput == main_list[i].misc1) ||
 		(main_list[i].misc2 && kbinput == main_list[i].misc2)) {
@@ -1891,8 +2011,12 @@ int main(int argc, char *argv[])
 		}
 		do_char(kbinput);
 	    }
-	if (ISSET(CONSTUPDATE))
-	    do_cursorpos();
+	if (ISSET(CONSTUPDATE)) {
+	    if (ISSET(DISABLE_CURPOS))
+		UNSET(DISABLE_CURPOS);
+	    else
+		do_cursorpos();
+	}
 
 	reset_cursor();
 	wrefresh(edit);

nano.h

@@ -82,6 +82,14 @@ typedef struct shortcut {
    char *help;		/* Help file entry text */
 } shortcut;
 
+typedef struct toggle {
+   int val;		/* Sequence to toggle the key.  Should only need 1 */
+   char *desc;		/* Description for when toggle is, uh, toggled,
+			   e.g. "Pico Messages", we'll append Enabled or
+			   Disabled */
+   int flag;		/* What flag actually gets toggled */
+} toggle;
+
 /* Bitwise flags so we can save space (or more correctly, not waste it) */
 
 #define MODIFIED		(1<<0)
@@ -102,6 +110,7 @@ typedef struct shortcut {
 #define REGEXP_COMPILED         (1<<15)
 #define TEMP_OPT         	(1<<16)
 #define CUT_TO_END         	(1<<17)
+#define DISABLE_CURPOS         	(1<<18)
 
 /* Control key sequences, chaning these would be very very bad */
 
@@ -217,6 +226,16 @@ know what you're doing */
 #define NANO_ENTER_KEY		NANO_CONTROL_M
 #define NANO_FROMSEARCHTOGOTO_KEY NANO_CONTROL_T
 
+#define TOGGLE_CONST_KEY	NANO_ALT_C
+#define TOGGLE_AUTOINDENT_KEY	NANO_ALT_I
+#define TOGGLE_SUSPEND_KEY	NANO_ALT_Z
+#define TOGGLE_NOHELP_KEY	NANO_ALT_X
+#define TOGGLE_PICOMODE_KEY	NANO_ALT_P
+#define TOGGLE_MOUSE_KEY	NANO_ALT_M
+#define TOGGLE_CUTTOEND_KEY	NANO_ALT_K
+#define TOGGLE_REGEXP_KEY	NANO_ALT_E
+#define TOGGLE_WRAP_KEY		NANO_ALT_W
+
 #define MAIN_LIST_LEN 26
 #define MAIN_VISIBLE 12
 #define WHEREIS_LIST_LEN 6
@@ -226,6 +245,12 @@ know what you're doing */
 #define HELP_LIST_LEN 3
 #define SPELL_LIST_LEN 3
 
+#ifndef SMALL_NANO
+#define TOGGLE_LEN 9
+#else
+#define TOGGLE_LEN 6
+#endif
+
 #define VIEW 1
 #define NOVIEW 0
 

po/cat-id-tbl.c

@@ -28,71 +28,80 @@ const struct _msg_ent _msg_tbl[] = {
   {"File Name to write", 19},
   {"filename is %s", 20},
   {"File exists, OVERWRITE ?", 21},
-  {"Invoke the help menu", 22},
-  {"Write the current file to disk", 23},
-  {"Exit from nano", 24},
-  {"Goto a specific line number", 25},
-  {"Justify the current paragraph", 26},
-  {"Replace text within the editor", 27},
-  {"Insert another file into the current one", 28},
-  {"Search for text within the editor", 29},
-  {"Move to the previous screen", 30},
-  {"Move to the next screen", 31},
-  {"Cut the current line and store it in the cutbuffer", 32},
-  {"Uncut from the cutbuffer into the current line", 33},
-  {"Show the posititon of the cursor", 34},
-  {"Invoke the spell checker (if available)", 35},
-  {"Move up one line", 36},
-  {"Move down one line", 37},
-  {"Move forward one character", 38},
-  {"Move back one character", 39},
-  {"Move to the beginning of the current line", 40},
-  {"Move to the end of the current line", 41},
-  {"Go to the first line of the file", 42},
-  {"Go to the last line of the file", 43},
-  {"Refresh (redraw) the current screen", 44},
-  {"Mark text at the current cursor location", 45},
-  {"Delete the character under the cursor", 46},
-  {"Delete the character to the left of the cursor", 47},
-  {"Insert a tab character", 48},
-  {"Insert a carriage return at the cursor position", 49},
-  {"Make the current search or replace case (in)sensitive", 50},
-  {"Cancel the current function", 51},
-  {"Get Help", 52},
-  {"WriteOut", 53},
-  {"Exit", 54},
-  {"Goto Line", 55},
-  {"Justify", 56},
-  {"Replace", 57},
-  {"Read File", 58},
-  {"Where Is", 59},
-  {"Prev Page", 60},
-  {"Next Page", 61},
-  {"Cut Text", 62},
-  {"UnCut Txt", 63},
-  {"Cur Pos", 64},
-  {"To Spell", 65},
-  {"Up", 66},
-  {"Down", 67},
-  {"Forward", 68},
-  {"Back", 69},
-  {"Home", 70},
-  {"End", 71},
-  {"Refresh", 72},
-  {"Mark Text", 73},
-  {"Delete", 74},
-  {"Backspace", 75},
-  {"Tab", 76},
-  {"Enter", 77},
-  {"First Line", 78},
-  {"Last Line", 79},
-  {"Case Sens", 80},
-  {"Cancel", 81},
-  {"No Replace", 82},
+  {"Constant cursor position", 22},
+  {"Auto indent", 23},
+  {"Suspend", 24},
+  {"Help mode", 25},
+  {"Pico messages", 26},
+  {"Mouse support", 27},
+  {"Cut to end", 28},
+  {"Regular expressions", 29},
+  {"Auto wrap", 30},
+  {"Invoke the help menu", 31},
+  {"Write the current file to disk", 32},
+  {"Exit from nano", 33},
+  {"Goto a specific line number", 34},
+  {"Justify the current paragraph", 35},
+  {"Replace text within the editor", 36},
+  {"Insert another file into the current one", 37},
+  {"Search for text within the editor", 38},
+  {"Move to the previous screen", 39},
+  {"Move to the next screen", 40},
+  {"Cut the current line and store it in the cutbuffer", 41},
+  {"Uncut from the cutbuffer into the current line", 42},
+  {"Show the posititon of the cursor", 43},
+  {"Invoke the spell checker (if available)", 44},
+  {"Move up one line", 45},
+  {"Move down one line", 46},
+  {"Move forward one character", 47},
+  {"Move back one character", 48},
+  {"Move to the beginning of the current line", 49},
+  {"Move to the end of the current line", 50},
+  {"Go to the first line of the file", 51},
+  {"Go to the last line of the file", 52},
+  {"Refresh (redraw) the current screen", 53},
+  {"Mark text at the current cursor location", 54},
+  {"Delete the character under the cursor", 55},
+  {"Delete the character to the left of the cursor", 56},
+  {"Insert a tab character", 57},
+  {"Insert a carriage return at the cursor position", 58},
+  {"Make the current search or replace case (in)sensitive", 59},
+  {"Cancel the current function", 60},
+  {"Get Help", 61},
+  {"WriteOut", 62},
+  {"Exit", 63},
+  {"Goto Line", 64},
+  {"Justify", 65},
+  {"Replace", 66},
+  {"Read File", 67},
+  {"Where Is", 68},
+  {"Prev Page", 69},
+  {"Next Page", 70},
+  {"Cut Text", 71},
+  {"UnCut Txt", 72},
+  {"Cur Pos", 73},
+  {"To Spell", 74},
+  {"Up", 75},
+  {"Down", 76},
+  {"Forward", 77},
+  {"Back", 78},
+  {"Home", 79},
+  {"End", 80},
+  {"Refresh", 81},
+  {"Mark Text", 82},
+  {"Delete", 83},
+  {"Backspace", 84},
+  {"Tab", 85},
+  {"Enter", 86},
+  {"First Line", 87},
+  {"Last Line", 88},
+  {"Case Sens", 89},
+  {"Cancel", 90},
+  {"No Replace", 91},
   {"\
 \n\
-Buffer written to 'nano.save'\n", 83},
-  {"Key illegal in VIEW mode", 84},
+Buffer written to 'nano.save'\n", 92},
+  {"Key illegal in VIEW mode", 93},
   {"\
  nano help text\n\
 \n\
@@ -105,114 +114,116 @@ bottom and shows important messages. The bottom two lines show the most \
 commonly used shortcuts in the editor.\n\
 \n\
  The notation for shortcuts is as follows: Control-key sequences are notated \
-with a caret (^) symbol.  Alt-key sequences are notated with an at (@) \
-symbol.  The following keystrokes are available in the main editor window. \
-Optional keys are shown in parentheses:\n\
-\n", 85},
-  {"free_node(): free'd a node, YAY!\n", 86},
-  {"free_node(): free'd last node.\n", 87},
+with a caret (^) symbol and are entered with the Control (Ctrl) key.  \
+Escape-key sequences are notated with the Meta (M) symbol and can be entered \
+using either the Esc, Alt or Meta key depending on your keyboard setup.  The \
+following keystrokes are available in the main editor window. Optional keys \
+are shown in parentheses:\n\
+\n", 94},
+  {"free_node(): free'd a node, YAY!\n", 95},
+  {"free_node(): free'd last node.\n", 96},
   {"\
 Usage: nano [GNU long option] [option] +LINE <file>\n\
-\n", 88},
-  {"Option\t\tLong option\t\tMeaning\n", 89},
-  {" -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n", 90},
-  {" -R\t\t--regexp\t\tUse regular expressions for search\n", 91},
-  {" -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},
-  {" -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},
+\n", 97},
+  {"Option\t\tLong option\t\tMeaning\n", 98},
+  {" -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n", 99},
+  {" -R\t\t--regexp\t\tUse regular expressions for search\n", 100},
+  {" -V \t\t--version\t\tPrint version information and exit\n", 101},
+  {" -c \t\t--const\t\t\tConstantly show cursor position\n", 102},
+  {" -h \t\t--help\t\t\tShow this message\n", 103},
+  {" -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n", 104},
+  {" -i \t\t--autoindent\t\tAutomatically indent new lines\n", 105},
+  {" -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n", 106},
+  {" -m \t\t--mouse\t\t\tEnable mouse\n", 107},
   {"\
- -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},
+ -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n", 108},
+  {" -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n", 109},
+  {" -s [prog] \t--speller=[prog]\tEnable alternate speller\n", 110},
+  {" -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n", 111},
+  {" -v \t\t--view\t\t\tView (read only) mode\n", 112},
+  {" -w \t\t--nowrap\t\tDon't wrap long lines\n", 113},
+  {" -x \t\t--nohelp\t\tDon't show help window\n", 114},
+  {" -z \t\t--suspend\t\tEnable suspend\n", 115},
+  {" +LINE\t\t\t\t\tStart at line number LINE\n", 116},
   {"\
 Usage: nano [option] +LINE <file>\n\
-\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},
+\n", 117},
+  {"Option\t\tMeaning\n", 118},
+  {" -T [num]\tSet width of a tab to num\n", 119},
+  {" -R\t\tUse regular expressions for search\n", 120},
+  {" -V \t\tPrint version information and exit\n", 121},
+  {" -c \t\tConstantly show cursor position\n", 122},
+  {" -h \t\tShow this message\n", 123},
+  {" -k \t\tLet ^K cut from cursor to end of line\n", 124},
+  {" -i \t\tAutomatically indent new lines\n", 125},
+  {" -l \t\tDon't follow symbolic links, overwrite.\n", 126},
+  {" -m \t\tEnable mouse\n", 127},
+  {" -r [#cols] \tSet fill cols to (wrap lines at) #cols\n", 128},
+  {" -s [prog]  \tEnable alternate speller\n", 129},
+  {" -p \t\tMake bottom 2 lines more Pico-like\n", 130},
+  {" -t \t\tAuto save on exit, don't prompt\n", 131},
+  {" -v \t\tView (read only) mode\n", 132},
+  {" -w \t\tDon't wrap long lines\n", 133},
+  {" -x \t\tDon't show help window\n", 134},
+  {" -z \t\tEnable suspend\n", 135},
+  {" +LINE\t\tStart at line number LINE\n", 136},
+  {" nano version %s by Chris Allegretta (compiled %s, %s)\n", 137},
+  {" Email: nano@asty.org\tWeb: http://www.asty.org/nano\n", 138},
+  {"Mark Set", 139},
+  {"Mark UNset", 140},
+  {"check_wrap called with inptr->data=\"%s\"\n", 141},
+  {"current->data now = \"%s\"\n", 142},
+  {"After, data = \"%s\"\n", 143},
+  {"Error deleting tempfile, ack!", 144},
+  {"Could not create a temporary filename: %s", 145},
+  {"Could not invoke spell program \"%s\"", 146},
+  {"Could not invoke \"ispell\"", 147},
+  {"Finished checking spelling", 148},
+  {"Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? ", 149},
+  {"Cannot resize top win", 150},
+  {"Cannot move top win", 151},
+  {"Cannot resize edit win", 152},
+  {"Cannot move edit win", 153},
+  {"Cannot resize bottom win", 154},
+  {"Cannot move bottom win", 155},
+  {"Main: set up windows\n", 156},
+  {"Main: bottom win\n", 157},
+  {"Main: open file\n", 158},
+  {"I got Alt-[-%c! (%d)\n", 159},
+  {"I got Alt-%c! (%d)\n", 160},
+  {"Case Sensitive Regexp Search%s%s", 161},
+  {"Regexp Search%s%s", 162},
+  {"Case Sensitive Search%s%s", 163},
+  {"Search%s%s", 164},
+  {" (to replace)", 165},
+  {"Search Cancelled", 166},
+  {"Search Wrapped", 167},
+  {"Replaced %d occurences", 168},
+  {"Replaced 1 occurence", 169},
+  {"Replace Cancelled", 170},
+  {"Replace with [%s]", 171},
+  {"Replace with", 172},
+  {"Replace this instance?", 173},
+  {"Enter line number", 174},
+  {"Aborted", 175},
+  {"Come on, be reasonable", 176},
+  {"Only %d lines available, skipping to last line", 177},
+  {"actual_x_from_start for xplus=%d returned %d\n", 178},
+  {"input '%c' (%d)\n", 179},
+  {"New Buffer", 180},
+  {"  File: ...", 181},
+  {"Modified", 182},
+  {"Moved to (%d, %d) in edit buffer\n", 183},
+  {"current->data = \"%s\"\n", 184},
+  {"I got \"%s\"\n", 185},
+  {"Yes", 186},
+  {"All", 187},
+  {"No", 188},
+  {"do_cursorpos: linepct = %f, bytepct = %f\n", 189},
+  {"line %d of %d (%.0f%%), character %d of %d (%.0f%%)", 190},
+  {"Dumping file buffer to stderr...\n", 191},
+  {"Dumping cutbuffer to stderr...\n", 192},
+  {"Dumping a buffer to stderr...\n", 193},
 };
 
-int _msg_tbl_length = 184;
+int _msg_tbl_length = 193;

po/de.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 0.9.14pre1\n"
-"POT-Creation-Date: 2000-08-07 11:03-0400\n"
+"POT-Creation-Date: 2000-09-03 23:58-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"
@@ -33,7 +33,7 @@ msgstr "read_line: nicht in der ersten Zeile und prev ist NULL"
 msgid "Read %d lines"
 msgstr "%d Zeilen gelesen"
 
-#: files.c:217 search.c:173 search.c:191
+#: files.c:217 search.c:177
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" nicht gefunden"
@@ -56,7 +56,7 @@ msgstr "Lese Datei"
 msgid "File to insert [from ./] "
 msgstr "Datei zum Einfügen [von ./] "
 
-#: files.c:273 files.c:297 files.c:487 nano.c:1147
+#: files.c:273 files.c:297 files.c:487 nano.c:1132
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
@@ -108,253 +108,293 @@ msgstr "Dateiname ist %s"
 msgid "File exists, OVERWRITE ?"
 msgstr "Datei exisitiert, ÜBERSCHREIBEN ?"
 
+#: global.c:118
+#, fuzzy
+msgid "Constant cursor position"
+msgstr " -c \t\tCursorposition ständig anzeigen\n"
+
 #: global.c:119
+#, fuzzy
+msgid "Auto indent"
+msgstr "autoindent"
+
+#: global.c:120
+msgid "Suspend"
+msgstr "Suspend"
+
+#: global.c:121
+msgid "Help mode"
+msgstr ""
+
+#: global.c:122
+msgid "Pico messages"
+msgstr ""
+
+#: global.c:123
+msgid "Mouse support"
+msgstr ""
+
+#: global.c:124
+msgid "Cut to end"
+msgstr ""
+
+#: global.c:125
+#, fuzzy
+msgid "Regular expressions"
+msgstr " -R\t\tRegulären Ausdruck zur Suche verwenden\n"
+
+#: global.c:126
+#, fuzzy
+msgid "Auto wrap"
+msgstr "nowrap"
+
+#: global.c:166
 msgid "Invoke the help menu"
 msgstr "Hilfe-Menü anzeigen"
 
-#: global.c:120
+#: global.c:167
 msgid "Write the current file to disk"
 msgstr "Datei speichern"
 
-#: global.c:121
+#: global.c:168
 msgid "Exit from nano"
 msgstr "nano beenden"
 
-#: global.c:122
+#: global.c:169
 msgid "Goto a specific line number"
 msgstr "Zu einer Zeile springen"
 
-#: global.c:123
+#: global.c:170
 msgid "Justify the current paragraph"
 msgstr "Absatz ausrichten"
 
-#: global.c:124
+#: global.c:171
 msgid "Replace text within the editor"
 msgstr "Text im Editor ersetzen"
 
-#: global.c:125
+#: global.c:172
 msgid "Insert another file into the current one"
 msgstr "Datei einfügen"
 
-#: global.c:126
+#: global.c:173
 msgid "Search for text within the editor"
 msgstr "Im Editor nach Text suchen"
 
-#: global.c:127
+#: global.c:174
 msgid "Move to the previous screen"
 msgstr "Zu der vorhergehenden Seite springen"
 
-#: global.c:128
+#: global.c:175
 msgid "Move to the next screen"
 msgstr "Zu der folgenden Seite springen"
 
-#: global.c:129
+#: global.c:176
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Zeile ausschneiden und in dir Zwischenablage speichern"
 
-#: global.c:130
+#: global.c:177
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Aus der Zwischenablage einfügen"
 
-#: global.c:131
+#: global.c:178
 msgid "Show the posititon of the cursor"
 msgstr "Cursoposition anzeigen"
 
-#: global.c:132
+#: global.c:179
 msgid "Invoke the spell checker (if available)"
 msgstr "Rechtschreibprüfung aufrufen (wenn verfügbar)"
 
-#: global.c:133
+#: global.c:180
 msgid "Move up one line"
 msgstr "Zur vorhergehenden Zeile springen"
 
-#: global.c:134
+#: global.c:181
 msgid "Move down one line"
 msgstr "Zur folgenden Zeile springen"
 
-#: global.c:135
+#: global.c:182
 msgid "Move forward one character"
 msgstr "Zum folgenden Zeichen springen"
 
-#: global.c:136
+#: global.c:183
 msgid "Move back one character"
 msgstr "Zum vorhergehenden Zeichen springen"
 
-#: global.c:137
+#: global.c:184
 msgid "Move to the beginning of the current line"
 msgstr "Zum Zeilenanfang springen"
 
-#: global.c:138
+#: global.c:185
 msgid "Move to the end of the current line"
 msgstr "Zum Zeilenende springen"
 
-#: global.c:139
+#: global.c:186
 msgid "Go to the first line of the file"
 msgstr "Zur ersten Zeile springen"
 
-#: global.c:140
+#: global.c:187
 msgid "Go to the last line of the file"
 msgstr "Zur letzten Zeile springen"
 
-#: global.c:141
+#: global.c:188
 msgid "Refresh (redraw) the current screen"
 msgstr "Bildschirm auffrischen (neu zeichnen)"
 
-#: global.c:142
+#: global.c:189
 msgid "Mark text at the current cursor location"
 msgstr "Text an der derzeitigen Cursorposition markieren"
 
-#: global.c:143
+#: global.c:190
 msgid "Delete the character under the cursor"
 msgstr "Zeichen an der Cursorposition löschen"
 
-#: global.c:145
+#: global.c:192
 msgid "Delete the character to the left of the cursor"
 msgstr "Zeichen links vom Cursor löschen"
 
-#: global.c:146
+#: global.c:193
 msgid "Insert a tab character"
 msgstr "Tabulator einfügen"
 
-#: global.c:147
+#: global.c:194
 msgid "Insert a carriage return at the cursor position"
 msgstr "Zeilenumbruch an der Cursorposition einfügen"
 
-#: global.c:149
+#: global.c:196
 msgid "Make the current search or replace case (in)sensitive"
 msgstr ""
 "Groß- und Kleinschreibung bei Suche oder Erstzen (nicht) berücksichtigen"
 
-#: global.c:150
+#: global.c:197
 msgid "Cancel the current function"
 msgstr "Funktion abbrechen"
 
-#: global.c:155 global.c:265 global.c:337
+#: global.c:201 global.c:311 global.c:383
 msgid "Get Help"
 msgstr "Hilfe"
 
-#: global.c:158 global.c:166
+#: global.c:204 global.c:212
 msgid "WriteOut"
 msgstr "Speichern"
 
-#: global.c:162 global.c:326
+#: global.c:208 global.c:372
 msgid "Exit"
 msgstr "Beenden"
 
-#: global.c:170 global.c:261 global.c:282 global.c:301
+#: global.c:216 global.c:307 global.c:328 global.c:347
 msgid "Goto Line"
 msgstr "Zu Zeile"
 
-#: global.c:175 global.c:253
+#: global.c:221 global.c:299
 msgid "Justify"
 msgstr "Ausrichten"
 
-#: global.c:178 global.c:249 global.c:279
+#: global.c:224 global.c:295 global.c:325
 msgid "Replace"
 msgstr "Ersetzen"
 
-#: global.c:182
+#: global.c:228
 msgid "Read File"
 msgstr "Datei öffnen"
 
-#: global.c:186
+#: global.c:232
 msgid "Where Is"
 msgstr "Wo ist"
 
-#: global.c:190 global.c:318
+#: global.c:236 global.c:364
 msgid "Prev Page"
 msgstr "Seite zurück"
 
-#: global.c:194 global.c:322
+#: global.c:240 global.c:368
 msgid "Next Page"
 msgstr "Seite vor"
 
-#: global.c:198
+#: global.c:244
 msgid "Cut Text"
 msgstr "Ausschneiden"
 
-#: global.c:201
+#: global.c:247
 msgid "UnCut Txt"
 msgstr "Einfügen"
 
-#: global.c:205
+#: global.c:251
 msgid "Cur Pos"
 msgstr "Cursor"
 
-#: global.c:209
+#: global.c:255
 msgid "To Spell"
 msgstr "Rechtschr."
 
-#: global.c:213
+#: global.c:259
 msgid "Up"
 msgstr "Hoch"
 
-#: global.c:216
+#: global.c:262
 msgid "Down"
 msgstr "Runter"
 
-#: global.c:219
+#: global.c:265
 msgid "Forward"
 msgstr "Vorwärts"
 
-#: global.c:222
+#: global.c:268
 msgid "Back"
 msgstr "Zurück"
 
-#: global.c:225
+#: global.c:271
 msgid "Home"
 msgstr "Pos 1"
 
-#: global.c:228
+#: global.c:274
 msgid "End"
 msgstr "Ende"
 
-#: global.c:231
+#: global.c:277
 msgid "Refresh"
 msgstr "Auffrischen"
 
-#: global.c:234
+#: global.c:280
 msgid "Mark Text"
 msgstr "Text markieren"
 
-#: global.c:237
+#: global.c:283
 msgid "Delete"
 msgstr "Löschen"
 
-#: global.c:241
+#: global.c:287
 msgid "Backspace"
 msgstr "Rücktaste"
 
-#: global.c:245
+#: global.c:291
 msgid "Tab"
 msgstr "Tab"
 
-#: global.c:256
+#: global.c:302
 msgid "Enter"
 msgstr "Enter"
 
-#: global.c:269 global.c:289 global.c:308
+#: global.c:315 global.c:335 global.c:354
 msgid "First Line"
 msgstr "Erste Zeile"
 
-#: global.c:272 global.c:292 global.c:311
+#: global.c:318 global.c:338 global.c:357
 msgid "Last Line"
 msgstr "Letzte Zeile"
 
-#: global.c:275 global.c:295
+#: global.c:321 global.c:341
 msgid "Case Sens"
 msgstr "GROSZ/klein"
 
-#: global.c:285 global.c:304 global.c:314 global.c:330 global.c:334
-#: global.c:340 winio.c:984
+#: global.c:331 global.c:350 global.c:360 global.c:376 global.c:380
+#: global.c:386 winio.c:999
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: global.c:298
+#: global.c:344
 msgid "No Replace"
 msgstr "Keine Ersetzung"
 
-#: nano.c:116
+#: nano.c:115
 msgid ""
 "\n"
 "Buffer written to 'nano.save'\n"
@@ -362,11 +402,12 @@ msgstr ""
 "\n"
 "Puffer in 'nano.save' geschrieben\n"
 
-#: nano.c:123
+#: nano.c:122
 msgid "Key illegal in VIEW mode"
 msgstr "Unzulässige Taste im View Modus"
 
-#: nano.c:163
+#: nano.c:158
+#, fuzzy
 msgid ""
 " nano help text\n"
 "\n"
@@ -379,9 +420,11 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol.  Alt-key sequences are notated with an at (@) "
-"symbol.  The following keystrokes are available in the main editor window. "
-"Optional keys are shown in parentheses:\n"
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
+"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
+"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"following keystrokes are available in the main editor window. Optional keys "
+"are shown in parentheses:\n"
 "\n"
 msgstr ""
 " nano Hilfe\n"
@@ -400,15 +443,15 @@ msgstr ""
 "Optionale Tasten sind eingeklammert.\n"
 "\n"
 
-#: nano.c:264
+#: nano.c:261
 msgid "free_node(): free'd a node, YAY!\n"
 msgstr "free_node(): Knoten freigegeben.\n"
 
-#: nano.c:269
+#: nano.c:266
 msgid "free_node(): free'd last node.\n"
 msgstr "free_node(): letzter Knoten freigegeben.\n"
 
-#: nano.c:321
+#: nano.c:318
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
@@ -416,91 +459,91 @@ msgstr ""
 "Aufruf: nano [lange GNU Option] [Option] +ZEILE <Datei>\n"
 "\n"
 
-#: nano.c:322
+#: nano.c:319
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Option\t\tlange Option\t\tBedeutung\n"
 
-#: nano.c:324
+#: nano.c:321
 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:327
+#: nano.c:324
 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:331
+#: nano.c:328
 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:333
+#: nano.c:330
 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:335
+#: nano.c:332
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr " -h \t\t--help\t\t\tDiese Meldung anzeigen\n"
 
-#: nano.c:338
+#: nano.c:335
 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:341
+#: nano.c:338
 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:343
+#: nano.c:340
 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:346
+#: nano.c:343
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr " -m \t\t--mouse\t\t\tMaus aktivieren\n"
 
-#: nano.c:351
+#: nano.c:348
 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:353
+#: nano.c:350
 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:355
+#: nano.c:352
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr ""
 " -s [Programm] \t--speller=[Programm]\tAlternative Rechtschreibprüfung\n"
 
-#: nano.c:357
+#: nano.c:354
 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:359
+#: nano.c:356
 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:361
+#: nano.c:358
 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:363
+#: nano.c:360
 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:365
+#: nano.c:362
 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:367
+#: nano.c:364
 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:369
+#: nano.c:366
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
@@ -508,262 +551,262 @@ msgstr ""
 "Aufruf: nano [Option] +ZEILE <Datei>\n"
 "\n"
 
-#: nano.c:370
+#: nano.c:367
 msgid "Option\t\tMeaning\n"
 msgstr "Option\t\tBedeutung\n"
 
-#: nano.c:371
+#: nano.c:368
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr " -T [Anzahl]\tTabulator-Größe auf Anzahl setzen\n"
 
-#: nano.c:372
+#: nano.c:369
 msgid " -R\t\tUse regular expressions for search\n"
 msgstr " -R\t\tRegulären Ausdruck zur Suche verwenden\n"
 
-#: nano.c:373
+#: nano.c:370
 msgid " -V \t\tPrint version information and exit\n"
 msgstr " -V \t\tVersionsinfo ausgeben und beenden\n"
 
-#: nano.c:374
+#: nano.c:371
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr " -c \t\tCursorposition ständig anzeigen\n"
 
-#: nano.c:375
+#: nano.c:372
 msgid " -h \t\tShow this message\n"
 msgstr " -h \t\tDiese Meldung anzeigen\n"
 
-#: nano.c:377
+#: nano.c:374
 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:379
+#: nano.c:376
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr " -i \t\tNeue Zeilen automatisch einrücken\n"
 
-#: nano.c:381
+#: nano.c:378
 msgid " -l \t\tDon't follow symbolic links, overwrite.\n"
 msgstr " -l \t\tSymbolischen Links nicht folgen, sondern überschreiben\n"
 
-#: nano.c:384
+#: nano.c:381
 msgid " -m \t\tEnable mouse\n"
 msgstr " -m \t\tMaus aktivieren\n"
 
-#: nano.c:388
+#: nano.c:385
 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
 msgstr " -r [#Spalten] \tSpalten auffüllen (Zeilenumbruch bei) #Spalten\n"
 
-#: nano.c:389
+#: nano.c:386
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr " -s [Programm]  \tAlternative Rechtschreibprüfung\n"
 
-#: nano.c:390
+#: nano.c:387
 msgid " -p \t\tMake bottom 2 lines more Pico-like\n"
 msgstr " -p \t\tErscheinungsbild von Pico stärker imitieren\n"
 
-#: nano.c:391
+#: nano.c:388
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\tBeim Beenden ohne Rückfrage speichern\n"
 
-#: nano.c:392
+#: nano.c:389
 msgid " -v \t\tView (read only) mode\n"
 msgstr " -v \t\tNur zum Lesen öffnen (keine Veränderungen möglich)\n"
 
-#: nano.c:393
+#: nano.c:390
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr " -w \t\tLange Zeilen nicht in neue Zeilen umbrechen\n"
 
-#: nano.c:394
+#: nano.c:391
 msgid " -x \t\tDon't show help window\n"
 msgstr " -x \t\tHilfe-Fenster nicht anzeigen\n"
 
-#: nano.c:395
+#: nano.c:392
 msgid " -z \t\tEnable suspend\n"
 msgstr " -z \t\tSuspend (anhalten und zurück zur Shell) aktivieren\n"
 
-#: nano.c:396
+#: nano.c:393
 msgid " +LINE\t\tStart at line number LINE\n"
 msgstr " +ZEILE\t\tBei Zeile ZEILE beginnen\n"
 
-#: nano.c:403
+#: nano.c:400
 #, 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:405
+#: nano.c:402
 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:440
+#: nano.c:437
 msgid "Mark Set"
 msgstr "Markierung gesetzt"
 
-#: nano.c:445
+#: nano.c:442
 msgid "Mark UNset"
 msgstr "Markierung gelöscht"
 
-#: nano.c:882
+#: nano.c:867
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap aufgerufen mit inptr->data=\"%s\"\n"
 
-#: nano.c:933
+#: nano.c:918
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data jetzt = \"%s\"\n"
 
-#: nano.c:986
+#: nano.c:971
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Nachher, data = \"%s\"\n"
 
-#: nano.c:1056
+#: nano.c:1041
 msgid "Error deleting tempfile, ack!"
 msgstr "Konnte temporäre Datei nicht löschen"
 
-#: nano.c:1074
+#: nano.c:1059
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Konnte keine temporäre Datei erzeugen: %s"
 
-#: nano.c:1097
+#: nano.c:1082
 #, c-format
 msgid "Could not invoke spell program \"%s\""
 msgstr "Konnte Rechtschreibprogramm \"%s\" nicht aufrufen"
 
 #. Why 32512? I dont know!
-#: nano.c:1103
+#: nano.c:1088
 msgid "Could not invoke \"ispell\""
 msgstr "Konnte \"ispell\" nicht aufrufen"
 
-#: nano.c:1116
+#: nano.c:1101
 msgid "Finished checking spelling"
 msgstr "Rechtschreibprüfung abgeschlossen"
 
-#: nano.c:1134
+#: nano.c:1119
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Veränderten Puffer speichern (\"Nein\" verwirft die Änderungen) ? "
 
-#: nano.c:1257
+#: nano.c:1283
 msgid "Cannot resize top win"
 msgstr "Kann die Größe des oberen Fensters nicht verändern"
 
-#: nano.c:1259
+#: nano.c:1285
 msgid "Cannot move top win"
 msgstr "Kann oberes Fenster nicht verschieben"
 
-#: nano.c:1261
+#: nano.c:1287
 msgid "Cannot resize edit win"
 msgstr "Kann Größe des Bearbeitungsfensters nicht verändern"
 
-#: nano.c:1263
+#: nano.c:1289
 msgid "Cannot move edit win"
 msgstr "Kann Bearbeitungsfenster nicht verschieben"
 
-#: nano.c:1265
+#: nano.c:1291
 msgid "Cannot resize bottom win"
 msgstr "Kann Größe des unteren Fensters nicht verändern"
 
-#: nano.c:1267
+#: nano.c:1293
 msgid "Cannot move bottom win"
 msgstr "Kann unteres Fenster nicht verschieben"
 
-#: nano.c:1733
+#: nano.c:1850
 msgid "Main: set up windows\n"
 msgstr "Hauptprogramm: Fenster konfigurieren\n"
 
-#: nano.c:1755
+#: nano.c:1865
 msgid "Main: bottom win\n"
 msgstr "Hauptprogramm: unteres Fenster\n"
 
-#: nano.c:1761
+#: nano.c:1871
 msgid "Main: open file\n"
 msgstr "Hauptprogramm: Datei öffnen\n"
 
-#: nano.c:1829
+#: nano.c:1939
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Erhielt Alt-[-%c! (%d)\n"
 
-#: nano.c:1845
+#: nano.c:1965
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Erhielt Alt-%c! (%d)\n"
 
-#: search.c:72
+#: search.c:75
 #, 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:74
+#: search.c:77
 #, c-format
 msgid "Regexp Search%s%s"
 msgstr "Suche nach regulärem Ausdruck%s%s"
 
-#: search.c:77
+#: search.c:80
 #, c-format
 msgid "Case Sensitive Search%s%s"
 msgstr "Suche mit Unterscheidung von Groß- und Kleinschreibung%s%s"
 
-#: search.c:79
+#: search.c:82
 #, c-format
 msgid "Search%s%s"
 msgstr "Suche%s%s"
 
-#: search.c:82
+#: search.c:85
 msgid " (to replace)"
 msgstr " (zu ersetzen)"
 
-#: search.c:90
+#: search.c:93
 msgid "Search Cancelled"
 msgstr "Suche abgebrochen"
 
-#: search.c:187
+#: search.c:191
 msgid "Search Wrapped"
 msgstr "Suche in neue Zeile umgebrochen"
 
-#: search.c:241
+#: search.c:242
 #, c-format
 msgid "Replaced %d occurences"
 msgstr "%d Ersetzungen vorgenommen"
 
-#: search.c:243
+#: search.c:244
 msgid "Replaced 1 occurence"
 msgstr "1 Ersetzung vorgenommen"
 
-#: search.c:378 search.c:399 search.c:422
+#: search.c:379 search.c:400 search.c:423
 msgid "Replace Cancelled"
 msgstr "Ersetzung abgebrochen"
 
-#: search.c:395
+#: search.c:396
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Ersetzen mit [%s]"
 
 #. last_search is empty
-#: search.c:420
+#: search.c:421
 msgid "Replace with"
 msgstr "Ersetzen mit"
 
-#: search.c:461
+#: search.c:462
 msgid "Replace this instance?"
 msgstr "Ersetzen?"
 
 #. Ask for it
-#: search.c:512
+#: search.c:513
 msgid "Enter line number"
 msgstr "Zeilennummer eingeben"
 
-#: search.c:514
+#: search.c:515
 msgid "Aborted"
 msgstr "Abgebrochen"
 
-#: search.c:534
+#: search.c:535
 msgid "Come on, be reasonable"
 msgstr "Komm schon, sei vernünftig"
 
-#: search.c:539
+#: search.c:540
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Nur %d Zeilen vorhanden, springe zur letzten Zeile"
@@ -790,51 +833,51 @@ msgstr "  Datei: ..."
 msgid "Modified"
 msgstr "Verändert"
 
-#: winio.c:900
+#: winio.c:915
 #, c-format
 msgid "Moved to (%d, %d) in edit buffer\n"
 msgstr "Nach (%d, %d) im Bearbeitungspuffer verschoben\n"
 
-#: winio.c:911
+#: winio.c:926
 #, c-format
 msgid "current->data = \"%s\"\n"
 msgstr "current->data = \"%s\"\n"
 
-#: winio.c:954
+#: winio.c:969
 #, c-format
 msgid "I got \"%s\"\n"
 msgstr "Erhielt \"%s\"\n"
 
-#: winio.c:979
+#: winio.c:994
 msgid "Yes"
 msgstr "Ja"
 
-#: winio.c:981
+#: winio.c:996
 msgid "All"
 msgstr "Alle"
 
-#: winio.c:983
+#: winio.c:998
 msgid "No"
 msgstr "Nein"
 
-#: winio.c:1119
+#: winio.c:1134
 #, c-format
 msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
-#: winio.c:1123
+#: winio.c:1138
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "Zeile %d von %d (%.0f%%), Zeichen %d von %d (%.0f%%)"
 
-#: winio.c:1247
+#: winio.c:1262
 msgid "Dumping file buffer to stderr...\n"
 msgstr "Gebe Datei Puffer nach stderr aus...\n"
 
-#: winio.c:1249
+#: winio.c:1264
 msgid "Dumping cutbuffer to stderr...\n"
 msgstr "Gebe Inhalt der Zwischenablage nach stderr aus...\n"
 
-#: winio.c:1251
+#: winio.c:1266
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Gebe einen Puffer nach stderr aus...\n"
 
@@ -899,9 +942,6 @@ msgstr "Gebe einen Puffer nach stderr aus...\n"
 #~ msgid "suspend"
 #~ msgstr "suspend"
 
-#~ msgid "nowrap"
-#~ msgstr "nowrap"
-
 #~ msgid "nohelp"
 #~ msgstr "nohelp"
 
@@ -911,9 +951,6 @@ msgstr "Gebe einen Puffer nach stderr aus...\n"
 #~ msgid "cut"
 #~ msgstr "cut"
 
-#~ msgid "autoindent"
-#~ msgstr "autoindent"
-
 #~ msgid "tempfile"
 #~ msgstr "tempfile"
 
@@ -998,9 +1035,6 @@ msgstr "Gebe einen Puffer nach stderr aus...\n"
 #~ msgid "nano: realloc: out of memory!"
 #~ msgstr "nano: realloc: Kein Speicher verfügbar!"
 
-#~ msgid "Suspend"
-#~ msgstr "Suspend"
-
 #~ msgid "Suspend nano if suspend is enabled"
 #~ msgstr "nano anhalten und zur Shell zurückkehren (nur wenn aktiviert)"
 

po/es.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.13\n"
-"POT-Creation-Date: 2000-08-07 11:03-0400\n"
+"POT-Creation-Date: 2000-09-03 23:58-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"
@@ -33,7 +33,7 @@ msgstr "read_line: no estamos en la primera l
 msgid "Read %d lines"
 msgstr "%d líneas leídas"
 
-#: files.c:217 search.c:173 search.c:191
+#: files.c:217 search.c:177
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" no encontrado"
@@ -56,7 +56,7 @@ msgstr "Leyendo Fichero"
 msgid "File to insert [from ./] "
 msgstr "Fichero a insertar [desde ./] "
 
-#: files.c:273 files.c:297 files.c:487 nano.c:1147
+#: files.c:273 files.c:297 files.c:487 nano.c:1132
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -108,252 +108,291 @@ msgstr "filename es %s"
 msgid "File exists, OVERWRITE ?"
 msgstr "El fichero existe, SOBREESCRIBIR ?"
 
+#: global.c:118
+#, fuzzy
+msgid "Constant cursor position"
+msgstr " -c \t\tMostrar constantemente la posición del cursor\n"
+
 #: global.c:119
+#, fuzzy
+msgid "Auto indent"
+msgstr "Ir a Línea"
+
+#: global.c:120
+msgid "Suspend"
+msgstr ""
+
+#: global.c:121
+msgid "Help mode"
+msgstr ""
+
+#: global.c:122
+msgid "Pico messages"
+msgstr ""
+
+#: global.c:123
+msgid "Mouse support"
+msgstr ""
+
+#: global.c:124
+msgid "Cut to end"
+msgstr ""
+
+#: global.c:125
+#, fuzzy
+msgid "Regular expressions"
+msgstr " -R\t\tUsar expresiones regulares para las búsquedas\n"
+
+#: global.c:126
+msgid "Auto wrap"
+msgstr ""
+
+#: global.c:166
 msgid "Invoke the help menu"
 msgstr "Invocar el menú de ayuda"
 
-#: global.c:120
+#: global.c:167
 msgid "Write the current file to disk"
 msgstr "Escribir el fichero actual a disco"
 
-#: global.c:121
+#: global.c:168
 msgid "Exit from nano"
 msgstr "Salir de nano"
 
-#: global.c:122
+#: global.c:169
 msgid "Goto a specific line number"
 msgstr "Ir a un número de línea en concreto"
 
-#: global.c:123
+#: global.c:170
 msgid "Justify the current paragraph"
 msgstr "Justificar el párrafo actual"
 
-#: global.c:124
+#: global.c:171
 msgid "Replace text within the editor"
 msgstr "Reemplazar texto en el editor"
 
-#: global.c:125
+#: global.c:172
 msgid "Insert another file into the current one"
 msgstr "Insertar otro fichero en el actual"
 
-#: global.c:126
+#: global.c:173
 msgid "Search for text within the editor"
 msgstr "Buscar un texto en el editor"
 
-#: global.c:127
+#: global.c:174
 msgid "Move to the previous screen"
 msgstr "Moverse a la página anterior"
 
-#: global.c:128
+#: global.c:175
 msgid "Move to the next screen"
 msgstr "Moverse a la página siguiente"
 
-#: global.c:129
+#: global.c:176
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Cortar la línea actual y guardarla en el cutbuffer"
 
-#: global.c:130
+#: global.c:177
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Pegar el cutbuffer en la línea actual"
 
-#: global.c:131
+#: global.c:178
 msgid "Show the posititon of the cursor"
 msgstr "Mostrar la posición del cursor"
 
-#: global.c:132
+#: global.c:179
 msgid "Invoke the spell checker (if available)"
 msgstr "Invocar el corrector ortográfico (si está disponible)"
 
-#: global.c:133
+#: global.c:180
 msgid "Move up one line"
 msgstr "Moverse una línea hacia arriba"
 
-#: global.c:134
+#: global.c:181
 msgid "Move down one line"
 msgstr "Moverse una línea hacia abajo"
 
-#: global.c:135
+#: global.c:182
 msgid "Move forward one character"
 msgstr "Moverse hacia adelante un carácter"
 
-#: global.c:136
+#: global.c:183
 msgid "Move back one character"
 msgstr "Moverse hacia atrás un carácter"
 
-#: global.c:137
+#: global.c:184
 msgid "Move to the beginning of the current line"
 msgstr "Moverse al principio de la línea actual"
 
-#: global.c:138
+#: global.c:185
 msgid "Move to the end of the current line"
 msgstr "Moverse al final de la línea actual"
 
-#: global.c:139
+#: global.c:186
 msgid "Go to the first line of the file"
 msgstr "Ir a la primera línea del fichero"
 
-#: global.c:140
+#: global.c:187
 msgid "Go to the last line of the file"
 msgstr "Ir a la última línea del fichero"
 
-#: global.c:141
+#: global.c:188
 msgid "Refresh (redraw) the current screen"
 msgstr "Redibujar la pantalla actual"
 
-#: global.c:142
+#: global.c:189
 msgid "Mark text at the current cursor location"
 msgstr "Marcar texto en la posición actual del cursor"
 
-#: global.c:143
+#: global.c:190
 msgid "Delete the character under the cursor"
 msgstr "Borrar el carácter bajo el cursor"
 
-#: global.c:145
+#: global.c:192
 msgid "Delete the character to the left of the cursor"
 msgstr "Borrar el carácter a la izquierda del cursor"
 
-#: global.c:146
+#: global.c:193
 msgid "Insert a tab character"
 msgstr "Insertar un carácter tab"
 
-#: global.c:147
+#: global.c:194
 msgid "Insert a carriage return at the cursor position"
 msgstr "Insertar un retorno de carro en la posición del cursor"
 
-#: global.c:149
+#: global.c:196
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Hacer que la búsqueda actual sea sensible a mayúsculas"
 
-#: global.c:150
+#: global.c:197
 msgid "Cancel the current function"
 msgstr "Cancelar la función actual"
 
-#: global.c:155 global.c:265 global.c:337
+#: global.c:201 global.c:311 global.c:383
 msgid "Get Help"
 msgstr "Ver Ayuda"
 
-#: global.c:158 global.c:166
+#: global.c:204 global.c:212
 msgid "WriteOut"
 msgstr "Guardar"
 
-#: global.c:162 global.c:326
+#: global.c:208 global.c:372
 msgid "Exit"
 msgstr "Salir"
 
-#: global.c:170 global.c:261 global.c:282 global.c:301
+#: global.c:216 global.c:307 global.c:328 global.c:347
 msgid "Goto Line"
 msgstr "Ir a Línea"
 
-#: global.c:175 global.c:253
+#: global.c:221 global.c:299
 msgid "Justify"
 msgstr "Justificar"
 
-#: global.c:178 global.c:249 global.c:279
+#: global.c:224 global.c:295 global.c:325
 msgid "Replace"
 msgstr "Reemplazar"
 
-#: global.c:182
+#: global.c:228
 msgid "Read File"
 msgstr "L Fichero"
 
-#: global.c:186
+#: global.c:232
 msgid "Where Is"
 msgstr "Buscar"
 
-#: global.c:190 global.c:318
+#: global.c:236 global.c:364
 msgid "Prev Page"
 msgstr "Pag Prev"
 
-#: global.c:194 global.c:322
+#: global.c:240 global.c:368
 msgid "Next Page"
 msgstr "Pag Sig"
 
-#: global.c:198
+#: global.c:244
 msgid "Cut Text"
 msgstr "CortarTxt"
 
-#: global.c:201
+#: global.c:247
 msgid "UnCut Txt"
 msgstr "PegarTxt"
 
-#: global.c:205
+#: global.c:251
 msgid "Cur Pos"
 msgstr "Pos Act"
 
-#: global.c:209
+#: global.c:255
 msgid "To Spell"
 msgstr "Ortografía"
 
-#: global.c:213
+#: global.c:259
 msgid "Up"
 msgstr "Arriba"
 
-#: global.c:216
+#: global.c:262
 msgid "Down"
 msgstr "Abajo"
 
-#: global.c:219
+#: global.c:265
 msgid "Forward"
 msgstr "Adelante"
 
-#: global.c:222
+#: global.c:268
 msgid "Back"
 msgstr "Atrás"
 
-#: global.c:225
+#: global.c:271
 msgid "Home"
 msgstr "Inicio"
 
-#: global.c:228
+#: global.c:274
 msgid "End"
 msgstr "Fin"
 
-#: global.c:231
+#: global.c:277
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: global.c:234
+#: global.c:280
 msgid "Mark Text"
 msgstr "MarcarTxt"
 
-#: global.c:237
+#: global.c:283
 msgid "Delete"
 msgstr "Suprimir"
 
-#: global.c:241
+#: global.c:287
 msgid "Backspace"
 msgstr "Borrar"
 
-#: global.c:245
+#: global.c:291
 msgid "Tab"
 msgstr "Tab"
 
-#: global.c:256
+#: global.c:302
 msgid "Enter"
 msgstr "Enter"
 
-#: global.c:269 global.c:289 global.c:308
+#: global.c:315 global.c:335 global.c:354
 msgid "First Line"
 msgstr "Primera Línea"
 
-#: global.c:272 global.c:292 global.c:311
+#: global.c:318 global.c:338 global.c:357
 msgid "Last Line"
 msgstr "Última Línea"
 
-#: global.c:275 global.c:295
+#: global.c:321 global.c:341
 msgid "Case Sens"
 msgstr "May/Min"
 
-#: global.c:285 global.c:304 global.c:314 global.c:330 global.c:334
-#: global.c:340 winio.c:984
+#: global.c:331 global.c:350 global.c:360 global.c:376 global.c:380
+#: global.c:386 winio.c:999
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: global.c:298
+#: global.c:344
 msgid "No Replace"
 msgstr "No Reemplazar"
 
-#: nano.c:116
+#: nano.c:115
 msgid ""
 "\n"
 "Buffer written to 'nano.save'\n"
@@ -361,11 +400,12 @@ msgstr ""
 "\n"
 "Buffer escrito en 'nano.save'\n"
 
-#: nano.c:123
+#: nano.c:122
 msgid "Key illegal in VIEW mode"
 msgstr "Tecla ilegal en modo VISUALIZACIÓN"
 
-#: nano.c:163
+#: nano.c:158
+#, fuzzy
 msgid ""
 " nano help text\n"
 "\n"
@@ -378,9 +418,11 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol.  Alt-key sequences are notated with an at (@) "
-"symbol.  The following keystrokes are available in the main editor window. "
-"Optional keys are shown in parentheses:\n"
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
+"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
+"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"following keystrokes are available in the main editor window. Optional keys "
+"are shown in parentheses:\n"
 "\n"
 msgstr ""
 " texto de ayuda de nano\n"
@@ -400,15 +442,15 @@ msgstr ""
 "opcionales están representadas entre paréntesis:\n"
 "\n"
 
-#: nano.c:264
+#: nano.c:261
 msgid "free_node(): free'd a node, YAY!\n"
 msgstr "free_node(): liberado un nodo, YEAH!\n"
 
-#: nano.c:269
+#: nano.c:266
 msgid "free_node(): free'd last node.\n"
 msgstr "free_node(): liberado el último nodo.\n"
 
-#: nano.c:321
+#: nano.c:318
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
@@ -416,85 +458,85 @@ msgstr ""
 "Uso: nano [opción larga GNU] [opción] +LÍNEA <fichero>\n"
 "\n"
 
-#: nano.c:322
+#: nano.c:319
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Opcion\t\tOpcion larga\t\tSignificado\n"
 
-#: nano.c:324
+#: nano.c:321
 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:327
+#: nano.c:324
 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:331
+#: nano.c:328
 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:333
+#: nano.c:330
 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:335
+#: nano.c:332
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr " -h \t\t--help\t\t\tMostrar este mensaje\n"
 
-#: nano.c:338
+#: nano.c:335
 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:341
+#: nano.c:338
 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:343
+#: nano.c:340
 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:346
+#: nano.c:343
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr " -m \t\t--mouse\t\t\tHabilitar ratón\n"
 
-#: nano.c:351
+#: nano.c:348
 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:353
+#: nano.c:350
 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:355
+#: nano.c:352
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr " -s [prog] \t--speller=[prog]\tHabilitar corrector alternativo\n"
 
-#: nano.c:357
+#: nano.c:354
 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:359
+#: nano.c:356
 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:361
+#: nano.c:358
 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:363
+#: nano.c:360
 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:365
+#: nano.c:362
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr " -z \t\t--suspend\t\tHabilitar suspensión\n"
 
-#: nano.c:367
+#: nano.c:364
 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:369
+#: nano.c:366
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
@@ -502,260 +544,260 @@ msgstr ""
 "Uso: nano [opción] +LÍNEA <fichero>\n"
 "\n"
 
-#: nano.c:370
+#: nano.c:367
 msgid "Option\t\tMeaning\n"
 msgstr "Opción\t\tSignificado\n"
 
-#: nano.c:371
+#: nano.c:368
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr " -T [num]\tFijar el ancho de tab a num\n"
 
-#: nano.c:372
+#: nano.c:369
 msgid " -R\t\tUse regular expressions for search\n"
 msgstr " -R\t\tUsar expresiones regulares para las búsquedas\n"
 
-#: nano.c:373
+#: nano.c:370
 msgid " -V \t\tPrint version information and exit\n"
 msgstr " -V \t\tImprimir información sobre la versión y salir\n"
 
-#: nano.c:374
+#: nano.c:371
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr " -c \t\tMostrar constantemente la posición del cursor\n"
 
-#: nano.c:375
+#: nano.c:372
 msgid " -h \t\tShow this message\n"
 msgstr " -h \t\tMostrar este mensaje\n"
 
-#: nano.c:377
+#: nano.c:374
 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:379
+#: nano.c:376
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr " -v \t\tIndentar automáticamente nuevas líneas\n"
 
-#: nano.c:381
+#: nano.c:378
 msgid " -l \t\tDon't follow symbolic links, overwrite.\n"
 msgstr " -l \t\tNo seguir enlaces simbólicos, sobreescribirlos.\n"
 
-#: nano.c:384
+#: nano.c:381
 msgid " -m \t\tEnable mouse\n"
 msgstr " -m \t\tHabilitar ratón\n"
 
-#: nano.c:388
+#: nano.c:385
 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:389
+#: nano.c:386
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr " -s [prog] \tHabilitar corrector alternativo\n"
 
-#: nano.c:390
+#: nano.c:387
 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:391
+#: nano.c:388
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\tAutosalvar al salir, no preguntar\n"
 
-#: nano.c:392
+#: nano.c:389
 msgid " -v \t\tView (read only) mode\n"
 msgstr " -v \t\tModo visualización (sólo lectura)\n"
 
-#: nano.c:393
+#: nano.c:390
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr " -w \t\tNo wrapear líneas largas\n"
 
-#: nano.c:394
+#: nano.c:391
 msgid " -x \t\tDon't show help window\n"
 msgstr " -x \t\tNo mostrar la ventana de ayuda\n"
 
-#: nano.c:395
+#: nano.c:392
 msgid " -z \t\tEnable suspend\n"
 msgstr " -z \t\tHabilitar suspensión\n"
 
-#: nano.c:396
+#: nano.c:393
 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:403
+#: nano.c:400
 #, 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:405
+#: nano.c:402
 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:440
+#: nano.c:437
 msgid "Mark Set"
 msgstr "Marca Establecida"
 
-#: nano.c:445
+#: nano.c:442
 msgid "Mark UNset"
 msgstr "Marca Borrada"
 
-#: nano.c:882
+#: nano.c:867
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap llamada con inptr->data=\"%s\"\n"
 
-#: nano.c:933
+#: nano.c:918
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data ahora = \"%d\"\n"
 
-#: nano.c:986
+#: nano.c:971
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Después, data = \"%s\"\n"
 
-#: nano.c:1056
+#: nano.c:1041
 msgid "Error deleting tempfile, ack!"
 msgstr "Error borrando el fichero temporal, ouch!"
 
-#: nano.c:1074
+#: nano.c:1059
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "No pude crear un fichero temporal: %s"
 
-#: nano.c:1097
+#: nano.c:1082
 #, c-format
 msgid "Could not invoke spell program \"%s\""
 msgstr "No se pudo llamar al corrector \"%s\""
 
 #. Why 32512? I dont know!
-#: nano.c:1103
+#: nano.c:1088
 msgid "Could not invoke \"ispell\""
 msgstr "No pude llamar a \"ispell\""
 
-#: nano.c:1116
+#: nano.c:1101
 msgid "Finished checking spelling"
 msgstr "Revisión de ortografía finalizada"
 
-#: nano.c:1134
+#: nano.c:1119
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Salvar el buffer modificado (RESPONDER \"No\" DESTRUIRÁ LOS CAMBIOS) ?"
 
-#: nano.c:1257
+#: nano.c:1283
 msgid "Cannot resize top win"
 msgstr "No se puede cambiar el tamaño de la ventana superior"
 
-#: nano.c:1259
+#: nano.c:1285
 msgid "Cannot move top win"
 msgstr "No se puede mover la ventana superior"
 
-#: nano.c:1261
+#: nano.c:1287
 msgid "Cannot resize edit win"
 msgstr "No se puede cambiar el tamaño de la ventana de edición"
 
-#: nano.c:1263
+#: nano.c:1289
 msgid "Cannot move edit win"
 msgstr "No se puede mover la ventana de edición"
 
-#: nano.c:1265
+#: nano.c:1291
 msgid "Cannot resize bottom win"
 msgstr "No se puede cambiar el tamaño de la ventana inferior"
 
-#: nano.c:1267
+#: nano.c:1293
 msgid "Cannot move bottom win"
 msgstr "No se puede mover la ventana inferior"
 
-#: nano.c:1733
+#: nano.c:1850
 msgid "Main: set up windows\n"
 msgstr "Main: configurar las ventanas\n"
 
-#: nano.c:1755
+#: nano.c:1865
 msgid "Main: bottom win\n"
 msgstr "Main: ventana inferior\n"
 
-#: nano.c:1761
+#: nano.c:1871
 msgid "Main: open file\n"
 msgstr "Main: abrir fichero\n"
 
-#: nano.c:1829
+#: nano.c:1939
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Pillé Alt-[-%c! (%d)\n"
 
-#: nano.c:1845
+#: nano.c:1965
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Pillé Alt-%c! (%d)\n"
 
-#: search.c:72
+#: search.c:75
 #, c-format
 msgid "Case Sensitive Regexp Search%s%s"
 msgstr "Búsqueda con Regexp y Mayúsculas/Minúsculas%s%s"
 
-#: search.c:74
+#: search.c:77
 #, c-format
 msgid "Regexp Search%s%s"
 msgstr "Busqueda con Regexp%s%s"
 
-#: search.c:77
+#: search.c:80
 #, c-format
 msgid "Case Sensitive Search%s%s"
 msgstr "Búsqueda con Mayúsculas/Minúsculas%s%s"
 
-#: search.c:79
+#: search.c:82
 #, c-format
 msgid "Search%s%s"
 msgstr "Buscar%s%s"
 
-#: search.c:82
+#: search.c:85
 msgid " (to replace)"
 msgstr " (a reemplazar)"
 
-#: search.c:90
+#: search.c:93
 msgid "Search Cancelled"
 msgstr "Búsqueda Cancelada"
 
-#: search.c:187
+#: search.c:191
 msgid "Search Wrapped"
 msgstr "Búsqueda Recomenzada"
 
-#: search.c:241
+#: search.c:242
 #, c-format
 msgid "Replaced %d occurences"
 msgstr "%d ocurrencias reemplazadas"
 
-#: search.c:243
+#: search.c:244
 msgid "Replaced 1 occurence"
 msgstr "1 ocurrencia reemplazada"
 
-#: search.c:378 search.c:399 search.c:422
+#: search.c:379 search.c:400 search.c:423
 msgid "Replace Cancelled"
 msgstr "Reemplazar Cancelado"
 
-#: search.c:395
+#: search.c:396
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Reemplazar con [%s]"
 
 #. last_search is empty
-#: search.c:420
+#: search.c:421
 msgid "Replace with"
 msgstr "Reemplazar con"
 
-#: search.c:461
+#: search.c:462
 msgid "Replace this instance?"
 msgstr "Reemplazar esta instancia?"
 
 #. Ask for it
-#: search.c:512
+#: search.c:513
 msgid "Enter line number"
 msgstr "Introduce número de línea"
 
-#: search.c:514
+#: search.c:515
 msgid "Aborted"
 msgstr "Abortado"
 
-#: search.c:534
+#: search.c:535
 msgid "Come on, be reasonable"
 msgstr "Venga ya, se razonable"
 
-#: search.c:539
+#: search.c:540
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Sólo hay %d líneas, saltando hasta la última"
@@ -782,51 +824,51 @@ msgstr "Fichero: ..."
 msgid "Modified"
 msgstr "Modificado"
 
-#: winio.c:900
+#: winio.c:915
 #, c-format
 msgid "Moved to (%d, %d) in edit buffer\n"
 msgstr "Moviendo a (%d, %d) en buffer de edición\n"
 
-#: winio.c:911
+#: winio.c:926
 #, c-format
 msgid "current->data = \"%s\"\n"
 msgstr "current->data = \"%s\"\n"
 
-#: winio.c:954
+#: winio.c:969
 #, c-format
 msgid "I got \"%s\"\n"
 msgstr "Pillé \"%s\"\n"
 
-#: winio.c:979
+#: winio.c:994
 msgid "Yes"
 msgstr "Sí"
 
-#: winio.c:981
+#: winio.c:996
 msgid "All"
 msgstr "Todas"
 
-#: winio.c:983
+#: winio.c:998
 msgid "No"
 msgstr "No"
 
-#: winio.c:1119
+#: winio.c:1134
 #, c-format
 msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
-#: winio.c:1123
+#: winio.c:1138
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "línea %d de %d (%.0f%%), carácter %d de %d (%.0f%%)"
 
-#: winio.c:1247
+#: winio.c:1262
 msgid "Dumping file buffer to stderr...\n"
 msgstr "Volcando buffer de fichero a stderr...\n"
 
-#: winio.c:1249
+#: winio.c:1264
 msgid "Dumping cutbuffer to stderr...\n"
 msgstr "Volcando el cutbuffer a stderr...\n"
 
-#: winio.c:1251
+#: winio.c:1266
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Volcando un buffer a stderr...\n"
 

po/fi.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 0.9.11\n"
-"POT-Creation-Date: 2000-08-07 11:03-0400\n"
+"POT-Creation-Date: 2000-09-03 23:58-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"
@@ -32,7 +32,7 @@ msgstr "read_line: ei ensimm
 msgid "Read %d lines"
 msgstr "%d riviä luettu"
 
-#: files.c:217 search.c:173 search.c:191
+#: files.c:217 search.c:177
 #, c-format
 msgid "\"%s\" not found"
 msgstr "Tiedostoa \"%s\" ei ole"
@@ -55,7 +55,7 @@ msgstr "Tiedostoa luetaan"
 msgid "File to insert [from ./] "
 msgstr "Lisättävä tiedosto [hakemistossa ./]"
 
-#: files.c:273 files.c:297 files.c:487 nano.c:1147
+#: files.c:273 files.c:297 files.c:487 nano.c:1132
 msgid "Cancelled"
 msgstr "Peruttu"
 
@@ -107,252 +107,290 @@ msgstr "tiedoston nimi on %s"
 msgid "File exists, OVERWRITE ?"
 msgstr "Tiedosto on jo olemassa, korvataanko?"
 
+#: global.c:118
+#, fuzzy
+msgid "Constant cursor position"
+msgstr " -c \t\tNäytä kohdistimen sijainti jatkuvasti\n"
+
 #: global.c:119
+#, fuzzy
+msgid "Auto indent"
+msgstr "Siirry"
+
+#: global.c:120
+msgid "Suspend"
+msgstr ""
+
+#: global.c:121
+msgid "Help mode"
+msgstr ""
+
+#: global.c:122
+msgid "Pico messages"
+msgstr ""
+
+#: global.c:123
+msgid "Mouse support"
+msgstr ""
+
+#: global.c:124
+msgid "Cut to end"
+msgstr ""
+
+#: global.c:125
+msgid "Regular expressions"
+msgstr ""
+
+#: global.c:126
+msgid "Auto wrap"
+msgstr ""
+
+#: global.c:166
 msgid "Invoke the help menu"
 msgstr "Avaa ohjevalikko"
 
-#: global.c:120
+#: global.c:167
 msgid "Write the current file to disk"
 msgstr "Kirjoita nykyinen tiedosto levylle"
 
-#: global.c:121
+#: global.c:168
 msgid "Exit from nano"
 msgstr "Poistu nanosta"
 
-#: global.c:122
+#: global.c:169
 msgid "Goto a specific line number"
 msgstr "Siirry tietylle riville"
 
-#: global.c:123
+#: global.c:170
 msgid "Justify the current paragraph"
 msgstr "Tasaa nykyinen kappale"
 
-#: global.c:124
+#: global.c:171
 msgid "Replace text within the editor"
 msgstr "Etsi ja korvaa tekstiä"
 
-#: global.c:125
+#: global.c:172
 msgid "Insert another file into the current one"
 msgstr "Lisää toinen tiedosto nykyiseen tiedostoon"
 
-#: global.c:126
+#: global.c:173
 msgid "Search for text within the editor"
 msgstr "Etsi tekstiä"
 
-#: global.c:127
+#: global.c:174
 msgid "Move to the previous screen"
 msgstr "Siirry edelliseen ruutuun"
 
-#: global.c:128
+#: global.c:175
 msgid "Move to the next screen"
 msgstr "Siirry seuraavaan ruutuun"
 
-#: global.c:129
+#: global.c:176
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Leikkaa nykyinen rivi leiketilaan"
 
-#: global.c:130
+#: global.c:177
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Kopioi rivi leiketilasta nykyiselle riville"
 
-#: global.c:131
+#: global.c:178
 msgid "Show the posititon of the cursor"
 msgstr "Näytä kohdistimen sijainti"
 
-#: global.c:132
+#: global.c:179
 msgid "Invoke the spell checker (if available)"
 msgstr "Käynnistä oikoluin (jos saatavilla)"
 
-#: global.c:133
+#: global.c:180
 msgid "Move up one line"
 msgstr "Siirry yksi rivi ylöspäin"
 
-#: global.c:134
+#: global.c:181
 msgid "Move down one line"
 msgstr "Siirry yksi rivi alaspäin"
 
-#: global.c:135
+#: global.c:182
 msgid "Move forward one character"
 msgstr "Siirry yksi merkki eteenpäin"
 
-#: global.c:136
+#: global.c:183
 msgid "Move back one character"
 msgstr "Siirry yksi merkki taaksepäin"
 
-#: global.c:137
+#: global.c:184
 msgid "Move to the beginning of the current line"
 msgstr "Siirry nykyisen rivin alkuun"
 
-#: global.c:138
+#: global.c:185
 msgid "Move to the end of the current line"
 msgstr "Siirry nykyisen rivin loppuun"
 
-#: global.c:139
+#: global.c:186
 msgid "Go to the first line of the file"
 msgstr "Siirry tiedoston ensimmäiselle riville"
 
-#: global.c:140
+#: global.c:187
 msgid "Go to the last line of the file"
 msgstr "Siirry tiedoston viimeiselle riville"
 
-#: global.c:141
+#: global.c:188
 msgid "Refresh (redraw) the current screen"
 msgstr "Piirrä ruutu uudestaan"
 
-#: global.c:142
+#: global.c:189
 msgid "Mark text at the current cursor location"
 msgstr "Merkitse kohdistimen kohdalla oleva teksti"
 
-#: global.c:143
+#: global.c:190
 msgid "Delete the character under the cursor"
 msgstr "Poista kohdistimen kohdalla oleva merkki"
 
-#: global.c:145
+#: global.c:192
 msgid "Delete the character to the left of the cursor"
 msgstr "Poista kohdistimesta vasemmalle oleva merkki"
 
-#: global.c:146
+#: global.c:193
 msgid "Insert a tab character"
 msgstr "Lisää sarkainmerkki"
 
-#: global.c:147
+#: global.c:194
 msgid "Insert a carriage return at the cursor position"
 msgstr "Lisää rivinvaihto kohdistimen kohdalle"
 
-#: global.c:149
+#: global.c:196
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Muuta etsintä- tai korvaustoiminnon kirjainkoosta piittaamista."
 
-#: global.c:150
+#: global.c:197
 msgid "Cancel the current function"
 msgstr "Peru nykyinen toiminto."
 
-#: global.c:155 global.c:265 global.c:337
+#: global.c:201 global.c:311 global.c:383
 msgid "Get Help"
 msgstr "Ohjeita"
 
-#: global.c:158 global.c:166
+#: global.c:204 global.c:212
 msgid "WriteOut"
 msgstr "Kirjoita"
 
-#: global.c:162 global.c:326
+#: global.c:208 global.c:372
 msgid "Exit"
 msgstr "Lopeta"
 
-#: global.c:170 global.c:261 global.c:282 global.c:301
+#: global.c:216 global.c:307 global.c:328 global.c:347
 msgid "Goto Line"
 msgstr "Siirry"
 
-#: global.c:175 global.c:253
+#: global.c:221 global.c:299
 msgid "Justify"
 msgstr "Tasaa"
 
-#: global.c:178 global.c:249 global.c:279
+#: global.c:224 global.c:295 global.c:325
 msgid "Replace"
 msgstr "Korvaa"
 
-#: global.c:182
+#: global.c:228
 msgid "Read File"
 msgstr "Lue tied."
 
-#: global.c:186
+#: global.c:232
 msgid "Where Is"
 msgstr "Etsi"
 
-#: global.c:190 global.c:318
+#: global.c:236 global.c:364
 msgid "Prev Page"
 msgstr "Ed. sivu"
 
-#: global.c:194 global.c:322
+#: global.c:240 global.c:368
 msgid "Next Page"
 msgstr "Seur. sivu"
 
-#: global.c:198
+#: global.c:244
 msgid "Cut Text"
 msgstr "Leikkaa"
 
-#: global.c:201
+#: global.c:247
 msgid "UnCut Txt"
 msgstr "Liitä"
 
-#: global.c:205
+#: global.c:251
 msgid "Cur Pos"
 msgstr "Sijainti"
 
-#: global.c:209
+#: global.c:255
 msgid "To Spell"
 msgstr "Oikolue"
 
-#: global.c:213
+#: global.c:259
 msgid "Up"
 msgstr "Ylös"
 
-#: global.c:216
+#: global.c:262
 msgid "Down"
 msgstr "Alas"
 
-#: global.c:219
+#: global.c:265
 msgid "Forward"
 msgstr "Eteenpäin"
 
-#: global.c:222
+#: global.c:268
 msgid "Back"
 msgstr "Takaisin"
 
-#: global.c:225
+#: global.c:271
 msgid "Home"
 msgstr "Home"
 
-#: global.c:228
+#: global.c:274
 msgid "End"
 msgstr "End"
 
-#: global.c:231
+#: global.c:277
 msgid "Refresh"
 msgstr "Piirrä uudelleen"
 
-#: global.c:234
+#: global.c:280
 msgid "Mark Text"
 msgstr "Merkitse tekstiä"
 
-#: global.c:237
+#: global.c:283
 msgid "Delete"
 msgstr "Poista"
 
-#: global.c:241
+#: global.c:287
 msgid "Backspace"
 msgstr "Askelpalautin"
 
-#: global.c:245
+#: global.c:291
 msgid "Tab"
 msgstr "Sarkain"
 
-#: global.c:256
+#: global.c:302
 msgid "Enter"
 msgstr "Enter"
 
-#: global.c:269 global.c:289 global.c:308
+#: global.c:315 global.c:335 global.c:354
 msgid "First Line"
 msgstr "1. rivi"
 
-#: global.c:272 global.c:292 global.c:311
+#: global.c:318 global.c:338 global.c:357
 msgid "Last Line"
 msgstr "Viim. rivi"
 
-#: global.c:275 global.c:295
+#: global.c:321 global.c:341
 msgid "Case Sens"
 msgstr "Kirj. koko"
 
-#: global.c:285 global.c:304 global.c:314 global.c:330 global.c:334
-#: global.c:340 winio.c:984
+#: global.c:331 global.c:350 global.c:360 global.c:376 global.c:380
+#: global.c:386 winio.c:999
 msgid "Cancel"
 msgstr "Peru"
 
-#: global.c:298
+#: global.c:344
 msgid "No Replace"
 msgstr ""
 
-#: nano.c:116
+#: nano.c:115
 msgid ""
 "\n"
 "Buffer written to 'nano.save'\n"
@@ -360,11 +398,12 @@ msgstr ""
 "\n"
 "Teksti kirjoitettu tiedostoon 'nano.save'\n"
 
-#: nano.c:123
+#: nano.c:122
 msgid "Key illegal in VIEW mode"
 msgstr "Virheellinen näppäin katselutilassa"
 
-#: nano.c:163
+#: nano.c:158
+#, fuzzy
 msgid ""
 " nano help text\n"
 "\n"
@@ -377,9 +416,11 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol.  Alt-key sequences are notated with an at (@) "
-"symbol.  The following keystrokes are available in the main editor window. "
-"Optional keys are shown in parentheses:\n"
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
+"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
+"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"following keystrokes are available in the main editor window. Optional keys "
+"are shown in parentheses:\n"
 "\n"
 msgstr ""
 " nanon ohje\n"
@@ -397,103 +438,103 @@ msgstr ""
 "ovat sulkeissa:\n"
 "\n"
 
-#: nano.c:264
+#: nano.c:261
 msgid "free_node(): free'd a node, YAY!\n"
 msgstr "free_node(): node vapautettu, YAY!\n"
 
-#: nano.c:269
+#: nano.c:266
 msgid "free_node(): free'd last node.\n"
 msgstr "free_node(): viimeinen node vapautettu.\n"
 
-#: nano.c:321
+#: nano.c:318
 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:322
+#: nano.c:319
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Asetus\t\tPitkä asetus\t\tMerkitys\n"
 
-#: nano.c:324
+#: nano.c:321
 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:327
+#: nano.c:324
 msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
 msgstr ""
 
-#: nano.c:331
+#: nano.c:328
 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:333
+#: nano.c:330
 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:335
+#: nano.c:332
 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:338
+#: nano.c:335
 msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
 msgstr ""
 
-#: nano.c:341
+#: nano.c:338
 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
 msgstr " -i \t\t--autoindent\t\tSisennä uudet rivit automaattisesti\n"
 
-#: nano.c:343
+#: nano.c:340
 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:346
+#: nano.c:343
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr " -m \t\t--mouse\t\t\tKäytä hiirtä\n"
 
-#: nano.c:351
+#: nano.c:348
 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:353
+#: nano.c:350
 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:355
+#: nano.c:352
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr " -s [ohjelma] \t--speller=[ohjelma]\tKäytä annettua oikolukuohjelmaa\n"
 
-#: nano.c:357
+#: nano.c:354
 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:359
+#: nano.c:356
 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:361
+#: nano.c:358
 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:363
+#: nano.c:360
 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:365
+#: nano.c:362
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr " -z \t\t--suspend\t\tMahdollista keskeyttäminen\n"
 
-#: nano.c:367
+#: nano.c:364
 msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
 msgstr " +RIVI\t\t\t\t\tSiirry riville RIVI\n"
 
-#: nano.c:369
+#: nano.c:366
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
@@ -501,261 +542,261 @@ msgstr ""
 "Käyttö: nano [asetukset] +RIVI <tiedosto>\n"
 "\n"
 
-#: nano.c:370
+#: nano.c:367
 msgid "Option\t\tMeaning\n"
 msgstr "Asetus\t\tMerkitys\n"
 
-#: nano.c:371
+#: nano.c:368
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr " -T [leveys]\tAseta sarkaimen leveys\n"
 
-#: nano.c:372
+#: nano.c:369
 msgid " -R\t\tUse regular expressions for search\n"
 msgstr ""
 
-#: nano.c:373
+#: nano.c:370
 msgid " -V \t\tPrint version information and exit\n"
 msgstr " -V \t\tTulosta versiotiedot ja lopeta\n"
 
-#: nano.c:374
+#: nano.c:371
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr " -c \t\tNäytä kohdistimen sijainti jatkuvasti\n"
 
-#: nano.c:375
+#: nano.c:372
 msgid " -h \t\tShow this message\n"
 msgstr " -h \t\tNäytä tämä ohje\n"
 
-#: nano.c:377
+#: nano.c:374
 msgid " -k \t\tLet ^K cut from cursor to end of line\n"
 msgstr ""
 
-#: nano.c:379
+#: nano.c:376
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr " -i \t\tSisennä uudet rivit automaattisesti\n"
 
-#: nano.c:381
+#: nano.c:378
 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:384
+#: nano.c:381
 msgid " -m \t\tEnable mouse\n"
 msgstr " -m \t\tKäytä hiirtä\n"
 
-#: nano.c:388
+#: nano.c:385
 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
 msgstr " -r [#lkm] \tRivitä annettua pidemmät rivit\n"
 
-#: nano.c:389
+#: nano.c:386
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr " -s [ohjelma]  \tKäytä annettua oikolukuohjelmaa\n"
 
-#: nano.c:390
+#: nano.c:387
 msgid " -p \t\tMake bottom 2 lines more Pico-like\n"
 msgstr " -p \t\tNäytä 2 alinta riviä kuin Pico\n"
 
-#: nano.c:391
+#: nano.c:388
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\tTallenna tiedosto kysymättä poistettaessa\n"
 
-#: nano.c:392
+#: nano.c:389
 msgid " -v \t\tView (read only) mode\n"
 msgstr " -v \t\tKatselutila (vain luku)\n"
 
-#: nano.c:393
+#: nano.c:390
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr " -w \t\tÄlä rivitä pitkiä rivejä\n"
 
-#: nano.c:394
+#: nano.c:391
 msgid " -x \t\tDon't show help window\n"
 msgstr " -x \t\tÄlä näytä ohjeikkunaa\n"
 
-#: nano.c:395
+#: nano.c:392
 msgid " -z \t\tEnable suspend\n"
 msgstr " -z \t\tMahdollista keskeyttäminen\n"
 
-#: nano.c:396
+#: nano.c:393
 msgid " +LINE\t\tStart at line number LINE\n"
 msgstr " +RIVI\t\tSiirry riville RIVI\n"
 
-#: nano.c:403
+#: nano.c:400
 #, 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:405
+#: nano.c:402
 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:440
+#: nano.c:437
 msgid "Mark Set"
 msgstr "Teksti merkitty"
 
-#: nano.c:445
+#: nano.c:442
 msgid "Mark UNset"
 msgstr "Merkintä poistettu"
 
-#: nano.c:882
+#: nano.c:867
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap -funktion parametri inptr->data=\"%s\"\n"
 
-#: nano.c:933
+#: nano.c:918
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data nyt = \"%s\"\n"
 
-#: nano.c:986
+#: nano.c:971
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Jälkeenpäin, data = \"%s\"\n"
 
-#: nano.c:1056
+#: nano.c:1041
 msgid "Error deleting tempfile, ack!"
 msgstr "Väliaikaistiedostoa poistettaessa tapahtui virhe."
 
-#: nano.c:1074
+#: nano.c:1059
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Väliaikaista tiedostonnimeä ei voitu luoda: %s"
 
-#: nano.c:1097
+#: nano.c:1082
 #, c-format
 msgid "Could not invoke spell program \"%s\""
 msgstr "Oikoluinta \"%s\" ei voitu käynnistää"
 
 #. Why 32512? I dont know!
-#: nano.c:1103
+#: nano.c:1088
 msgid "Could not invoke \"ispell\""
 msgstr "\"ispell\" -ohjelmaa ei voitu käynnistää"
 
-#: nano.c:1116
+#: nano.c:1101
 msgid "Finished checking spelling"
 msgstr "Oikoluku on valmis"
 
-#: nano.c:1134
+#: nano.c:1119
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Tallenna muutettu teksti (Muutokset häviävät, jos vastaat \"ei\") ? "
 
-#: nano.c:1257
+#: nano.c:1283
 msgid "Cannot resize top win"
 msgstr "Yläikkunan kokoa ei voi muuttaa"
 
-#: nano.c:1259
+#: nano.c:1285
 msgid "Cannot move top win"
 msgstr "Yläikkunaa ei voi siirtää"
 
-#: nano.c:1261
+#: nano.c:1287
 msgid "Cannot resize edit win"
 msgstr "Muokkausikkunan kokoa ei voi muuttaa"
 
-#: nano.c:1263
+#: nano.c:1289
 msgid "Cannot move edit win"
 msgstr "Muokkausikkunaa ei voi siirtää"
 
-#: nano.c:1265
+#: nano.c:1291
 msgid "Cannot resize bottom win"
 msgstr "Alaikkunan kokoa ei voi muuttaa"
 
-#: nano.c:1267
+#: nano.c:1293
 msgid "Cannot move bottom win"
 msgstr "Alaikkunaa ei voi siirtää"
 
-#: nano.c:1733
+#: nano.c:1850
 msgid "Main: set up windows\n"
 msgstr "Päätila: ikkunoiden asettelu\n"
 
-#: nano.c:1755
+#: nano.c:1865
 msgid "Main: bottom win\n"
 msgstr "Päätila: alaikkuna\n"
 
-#: nano.c:1761
+#: nano.c:1871
 msgid "Main: open file\n"
 msgstr "Päätila: avaa tiedosto\n"
 
-#: nano.c:1829
+#: nano.c:1939
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Vastaanotettu Alt-[-%c! (%d)\n"
 
-#: nano.c:1845
+#: nano.c:1965
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Vastaanotettu Alt-%c! (%d)\n"
 
-#: search.c:72
+#: search.c:75
 #, fuzzy, c-format
 msgid "Case Sensitive Regexp Search%s%s"
 msgstr "Kirjainkoosta välittävä etsintä%s%s"
 
-#: search.c:74
+#: search.c:77
 #, fuzzy, c-format
 msgid "Regexp Search%s%s"
 msgstr "Etsintä%s%s"
 
-#: search.c:77
+#: search.c:80
 #, fuzzy, c-format
 msgid "Case Sensitive Search%s%s"
 msgstr "Kirjainkoosta välittävä etsintä%s%s"
 
-#: search.c:79
+#: search.c:82
 #, fuzzy, c-format
 msgid "Search%s%s"
 msgstr "Etsintä%s%s"
 
-#: search.c:82
+#: search.c:85
 #, fuzzy
 msgid " (to replace)"
 msgstr " (korvaa)"
 
-#: search.c:90
+#: search.c:93
 msgid "Search Cancelled"
 msgstr "Etsintä peruttu"
 
-#: search.c:187
+#: search.c:191
 msgid "Search Wrapped"
 msgstr "Etsintä jatkuu"
 
-#: search.c:241
+#: search.c:242
 #, c-format
 msgid "Replaced %d occurences"
 msgstr "%d kohtaa korvattu"
 
-#: search.c:243
+#: search.c:244
 msgid "Replaced 1 occurence"
 msgstr "1 kohta korvattu"
 
-#: search.c:378 search.c:399 search.c:422
+#: search.c:379 search.c:400 search.c:423
 msgid "Replace Cancelled"
 msgstr "Korvaus peruttu"
 
-#: search.c:395
+#: search.c:396
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Korvaa merkkijonolla [%s]"
 
 #. last_search is empty
-#: search.c:420
+#: search.c:421
 msgid "Replace with"
 msgstr "Korvaa merkkijonolla"
 
-#: search.c:461
+#: search.c:462
 msgid "Replace this instance?"
 msgstr "Korvataanko tämä kohta?"
 
 #. Ask for it
-#: search.c:512
+#: search.c:513
 msgid "Enter line number"
 msgstr "Kirjoita rivin numero"
 
-#: search.c:514
+#: search.c:515
 msgid "Aborted"
 msgstr "Keskeytetty"
 
-#: search.c:534
+#: search.c:535
 msgid "Come on, be reasonable"
 msgstr "Jotakin järkevää, kiitos?"
 
-#: search.c:539
+#: search.c:540
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Vain %d riviä olemassa, siirrytään viimeiselle riville"
@@ -782,51 +823,51 @@ msgstr "  Tiedosto: ..."
 msgid "Modified"
 msgstr "Muokattu"
 
-#: winio.c:900
+#: winio.c:915
 #, c-format
 msgid "Moved to (%d, %d) in edit buffer\n"
 msgstr "Kohtaan (%d,%d) siirrytty muokkausruudussa\n"
 
-#: winio.c:911
+#: winio.c:926
 #, c-format
 msgid "current->data = \"%s\"\n"
 msgstr "current->data = \"%s\"\n"
 
-#: winio.c:954
+#: winio.c:969
 #, c-format
 msgid "I got \"%s\"\n"
 msgstr "Saatiin \"%s\"\n"
 
-#: winio.c:979
+#: winio.c:994
 msgid "Yes"
 msgstr "Kyllä"
 
-#: winio.c:981
+#: winio.c:996
 msgid "All"
 msgstr "Kaikki"
 
-#: winio.c:983
+#: winio.c:998
 msgid "No"
 msgstr "Ei"
 
-#: winio.c:1119
+#: winio.c:1134
 #, c-format
 msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
-#: winio.c:1123
+#: winio.c:1138
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "rivi %d/%d (%.0f%%), merkki %d/%d (%.0f%%)"
 
-#: winio.c:1247
+#: winio.c:1262
 msgid "Dumping file buffer to stderr...\n"
 msgstr "Syötetään tiedosto stderriin...\n"
 
-#: winio.c:1249
+#: winio.c:1264
 msgid "Dumping cutbuffer to stderr...\n"
 msgstr "Syötetään leiketila stderriin...\n"
 
-#: winio.c:1251
+#: winio.c:1266
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Syötetään teksti stderriin...\n"
 

po/fr.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.8.9\n"
-"POT-Creation-Date: 2000-08-07 11:03-0400\n"
+"POT-Creation-Date: 2000-09-03 23:58-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"
@@ -35,7 +35,7 @@ msgstr ""
 msgid "Read %d lines"
 msgstr "%d lignes lues"
 
-#: files.c:217 search.c:173 search.c:191
+#: files.c:217 search.c:177
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" non trouvé"
@@ -58,7 +58,7 @@ msgstr "Lecture du fichier"
 msgid "File to insert [from ./] "
 msgstr "Fichier à insérer [depuis ./] "
 
-#: files.c:273 files.c:297 files.c:487 nano.c:1147
+#: files.c:273 files.c:297 files.c:487 nano.c:1132
 msgid "Cancelled"
 msgstr "Annulé"
 
@@ -110,257 +110,296 @@ msgstr "Le nom du fichier est %s"
 msgid "File exists, OVERWRITE ?"
 msgstr "Fichier existant, écrire par-dessus ?"
 
+#: global.c:118
+#, fuzzy
+msgid "Constant cursor position"
+msgstr " -c \t\tAfficher constamment la position du curseur\n"
+
 #: global.c:119
+#, fuzzy
+msgid "Auto indent"
+msgstr "-> ligne"
+
+#: global.c:120
+msgid "Suspend"
+msgstr ""
+
+#: global.c:121
+msgid "Help mode"
+msgstr ""
+
+#: global.c:122
+msgid "Pico messages"
+msgstr ""
+
+#: global.c:123
+msgid "Mouse support"
+msgstr ""
+
+#: global.c:124
+msgid "Cut to end"
+msgstr ""
+
+#: global.c:125
+#, fuzzy
+msgid "Regular expressions"
+msgstr "-R\t\tUtilisation des expressions régulières pour la recherche\n"
+
+#: global.c:126
+msgid "Auto wrap"
+msgstr ""
+
+#: global.c:166
 msgid "Invoke the help menu"
 msgstr "Appelle le menu d'aide"
 
-#: global.c:120
+#: global.c:167
 msgid "Write the current file to disk"
 msgstr "Ecrit le fichier en cours sur le disque"
 
-#: global.c:121
+#: global.c:168
 msgid "Exit from nano"
 msgstr "Quitte Nano"
 
-#: global.c:122
+#: global.c:169
 #, fuzzy
 msgid "Goto a specific line number"
 msgstr "Entrer le numéro de ligne"
 
-#: global.c:123
+#: global.c:170
 msgid "Justify the current paragraph"
 msgstr "Justifie le paragraphe courant"
 
-#: global.c:124
+#: global.c:171
 msgid "Replace text within the editor"
 msgstr "Remplace le texte dans l'éditeur"
 
-#: global.c:125
+#: global.c:172
 msgid "Insert another file into the current one"
 msgstr "Insère un autre fichier dans le fichier courant"
 
-#: global.c:126
+#: global.c:173
 msgid "Search for text within the editor"
 msgstr "Recherche d'une chaîne dans l'éditeur"
 
-#: global.c:127
+#: global.c:174
 msgid "Move to the previous screen"
 msgstr "Retourne a l'écran précèdent"
 
-#: global.c:128
+#: global.c:175
 msgid "Move to the next screen"
 msgstr "Aller au prochain écran"
 
-#: global.c:129
+#: global.c:176
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Supprime la ligne courante et la stocke en mémoire"
 
-#: global.c:130
+#: global.c:177
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Copie la chaîne en mémoire vers la ligne courante"
 
-#: global.c:131
+#: global.c:178
 msgid "Show the posititon of the cursor"
 msgstr "Affiche la position du curseur"
 
-#: global.c:132
+#: global.c:179
 msgid "Invoke the spell checker (if available)"
 msgstr "Appel du correcteur orthographique (s'il est disponible)"
 
-#: global.c:133
+#: global.c:180
 msgid "Move up one line"
 msgstr "Déplace d'une ligne vers le haut"
 
-#: global.c:134
+#: global.c:181
 msgid "Move down one line"
 msgstr "Déplace d'une ligne vers le bas"
 
-#: global.c:135
+#: global.c:182
 msgid "Move forward one character"
 msgstr "Déplace d'un caractère en avant"
 
-#: global.c:136
+#: global.c:183
 msgid "Move back one character"
 msgstr "Déplace d'un caractère en arriere"
 
-#: global.c:137
+#: global.c:184
 msgid "Move to the beginning of the current line"
 msgstr "Déplace vers le début de la ligne courante"
 
-#: global.c:138
+#: global.c:185
 msgid "Move to the end of the current line"
 msgstr "Déplace vers la fin de la ligne courante"
 
-#: global.c:139
+#: global.c:186
 msgid "Go to the first line of the file"
 msgstr "Va à la première ligne du fichier"
 
-#: global.c:140
+#: global.c:187
 msgid "Go to the last line of the file"
 msgstr "Va à la dernière ligne du fichier"
 
-#: global.c:141
+#: global.c:188
 msgid "Refresh (redraw) the current screen"
 msgstr "Rafraichit (redessine) l'ecran courant"
 
-#: global.c:142
+#: global.c:189
 msgid "Mark text at the current cursor location"
 msgstr "Marquer le texte à la position actuelle du curseur"
 
-#: global.c:143
+#: global.c:190
 msgid "Delete the character under the cursor"
 msgstr "Supprime le caractère où se trouve le curseur"
 
-#: global.c:145
+#: global.c:192
 msgid "Delete the character to the left of the cursor"
 msgstr "Supprime le caractère à la gauche du curseur"
 
-#: global.c:146
+#: global.c:193
 msgid "Insert a tab character"
 msgstr "Insère une tabulation"
 
-#: global.c:147
+#: global.c:194
 msgid "Insert a carriage return at the cursor position"
 msgstr "Insère un retour-chariot à la position du curseur"
 
-#: global.c:149
+#: global.c:196
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Exécuter rechercher/remplacer avec/sans rspect de la casse"
 
-#: global.c:150
+#: global.c:197
 msgid "Cancel the current function"
 msgstr "Annule la fonction courante"
 
-#: global.c:155 global.c:265 global.c:337
+#: global.c:201 global.c:311 global.c:383
 msgid "Get Help"
 msgstr "Appelle l'aide"
 
-#: global.c:158 global.c:166
+#: global.c:204 global.c:212
 msgid "WriteOut"
 msgstr "Sauvegarde"
 
-#: global.c:162 global.c:326
+#: global.c:208 global.c:372
 msgid "Exit"
 msgstr "Quitte"
 
-#: global.c:170 global.c:261 global.c:282 global.c:301
+#: global.c:216 global.c:307 global.c:328 global.c:347
 msgid "Goto Line"
 msgstr "-> ligne"
 
-#: global.c:175 global.c:253
+#: global.c:221 global.c:299
 msgid "Justify"
 msgstr "Justifier"
 
-#: global.c:178 global.c:249 global.c:279
+#: global.c:224 global.c:295 global.c:325
 #, fuzzy
 msgid "Replace"
 msgstr "Remplacer par"
 
-#: global.c:182
+#: global.c:228
 #, fuzzy
 msgid "Read File"
 msgstr "Lect. fichier"
 
-#: global.c:186
+#: global.c:232
 msgid "Where Is"
 msgstr "Recherche"
 
-#: global.c:190 global.c:318
+#: global.c:236 global.c:364
 msgid "Prev Page"
 msgstr "Page préc."
 
-#: global.c:194 global.c:322
+#: global.c:240 global.c:368
 msgid "Next Page"
 msgstr "Page suiv."
 
-#: global.c:198
+#: global.c:244
 msgid "Cut Text"
 msgstr "Couper"
 
-#: global.c:201
+#: global.c:247
 msgid "UnCut Txt"
 msgstr "Annul. Coup"
 
-#: global.c:205
+#: global.c:251
 msgid "Cur Pos"
 msgstr "Pos. curseur"
 
-#: global.c:209
+#: global.c:255
 msgid "To Spell"
 msgstr "Corriger"
 
-#: global.c:213
+#: global.c:259
 msgid "Up"
 msgstr "Haut"
 
-#: global.c:216
+#: global.c:262
 msgid "Down"
 msgstr "Bas"
 
-#: global.c:219
+#: global.c:265
 msgid "Forward"
 msgstr "En avant"
 
-#: global.c:222
+#: global.c:268
 msgid "Back"
 msgstr "En arrière"
 
-#: global.c:225
+#: global.c:271
 msgid "Home"
 msgstr "Debut Doc."
 
-#: global.c:228
+#: global.c:274
 msgid "End"
 msgstr "Fin Doc0"
 
-#: global.c:231
+#: global.c:277
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: global.c:234
+#: global.c:280
 #, fuzzy
 msgid "Mark Text"
 msgstr "Marque enregistrée"
 
-#: global.c:237
+#: global.c:283
 msgid "Delete"
 msgstr "Supprimer"
 
-#: global.c:241
+#: global.c:287
 msgid "Backspace"
 msgstr "Backspace"
 
 # No translation...
-#: global.c:245
+#: global.c:291
 msgid "Tab"
 msgstr "Tabulation"
 
-#: global.c:256
+#: global.c:302
 msgid "Enter"
 msgstr "Entrée"
 
-#: global.c:269 global.c:289 global.c:308
+#: global.c:315 global.c:335 global.c:354
 msgid "First Line"
 msgstr "Première ligne"
 
-#: global.c:272 global.c:292 global.c:311
+#: global.c:318 global.c:338 global.c:357
 msgid "Last Line"
 msgstr "Dernière Ligne"
 
-#: global.c:275 global.c:295
+#: global.c:321 global.c:341
 msgid "Case Sens"
 msgstr "Casse respectée"
 
-#: global.c:285 global.c:304 global.c:314 global.c:330 global.c:334
-#: global.c:340 winio.c:984
+#: global.c:331 global.c:350 global.c:360 global.c:376 global.c:380
+#: global.c:386 winio.c:999
 msgid "Cancel"
 msgstr "Annuler"
 
-#: global.c:298
+#: global.c:344
 msgid "No Replace"
 msgstr "Pas de remplacement"
 
-#: nano.c:116
+#: nano.c:115
 msgid ""
 "\n"
 "Buffer written to 'nano.save'\n"
@@ -368,11 +407,12 @@ msgstr ""
 "\n"
 "Buffer écrit dans 'nano.save'\n"
 
-#: nano.c:123
+#: nano.c:122
 msgid "Key illegal in VIEW mode"
 msgstr "Touche illégale en mode VISUALISATION"
 
-#: nano.c:163
+#: nano.c:158
+#, fuzzy
 msgid ""
 " nano help text\n"
 "\n"
@@ -385,9 +425,11 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol.  Alt-key sequences are notated with an at (@) "
-"symbol.  The following keystrokes are available in the main editor window. "
-"Optional keys are shown in parentheses:\n"
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
+"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
+"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"following keystrokes are available in the main editor window. Optional keys "
+"are shown in parentheses:\n"
 "\n"
 msgstr ""
 "Message d'aide de Nano\n"
@@ -406,15 +448,15 @@ msgstr ""
 "entre parenthèses :\n"
 "\n"
 
-#: nano.c:264
+#: nano.c:261
 msgid "free_node(): free'd a node, YAY!\n"
 msgstr "free_node(): libération d'un noeud, OUAIS!\n"
 
-#: nano.c:269
+#: nano.c:266
 msgid "free_node(): free'd last node.\n"
 msgstr "free_node(): libération du dernier noeud \n"
 
-#: nano.c:321
+#: nano.c:318
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
@@ -422,95 +464,95 @@ msgstr ""
 "Utilisation: nano [option longue GNU] [option] +LIGNE <fichier>\n"
 "\n"
 
-#: nano.c:322
+#: nano.c:319
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Option\t\tOption Longue\t\tSignification\n"
 
-#: nano.c:324
+#: nano.c:321
 msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n"
 msgstr ""
 "-T \t\t--tabsize=[num]\t\tDefini la profondeur d'une tabulation à num\n"
 
-#: nano.c:327
+#: nano.c:324
 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:331
+#: nano.c:328
 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:333
+#: nano.c:330
 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:335
+#: nano.c:332
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr " -h \t\t--help\t\t\tAfficher ce message\n"
 
-#: nano.c:338
+#: nano.c:335
 msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
 msgstr ""
 
-#: nano.c:341
+#: nano.c:338
 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:343
+#: nano.c:340
 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:346
+#: nano.c:343
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr " -m \t\t--mouse\t\t\tActiver le support souris\n"
 
-#: nano.c:351
+#: nano.c:348
 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:353
+#: nano.c:350
 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:355
+#: nano.c:352
 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:357
+#: nano.c:354
 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:359
+#: nano.c:356
 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:361
+#: nano.c:358
 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:363
+#: nano.c:360
 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:365
+#: nano.c:362
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr " -z \t\t--suspend\t\tAutoriser la suspension\n"
 
-#: nano.c:367
+#: nano.c:364
 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:369
+#: nano.c:366
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
@@ -518,263 +560,263 @@ msgstr ""
 "Utilisation: nano [option] +LIGNE <fichier>\n"
 "\n"
 
-#: nano.c:370
+#: nano.c:367
 msgid "Option\t\tMeaning\n"
 msgstr "Option\t\tSignification\n"
 
-#: nano.c:371
+#: nano.c:368
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr "-T [num]\tDéfini la pronfondeur de tabulation à num\n"
 
-#: nano.c:372
+#: nano.c:369
 msgid " -R\t\tUse regular expressions for search\n"
 msgstr "-R\t\tUtilisation des expressions régulières pour la recherche\n"
 
-#: nano.c:373
+#: nano.c:370
 msgid " -V \t\tPrint version information and exit\n"
 msgstr " -V \t\tAfficher les informations de version et sortir\n"
 
-#: nano.c:374
+#: nano.c:371
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr " -c \t\tAfficher constamment la position du curseur\n"
 
-#: nano.c:375
+#: nano.c:372
 msgid " -h \t\tShow this message\n"
 msgstr " -h \t\tAfficher ce message\n"
 
-#: nano.c:377
+#: nano.c:374
 msgid " -k \t\tLet ^K cut from cursor to end of line\n"
 msgstr ""
 
-#: nano.c:379
+#: nano.c:376
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr " -i \t\tIndenter automatiquement les nouvelles lignes\n"
 
-#: nano.c:381
+#: nano.c:378
 msgid " -l \t\tDon't follow symbolic links, overwrite.\n"
 msgstr "-l \t\tNe pas suivre les liens symboliques. Outrepasse à l'écriture\n"
 
-#: nano.c:384
+#: nano.c:381
 msgid " -m \t\tEnable mouse\n"
 msgstr " -m \t\tActiver la souris\n"
 
-#: nano.c:388
+#: nano.c:385
 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:389
+#: nano.c:386
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr " -s [prog]  \tActiver un vérificateur orthographique alternatif\n"
 
-#: nano.c:390
+#: nano.c:387
 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:391
+#: nano.c:388
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\tSauver automatiquement à la sortie, sans demander\n"
 
-#: nano.c:392
+#: nano.c:389
 msgid " -v \t\tView (read only) mode\n"
 msgstr " -v \t\tMode Visualisation seule (lecture seule)\n"
 
-#: nano.c:393
+#: nano.c:390
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr " -w \t\tNe pas couper les lignes longues\n"
 
-#: nano.c:394
+#: nano.c:391
 msgid " -x \t\tDon't show help window\n"
 msgstr " -x \t\tNe pas afficher la fenêtre d'aide\n"
 
-#: nano.c:395
+#: nano.c:392
 msgid " -z \t\tEnable suspend\n"
 msgstr " -z \t\tAutoriser la suspension\n"
 
-#: nano.c:396
+#: nano.c:393
 msgid " +LINE\t\tStart at line number LINE\n"
 msgstr " +LIGNE\t\tDémarrer à la ligne LIGNE\n"
 
-#: nano.c:403
+#: nano.c:400
 #, 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:405
+#: nano.c:402
 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:440
+#: nano.c:437
 msgid "Mark Set"
 msgstr "Marque enregistrée"
 
-#: nano.c:445
+#: nano.c:442
 msgid "Mark UNset"
 msgstr "Marque effacée"
 
-#: nano.c:882
+#: nano.c:867
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap appelée avec inptr->data=\"%s\"\n"
 
-#: nano.c:933
+#: nano.c:918
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data vaut maintenant \"%s\"\n"
 
-#: nano.c:986
+#: nano.c:971
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Après, data = \"%s\"\n"
 
-#: nano.c:1056
+#: nano.c:1041
 msgid "Error deleting tempfile, ack!"
 msgstr "Erreur lors de l'effacement du fichier temporaire, zut!"
 
-#: nano.c:1074
+#: nano.c:1059
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Impossible de créer un nom de fichier temporaire: %s"
 
-#: nano.c:1097
+#: nano.c:1082
 #, c-format
 msgid "Could not invoke spell program \"%s\""
 msgstr "Impossible d'invoquer le programme spell \"%s\""
 
 #. Why 32512? I dont know!
-#: nano.c:1103
+#: nano.c:1088
 msgid "Could not invoke \"ispell\""
 msgstr "Impossible d'invoquer \"ispell\""
 
-#: nano.c:1116
+#: nano.c:1101
 msgid "Finished checking spelling"
 msgstr "Vérification orthographique terminée"
 
-#: nano.c:1134
+#: nano.c:1119
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Sauver le buffer modifié (RÉPONDRE \"No\" EFFACERA LES CHANGEMENTS"
 
-#: nano.c:1257
+#: nano.c:1283
 msgid "Cannot resize top win"
 msgstr "Impossible de redimensionner la fenêtre du haut"
 
-#: nano.c:1259
+#: nano.c:1285
 msgid "Cannot move top win"
 msgstr "Impossible de bouger la fenêtre du haut"
 
-#: nano.c:1261
+#: nano.c:1287
 msgid "Cannot resize edit win"
 msgstr "Impossible de redimensionner la fenêtre d'édition"
 
-#: nano.c:1263
+#: nano.c:1289
 msgid "Cannot move edit win"
 msgstr "Impossible de bouger la fenêtre d'édition"
 
-#: nano.c:1265
+#: nano.c:1291
 msgid "Cannot resize bottom win"
 msgstr "Impossible de redimensionner la fenêtre du bas"
 
-#: nano.c:1267
+#: nano.c:1293
 msgid "Cannot move bottom win"
 msgstr "Impossible de bouger la fenêtre du bas"
 
-#: nano.c:1733
+#: nano.c:1850
 msgid "Main: set up windows\n"
 msgstr "Main: configuration des fenêtres\n"
 
-#: nano.c:1755
+#: nano.c:1865
 msgid "Main: bottom win\n"
 msgstr "Main: fenêtre du bas\n"
 
-#: nano.c:1761
+#: nano.c:1871
 msgid "Main: open file\n"
 msgstr "Main: ouvrir fichier\n"
 
-#: nano.c:1829
+#: nano.c:1939
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "J'ai reçu Alt-[-%c! (%d)\n"
 
-#: nano.c:1845
+#: nano.c:1965
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "J'ai reçu Alt-%c! (%d)\n"
 
-#: search.c:72
+#: search.c:75
 #, fuzzy, c-format
 msgid "Case Sensitive Regexp Search%s%s"
 msgstr "Recherche sensible ) la casse%s%s"
 
-#: search.c:74
+#: search.c:77
 #, fuzzy, c-format
 msgid "Regexp Search%s%s"
 msgstr "Recherche Regexp%s%s"
 
-#: search.c:77
+#: search.c:80
 #, fuzzy, c-format
 msgid "Case Sensitive Search%s%s"
 msgstr "Recherche sensible ) la casse%s%s"
 
-#: search.c:79
+#: search.c:82
 #, fuzzy, c-format
 msgid "Search%s%s"
 msgstr "Recherche%s%s"
 
-#: search.c:82
+#: search.c:85
 #, fuzzy
 msgid " (to replace)"
 msgstr " (remplacer par)"
 
-#: search.c:90
+#: search.c:93
 msgid "Search Cancelled"
 msgstr "Recherche annulée"
 
-#: search.c:187
+#: search.c:191
 msgid "Search Wrapped"
 msgstr "La recherche a bouclé"
 
-#: search.c:241
+#: search.c:242
 #, c-format
 msgid "Replaced %d occurences"
 msgstr "%d occurences remplacées"
 
-#: search.c:243
+#: search.c:244
 msgid "Replaced 1 occurence"
 msgstr "1 occurence remplacée"
 
-#: search.c:378 search.c:399 search.c:422
+#: search.c:379 search.c:400 search.c:423
 msgid "Replace Cancelled"
 msgstr "Remplacement annulé"
 
-#: search.c:395
+#: search.c:396
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Remplacer par [%s]"
 
 #. last_search is empty
-#: search.c:420
+#: search.c:421
 msgid "Replace with"
 msgstr "Rempacer par"
 
-#: search.c:461
+#: search.c:462
 msgid "Replace this instance?"
 msgstr "Remplacer cette occurence?"
 
 #. Ask for it
-#: search.c:512
+#: search.c:513
 msgid "Enter line number"
 msgstr "Entrer le numéro de ligne"
 
-#: search.c:514
+#: search.c:515
 msgid "Aborted"
 msgstr "Annulé"
 
-#: search.c:534
+#: search.c:535
 msgid "Come on, be reasonable"
 msgstr "Allez, soyez raisonnable"
 
-#: search.c:539
+#: search.c:540
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Seulement %d lignes sont disponibles, saut jusqu'à la dernière ligne"
@@ -801,51 +843,51 @@ msgstr "  Fichier: ..."
 msgid "Modified"
 msgstr "Modifié"
 
-#: winio.c:900
+#: winio.c:915
 #, c-format
 msgid "Moved to (%d, %d) in edit buffer\n"
 msgstr "Déplacement jusqu'à (%d, %d) dans le buffer d'édition\n"
 
-#: winio.c:911
+#: winio.c:926
 #, c-format
 msgid "current->data = \"%s\"\n"
 msgstr "current->data = \"%s\"\n"
 
-#: winio.c:954
+#: winio.c:969
 #, c-format
 msgid "I got \"%s\"\n"
 msgstr "J'ai reçu \"%s\"\n"
 
-#: winio.c:979
+#: winio.c:994
 msgid "Yes"
 msgstr "Oui"
 
-#: winio.c:981
+#: winio.c:996
 msgid "All"
 msgstr "Tous"
 
-#: winio.c:983
+#: winio.c:998
 msgid "No"
 msgstr "Non"
 
-#: winio.c:1119
+#: winio.c:1134
 #, c-format
 msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
-#: winio.c:1123
+#: winio.c:1138
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "ligne %d sur %d (%.0f%%), caractère %d sur %d (%.0f%%)"
 
-#: winio.c:1247
+#: winio.c:1262
 msgid "Dumping file buffer to stderr...\n"
 msgstr "Envoi du buffer fichier sur stderr...\n"
 
-#: winio.c:1249
+#: winio.c:1264
 msgid "Dumping cutbuffer to stderr...\n"
 msgstr "Envoi du cutbuffer sur stderr...\n"
 
-#: winio.c:1251
+#: winio.c:1266
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Envoi d'un buffer sur stderr...\n"
 

po/id.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano-0.9.10\n"
-"POT-Creation-Date: 2000-08-07 11:03-0400\n"
+"POT-Creation-Date: 2000-09-03 23:58-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"
@@ -32,7 +32,7 @@ msgstr "read_line: tidak di baris pertama dan sebelumnya adalah NULL"
 msgid "Read %d lines"
 msgstr "Membaca %d baris"
 
-#: files.c:217 search.c:173 search.c:191
+#: files.c:217 search.c:177
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" tidak ditemukan"
@@ -55,7 +55,7 @@ msgstr "Membaca File"
 msgid "File to insert [from ./] "
 msgstr "File untuk disisipkan "
 
-#: files.c:273 files.c:297 files.c:487 nano.c:1147
+#: files.c:273 files.c:297 files.c:487 nano.c:1132
 msgid "Cancelled"
 msgstr "Dibatalkan"
 
@@ -107,253 +107,291 @@ msgstr "Namafile adalah %s"
 msgid "File exists, OVERWRITE ?"
 msgstr "File ada, DITIMPA ?"
 
+#: global.c:118
+#, fuzzy
+msgid "Constant cursor position"
+msgstr "-c     Menampilkan posisi kursor secara konstan\n"
+
 #: global.c:119
+#, fuzzy
+msgid "Auto indent"
+msgstr "Ke baris"
+
+#: global.c:120
+msgid "Suspend"
+msgstr ""
+
+#: global.c:121
+msgid "Help mode"
+msgstr ""
+
+#: global.c:122
+msgid "Pico messages"
+msgstr ""
+
+#: global.c:123
+msgid "Mouse support"
+msgstr ""
+
+#: global.c:124
+msgid "Cut to end"
+msgstr ""
+
+#: global.c:125
+msgid "Regular expressions"
+msgstr ""
+
+#: global.c:126
+msgid "Auto wrap"
+msgstr ""
+
+#: global.c:166
 msgid "Invoke the help menu"
 msgstr "Panggil menu bantuan"
 
-#: global.c:120
+#: global.c:167
 msgid "Write the current file to disk"
 msgstr "Tulis file ini ke disk"
 
-#: global.c:121
+#: global.c:168
 msgid "Exit from nano"
 msgstr "Keluar dari nano"
 
-#: global.c:122
+#: global.c:169
 msgid "Goto a specific line number"
 msgstr "Ke nomor baris tertentu"
 
-#: global.c:123
+#: global.c:170
 msgid "Justify the current paragraph"
 msgstr "Justifikasi paragraf ini"
 
-#: global.c:124
+#: global.c:171
 msgid "Replace text within the editor"
 msgstr "Ganti teks dalam editor"
 
-#: global.c:125
+#: global.c:172
 msgid "Insert another file into the current one"
 msgstr "Sertakan file lain ke file ini"
 
-#: global.c:126
+#: global.c:173
 msgid "Search for text within the editor"
 msgstr "Cari teks dalam editor"
 
-#: global.c:127
+#: global.c:174
 msgid "Move to the previous screen"
 msgstr "Pindah ke layar sebelumnya"
 
-#: global.c:128
+#: global.c:175
 msgid "Move to the next screen"
 msgstr "Pindah ke layar berikut"
 
-#: global.c:129
+#: global.c:176
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Hapus baris saat ini dan taruh dalam cutbuffer"
 
-#: global.c:130
+#: global.c:177
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Kembalikan dari cutbuffer ke baris ini"
 
-#: global.c:131
+#: global.c:178
 msgid "Show the posititon of the cursor"
 msgstr "Tampilkan posisi kursor"
 
-#: global.c:132
+#: global.c:179
 msgid "Invoke the spell checker (if available)"
 msgstr "Panggil spell checker (jika ada)"
 
-#: global.c:133
+#: global.c:180
 msgid "Move up one line"
 msgstr "Naik satu baris"
 
-#: global.c:134
+#: global.c:181
 msgid "Move down one line"
 msgstr "Turun satu baris"
 
-#: global.c:135
+#: global.c:182
 msgid "Move forward one character"
 msgstr "Pindah satu karakter ke depan"
 
-#: global.c:136
+#: global.c:183
 msgid "Move back one character"
 msgstr "Pindah satu karakter ke belakang"
 
-#: global.c:137
+#: global.c:184
 msgid "Move to the beginning of the current line"
 msgstr "Pindah ke awal baris ini"
 
-#: global.c:138
+#: global.c:185
 msgid "Move to the end of the current line"
 msgstr "Pindah ke akhir baris ini"
 
-#: global.c:139
+#: global.c:186
 msgid "Go to the first line of the file"
 msgstr "Ke baris terawal file"
 
-#: global.c:140
+#: global.c:187
 msgid "Go to the last line of the file"
 msgstr "Ke baris terakhir file"
 
-#: global.c:141
+#: global.c:188
 msgid "Refresh (redraw) the current screen"
 msgstr "Refresh layar saat ini"
 
-#: global.c:142
+#: global.c:189
 msgid "Mark text at the current cursor location"
 msgstr "Tandai teks pada lokasi kursor saat ini"
 
-#: global.c:143
+#: global.c:190
 msgid "Delete the character under the cursor"
 msgstr "Hapus karakter pada kursor"
 
-#: global.c:145
+#: global.c:192
 msgid "Delete the character to the left of the cursor"
 msgstr "Hapus satu karakter di kiri kursor"
 
-#: global.c:146
+#: global.c:193
 msgid "Insert a tab character"
 msgstr "Masukkan karakter tab"
 
-#: global.c:147
+#: global.c:194
 msgid "Insert a carriage return at the cursor position"
 msgstr "Sertakan carriage return di posisi kursor"
 
-#: global.c:149
+#: global.c:196
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Jadikan pencarian/penggantian saat ini case (in)sensitive"
 
-#: global.c:150
+#: global.c:197
 msgid "Cancel the current function"
 msgstr "Batalkan fungsi ini"
 
-#: global.c:155 global.c:265 global.c:337
+#: global.c:201 global.c:311 global.c:383
 msgid "Get Help"
 msgstr "Cari Bantuan"
 
-#: global.c:158 global.c:166
+#: global.c:204 global.c:212
 msgid "WriteOut"
 msgstr "Tulis"
 
-#: global.c:162 global.c:326
+#: global.c:208 global.c:372
 #, fuzzy
 msgid "Exit"
 msgstr "Keluar"
 
-#: global.c:170 global.c:261 global.c:282 global.c:301
+#: global.c:216 global.c:307 global.c:328 global.c:347
 msgid "Goto Line"
 msgstr "Ke baris"
 
-#: global.c:175 global.c:253
+#: global.c:221 global.c:299
 msgid "Justify"
 msgstr "Justifikasi"
 
-#: global.c:178 global.c:249 global.c:279
+#: global.c:224 global.c:295 global.c:325
 msgid "Replace"
 msgstr "Ganti"
 
-#: global.c:182
+#: global.c:228
 msgid "Read File"
 msgstr "Baca File"
 
-#: global.c:186
+#: global.c:232
 msgid "Where Is"
 msgstr "Di mana"
 
-#: global.c:190 global.c:318
+#: global.c:236 global.c:364
 msgid "Prev Page"
 msgstr "Halaman sebelumnya"
 
-#: global.c:194 global.c:322
+#: global.c:240 global.c:368
 msgid "Next Page"
 msgstr "Halaman berikutnya"
 
-#: global.c:198
+#: global.c:244
 msgid "Cut Text"
 msgstr "Potong Teks"
 
-#: global.c:201
+#: global.c:247
 msgid "UnCut Txt"
 msgstr "UnCut Teks"
 
-#: global.c:205
+#: global.c:251
 msgid "Cur Pos"
 msgstr "Pos Kursor"
 
-#: global.c:209
+#: global.c:255
 msgid "To Spell"
 msgstr "Mengeja"
 
-#: global.c:213
+#: global.c:259
 msgid "Up"
 msgstr "Naik"
 
-#: global.c:216
+#: global.c:262
 msgid "Down"
 msgstr "Turun"
 
-#: global.c:219
+#: global.c:265
 msgid "Forward"
 msgstr "Depan"
 
-#: global.c:222
+#: global.c:268
 msgid "Back"
 msgstr "Belakang"
 
-#: global.c:225
+#: global.c:271
 msgid "Home"
 msgstr "Awal"
 
-#: global.c:228
+#: global.c:274
 msgid "End"
 msgstr "Akhir"
 
-#: global.c:231
+#: global.c:277
 msgid "Refresh"
 msgstr "Refresh"
 
-#: global.c:234
+#: global.c:280
 msgid "Mark Text"
 msgstr "Tandai Teks"
 
-#: global.c:237
+#: global.c:283
 msgid "Delete"
 msgstr "Hapus"
 
-#: global.c:241
+#: global.c:287
 msgid "Backspace"
 msgstr "Backspace"
 
-#: global.c:245
+#: global.c:291
 msgid "Tab"
 msgstr "Tab"
 
-#: global.c:256
+#: global.c:302
 msgid "Enter"
 msgstr "Enter"
 
-#: global.c:269 global.c:289 global.c:308
+#: global.c:315 global.c:335 global.c:354
 msgid "First Line"
 msgstr "Baris pertama"
 
-#: global.c:272 global.c:292 global.c:311
+#: global.c:318 global.c:338 global.c:357
 msgid "Last Line"
 msgstr "Baris terakhir"
 
-#: global.c:275 global.c:295
+#: global.c:321 global.c:341
 msgid "Case Sens"
 msgstr "Case Sens"
 
-#: global.c:285 global.c:304 global.c:314 global.c:330 global.c:334
-#: global.c:340 winio.c:984
+#: global.c:331 global.c:350 global.c:360 global.c:376 global.c:380
+#: global.c:386 winio.c:999
 msgid "Cancel"
 msgstr "Batal"
 
-#: global.c:298
+#: global.c:344
 msgid "No Replace"
 msgstr ""
 
-#: nano.c:116
+#: nano.c:115
 msgid ""
 "\n"
 "Buffer written to 'nano.save'\n"
@@ -361,11 +399,12 @@ msgstr ""
 "\n"
 "Buffer ditulis ke 'nano.save'\n"
 
-#: nano.c:123
+#: nano.c:122
 msgid "Key illegal in VIEW mode"
 msgstr "Kunci ilegal dalam mode VIEW"
 
-#: nano.c:163
+#: nano.c:158
+#, fuzzy
 msgid ""
 " nano help text\n"
 "\n"
@@ -378,9 +417,11 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol.  Alt-key sequences are notated with an at (@) "
-"symbol.  The following keystrokes are available in the main editor window. "
-"Optional keys are shown in parentheses:\n"
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
+"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
+"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"following keystrokes are available in the main editor window. Optional keys "
+"are shown in parentheses:\n"
 "\n"
 msgstr ""
 "bantuan nano\n"
@@ -400,99 +441,99 @@ msgstr ""
 "Kunci-kunci opsional ditunjukkan dalam kurung:\n"
 "\n"
 
-#: nano.c:264
+#: nano.c:261
 msgid "free_node(): free'd a node, YAY!\n"
 msgstr "free_node(): bebaskan sebuah node, YAY!\n"
 
-#: nano.c:269
+#: nano.c:266
 msgid "free_node(): free'd last node.\n"
 msgstr "free_node(): bebaskan node terakhir.\n"
 
-#: nano.c:321
+#: nano.c:318
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
 msgstr "Pemakaian: nano [GNU long option] [option] +LINE <file>\n"
 
-#: nano.c:322
+#: nano.c:319
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Option: Long option     Arti\n"
 
-#: nano.c:324
+#: nano.c:321
 msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n"
 msgstr ""
 
-#: nano.c:327
+#: nano.c:324
 msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
 msgstr ""
 
-#: nano.c:331
+#: nano.c:328
 msgid " -V \t\t--version\t\tPrint version information and exit\n"
 msgstr "-V      --version       Tampilkan versi dan keluar\n"
 
-#: nano.c:333
+#: nano.c:330
 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
 msgstr "-c      --const         Menampilkan posisi kursor secara konstan\n"
 
-#: nano.c:335
+#: nano.c:332
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr "-h      --help          Tampilkan pesan ini\n"
 
-#: nano.c:338
+#: nano.c:335
 msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
 msgstr ""
 
-#: nano.c:341
+#: nano.c:338
 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
 msgstr "-i      --autoindent    Indentasi baris barus secara otomatis\n"
 
-#: nano.c:343
+#: nano.c:340
 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n"
 msgstr "-l      --nofollow      Jangan ikuti link simbolik, timpa.\n"
 
-#: nano.c:346
+#: nano.c:343
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr "-m      --mouse         Aktifkan mouse\n"
 
-#: nano.c:351
+#: nano.c:348
 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:353
+#: nano.c:350
 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:355
+#: nano.c:352
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr "-s [prog]       --speller=[prog]        Aktifkan speller alternatif\n"
 
-#: nano.c:357
+#: nano.c:354
 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:359
+#: nano.c:356
 msgid " -v \t\t--view\t\t\tView (read only) mode\n"
 msgstr "-v      --view  Mode Tampil (baca saja)\n"
 
-#: nano.c:361
+#: nano.c:358
 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
 msgstr "-w      --nowrap        Jangan wrap baris panjang\n"
 
-#: nano.c:363
+#: nano.c:360
 msgid " -x \t\t--nohelp\t\tDon't show help window\n"
 msgstr "-x      --nohelp        Jangan tampilkan jendela bantuan\n"
 
-#: nano.c:365
+#: nano.c:362
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr "-z      --suspend       Aktifkan suspend\n"
 
-#: nano.c:367
+#: nano.c:364
 msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
 msgstr "+LINE                   Mulai pada nomor baris LINE\n"
 
-#: nano.c:369
+#: nano.c:366
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
@@ -500,261 +541,261 @@ msgstr ""
 "Pemakaian: nano [option] +LINE <file>\n"
 "\n"
 
-#: nano.c:370
+#: nano.c:367
 msgid "Option\t\tMeaning\n"
 msgstr "Option          Arti\n"
 
-#: nano.c:371
+#: nano.c:368
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr " -T [num]\tGanti lebar tabulasi manjadi num\n"
 
-#: nano.c:372
+#: nano.c:369
 msgid " -R\t\tUse regular expressions for search\n"
 msgstr ""
 
-#: nano.c:373
+#: nano.c:370
 msgid " -V \t\tPrint version information and exit\n"
 msgstr "-V     Tampilkan informasi versi dan keluar\n"
 
-#: nano.c:374
+#: nano.c:371
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr "-c     Menampilkan posisi kursor secara konstan\n"
 
-#: nano.c:375
+#: nano.c:372
 msgid " -h \t\tShow this message\n"
 msgstr "-h     Tampilkan pesan ini\n"
 
-#: nano.c:377
+#: nano.c:374
 msgid " -k \t\tLet ^K cut from cursor to end of line\n"
 msgstr ""
 
-#: nano.c:379
+#: nano.c:376
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr "-i     Indent baris barus secara otomatis\n"
 
-#: nano.c:381
+#: nano.c:378
 msgid " -l \t\tDon't follow symbolic links, overwrite.\n"
 msgstr "-l     Jangan ikuti link simbolik, timpa.\n"
 
-#: nano.c:384
+#: nano.c:381
 msgid " -m \t\tEnable mouse\n"
 msgstr "-m     Aktifkan mouse\n"
 
-#: nano.c:388
+#: nano.c:385
 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:389
+#: nano.c:386
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr "-s [prog]    Aktifkan speller alternatif\n"
 
-#: nano.c:390
+#: nano.c:387
 msgid " -p \t\tMake bottom 2 lines more Pico-like\n"
 msgstr "-p     Buat dua baris terbawah seperti Pico\n"
 
-#: nano.c:391
+#: nano.c:388
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr "-t     Autosave saat keluar, jangan minta konfirmasi.\n"
 
-#: nano.c:392
+#: nano.c:389
 msgid " -v \t\tView (read only) mode\n"
 msgstr "-v     Mode Tampil (baca saja)\n"
 
-#: nano.c:393
+#: nano.c:390
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr "-w     Jangan wrap baris panjang\n"
 
-#: nano.c:394
+#: nano.c:391
 msgid " -x \t\tDon't show help window\n"
 msgstr "-x     Jangan tampilkan jendela bantuan\n"
 
-#: nano.c:395
+#: nano.c:392
 msgid " -z \t\tEnable suspend\n"
 msgstr "-z     Aktifkan suspend\n"
 
-#: nano.c:396
+#: nano.c:393
 msgid " +LINE\t\tStart at line number LINE\n"
 msgstr "+LINE    Mulai pada nomor baris LINE\n"
 
-#: nano.c:403
+#: nano.c:400
 #, 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:405
+#: nano.c:402
 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:440
+#: nano.c:437
 msgid "Mark Set"
 msgstr "Set Tanda"
 
-#: nano.c:445
+#: nano.c:442
 msgid "Mark UNset"
 msgstr "Unset Tanda"
 
-#: nano.c:882
+#: nano.c:867
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap dipanggil dengan inptr->data=\"%s\"\n"
 
-#: nano.c:933
+#: nano.c:918
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data sekarang =\"%s\"\n"
 
-#: nano.c:986
+#: nano.c:971
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Setelah, data= \"%s\"\n"
 
-#: nano.c:1056
+#: nano.c:1041
 msgid "Error deleting tempfile, ack!"
 msgstr "Kesalahan menghapus tempfile, ack!"
 
-#: nano.c:1074
+#: nano.c:1059
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Tidak dapat membuat nama file sementara: %s"
 
-#: nano.c:1097
+#: nano.c:1082
 #, c-format
 msgid "Could not invoke spell program \"%s\""
 msgstr "Tidak dapat memanggil program ejaan \"%s\""
 
 #. Why 32512? I dont know!
-#: nano.c:1103
+#: nano.c:1088
 msgid "Could not invoke \"ispell\""
 msgstr "Tidak dapat memanggil \"ispell\""
 
-#: nano.c:1116
+#: nano.c:1101
 msgid "Finished checking spelling"
 msgstr "Selesai memeriksa ejaan"
 
-#: nano.c:1134
+#: nano.c:1119
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Simpan buffer termodifikasi (JAWAB \"No\" AKAN MENGHAPUS PERUBAHAN) ?"
 
-#: nano.c:1257
+#: nano.c:1283
 msgid "Cannot resize top win"
 msgstr "Tidak dapat menganti ukuran jendela atas"
 
-#: nano.c:1259
+#: nano.c:1285
 msgid "Cannot move top win"
 msgstr "Tidak dapat memindahkan jendela atas"
 
-#: nano.c:1261
+#: nano.c:1287
 msgid "Cannot resize edit win"
 msgstr "Tidak dapat mengganti ukuran jendela edit"
 
-#: nano.c:1263
+#: nano.c:1289
 msgid "Cannot move edit win"
 msgstr "Tidak dapat memindah jendela edit"
 
-#: nano.c:1265
+#: nano.c:1291
 msgid "Cannot resize bottom win"
 msgstr "Tidak dapat mengganti ukuran jendela bawah"
 
-#: nano.c:1267
+#: nano.c:1293
 msgid "Cannot move bottom win"
 msgstr "Tidak dapat memindah jendela bawah"
 
-#: nano.c:1733
+#: nano.c:1850
 msgid "Main: set up windows\n"
 msgstr "Main: menset jendela\n"
 
-#: nano.c:1755
+#: nano.c:1865
 msgid "Main: bottom win\n"
 msgstr "Main: jendela bawah\n"
 
-#: nano.c:1761
+#: nano.c:1871
 msgid "Main: open file\n"
 msgstr "Main: membuka file\n"
 
-#: nano.c:1829
+#: nano.c:1939
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Saya mendapat Alt-%c! (%d)\n"
 
-#: nano.c:1845
+#: nano.c:1965
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Saya mendapat Alt-%c! (%d)\n"
 
-#: search.c:72
+#: search.c:75
 #, fuzzy, c-format
 msgid "Case Sensitive Regexp Search%s%s"
 msgstr "Pencarian case sensitif%s%s"
 
-#: search.c:74
+#: search.c:77
 #, fuzzy, c-format
 msgid "Regexp Search%s%s"
 msgstr "Pencarian%s%s"
 
-#: search.c:77
+#: search.c:80
 #, fuzzy, c-format
 msgid "Case Sensitive Search%s%s"
 msgstr "Pencarian case sensitif%s%s"
 
-#: search.c:79
+#: search.c:82
 #, fuzzy, c-format
 msgid "Search%s%s"
 msgstr "Pencarian%s%s"
 
-#: search.c:82
+#: search.c:85
 #, fuzzy
 msgid " (to replace)"
 msgstr " (ganti)"
 
-#: search.c:90
+#: search.c:93
 msgid "Search Cancelled"
 msgstr "Batalkan pencarian"
 
-#: search.c:187
+#: search.c:191
 msgid "Search Wrapped"
 msgstr "Pancarian diulangi dari awal"
 
-#: search.c:241
+#: search.c:242
 #, c-format
 msgid "Replaced %d occurences"
 msgstr "%d tempat terganti"
 
-#: search.c:243
+#: search.c:244
 msgid "Replaced 1 occurence"
 msgstr "Terganti 1 tempat"
 
-#: search.c:378 search.c:399 search.c:422
+#: search.c:379 search.c:400 search.c:423
 msgid "Replace Cancelled"
 msgstr "Batalkan penggantian"
 
-#: search.c:395
+#: search.c:396
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Ganti dengan [%s]"
 
 #. last_search is empty
-#: search.c:420
+#: search.c:421
 msgid "Replace with"
 msgstr "Ganti dengan"
 
-#: search.c:461
+#: search.c:462
 msgid "Replace this instance?"
 msgstr "Ganti kata ini?"
 
 #. Ask for it
-#: search.c:512
+#: search.c:513
 msgid "Enter line number"
 msgstr "Masukkan nomor baris"
 
-#: search.c:514
+#: search.c:515
 msgid "Aborted"
 msgstr "Dibatalkan"
 
-#: search.c:534
+#: search.c:535
 msgid "Come on, be reasonable"
 msgstr "Ayo, yang masuk akal"
 
-#: search.c:539
+#: search.c:540
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Hanya %d baris tersedia, melompat ke baris akhir"
@@ -781,51 +822,51 @@ msgstr " File: ..."
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: winio.c:900
+#: winio.c:915
 #, c-format
 msgid "Moved to (%d, %d) in edit buffer\n"
 msgstr "Pindah ke (%d, %d) dalam buffer edit\n"
 
-#: winio.c:911
+#: winio.c:926
 #, c-format
 msgid "current->data = \"%s\"\n"
 msgstr "current->data = \"%s\"\n"
 
-#: winio.c:954
+#: winio.c:969
 #, c-format
 msgid "I got \"%s\"\n"
 msgstr "Saya mendapat \"%s\"\n"
 
-#: winio.c:979
+#: winio.c:994
 msgid "Yes"
 msgstr "Ya"
 
-#: winio.c:981
+#: winio.c:996
 msgid "All"
 msgstr "Semua"
 
-#: winio.c:983
+#: winio.c:998
 msgid "No"
 msgstr "Tidak"
 
-#: winio.c:1119
+#: winio.c:1134
 #, c-format
 msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
-#: winio.c:1123
+#: winio.c:1138
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "baris %d dari %d (%f.0f%%), karakter %d dari %d (%.0f%%)"
 
-#: winio.c:1247
+#: winio.c:1262
 msgid "Dumping file buffer to stderr...\n"
 msgstr "Kirim buffer file ke stderr...\n"
 
-#: winio.c:1249
+#: winio.c:1264
 msgid "Dumping cutbuffer to stderr...\n"
 msgstr "Kirim cutbuffer ke stderr...\n"
 
-#: winio.c:1251
+#: winio.c:1266
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Kirim buffer ke stderr...\n"
 

po/it.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.8.7\n"
-"POT-Creation-Date: 2000-08-07 11:03-0400\n"
+"POT-Creation-Date: 2000-09-03 23:58-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"
@@ -32,7 +32,7 @@ msgstr "read_line: no estamos en la primera l
 msgid "Read %d lines"
 msgstr "Leggi %d linee"
 
-#: files.c:217 search.c:173 search.c:191
+#: files.c:217 search.c:177
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" non trovato"
@@ -55,7 +55,7 @@ msgstr "Lettura file"
 msgid "File to insert [from ./] "
 msgstr "File da inserire [da ./] "
 
-#: files.c:273 files.c:297 files.c:487 nano.c:1147
+#: files.c:273 files.c:297 files.c:487 nano.c:1132
 msgid "Cancelled"
 msgstr "Cancellato"
 
@@ -107,252 +107,291 @@ msgstr "Il nome file
 msgid "File exists, OVERWRITE ?"
 msgstr "File esistente, SOVRASCRIVERE?"
 
+#: global.c:118
+#, fuzzy
+msgid "Constant cursor position"
+msgstr " -c \t\tMostra sempre la posizione del cursore\n"
+
 #: global.c:119
+#, fuzzy
+msgid "Auto indent"
+msgstr "Vai alla linea"
+
+#: global.c:120
+#, fuzzy
+msgid "Suspend"
+msgstr "Sospendi"
+
+#: global.c:121
+msgid "Help mode"
+msgstr ""
+
+#: global.c:122
+msgid "Pico messages"
+msgstr ""
+
+#: global.c:123
+msgid "Mouse support"
+msgstr ""
+
+#: global.c:124
+msgid "Cut to end"
+msgstr ""
+
+#: global.c:125
+msgid "Regular expressions"
+msgstr ""
+
+#: global.c:126
+msgid "Auto wrap"
+msgstr ""
+
+#: global.c:166
 msgid "Invoke the help menu"
 msgstr "Invoca menu aiuti"
 
-#: global.c:120
+#: global.c:167
 msgid "Write the current file to disk"
 msgstr "Salva il file corrente sul disco"
 
-#: global.c:121
+#: global.c:168
 msgid "Exit from nano"
 msgstr "Esci da nano"
 
-#: global.c:122
+#: global.c:169
 msgid "Goto a specific line number"
 msgstr "Vai ad un numero linea specifico"
 
-#: global.c:123
+#: global.c:170
 msgid "Justify the current paragraph"
 msgstr "Giustifica il paragrafo corrente"
 
-#: global.c:124
+#: global.c:171
 msgid "Replace text within the editor"
 msgstr "Sostituisci testo senza editor"
 
-#: global.c:125
+#: global.c:172
 msgid "Insert another file into the current one"
 msgstr "Inserisci un file dentro il corrente"
 
-#: global.c:126
+#: global.c:173
 msgid "Search for text within the editor"
 msgstr "Cerca testo senza editor"
 
-#: global.c:127
+#: global.c:174
 msgid "Move to the previous screen"
 msgstr "Vai alla schermata precedente"
 
-#: global.c:128
+#: global.c:175
 msgid "Move to the next screen"
 msgstr "Vai alla schermata successiva"
 
-#: global.c:129
+#: global.c:176
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Taglia la linea corrente e memorizzala nel cutbuffer"
 
-#: global.c:130
+#: global.c:177
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Uncut dal cutbuffer dentro la linea corrente"
 
-#: global.c:131
+#: global.c:178
 msgid "Show the posititon of the cursor"
 msgstr "Mostra la posizione del cursore"
 
-#: global.c:132
+#: global.c:179
 msgid "Invoke the spell checker (if available)"
 msgstr "Invocar el corrector ortográfico (si está disponible)"
 
-#: global.c:133
+#: global.c:180
 msgid "Move up one line"
 msgstr "Sposta in alto una linea"
 
-#: global.c:134
+#: global.c:181
 msgid "Move down one line"
 msgstr "Sposta in basso una linea"
 
-#: global.c:135
+#: global.c:182
 msgid "Move forward one character"
 msgstr "Sposta avanti un carattere"
 
-#: global.c:136
+#: global.c:183
 msgid "Move back one character"
 msgstr "Sposta indietro un carattere"
 
-#: global.c:137
+#: global.c:184
 msgid "Move to the beginning of the current line"
 msgstr "Sposta all'inizio della linea corrente"
 
-#: global.c:138
+#: global.c:185
 msgid "Move to the end of the current line"
 msgstr "Sposta alla fine delle linea corrente"
 
-#: global.c:139
+#: global.c:186
 msgid "Go to the first line of the file"
 msgstr "Vai alla prima linea del file"
 
-#: global.c:140
+#: global.c:187
 msgid "Go to the last line of the file"
 msgstr "Vai all'ultima linea del file"
 
-#: global.c:141
+#: global.c:188
 msgid "Refresh (redraw) the current screen"
 msgstr "Aggiorna la schermata corrente"
 
-#: global.c:142
+#: global.c:189
 msgid "Mark text at the current cursor location"
 msgstr "Marca testo nella posizione corrente del cursore"
 
-#: global.c:143
+#: global.c:190
 msgid "Delete the character under the cursor"
 msgstr "Elimina i caratteri sotto il cursore"
 
-#: global.c:145
+#: global.c:192
 msgid "Delete the character to the left of the cursor"
 msgstr "Elimina i caratteri a sinistra del cursore"
 
-#: global.c:146
+#: global.c:193
 msgid "Insert a tab character"
 msgstr "Inserisci un carattere tab"
 
-#: global.c:147
+#: global.c:194
 msgid "Insert a carriage return at the cursor position"
 msgstr "Inserisci un ritorno a capo alla posizione del cursore"
 
-#: global.c:149
+#: global.c:196
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Ricerca/Sostituisci con case (in)sensitive"
 
-#: global.c:150
+#: global.c:197
 msgid "Cancel the current function"
 msgstr "Cancella la funzione corrente"
 
-#: global.c:155 global.c:265 global.c:337
+#: global.c:201 global.c:311 global.c:383
 msgid "Get Help"
 msgstr "Aiuto"
 
-#: global.c:158 global.c:166
+#: global.c:204 global.c:212
 msgid "WriteOut"
 msgstr "Sovrascrivi"
 
-#: global.c:162 global.c:326
+#: global.c:208 global.c:372
 msgid "Exit"
 msgstr "Esci"
 
-#: global.c:170 global.c:261 global.c:282 global.c:301
+#: global.c:216 global.c:307 global.c:328 global.c:347
 msgid "Goto Line"
 msgstr "Vai alla linea"
 
-#: global.c:175 global.c:253
+#: global.c:221 global.c:299
 msgid "Justify"
 msgstr "Giustifica"
 
-#: global.c:178 global.c:249 global.c:279
+#: global.c:224 global.c:295 global.c:325
 msgid "Replace"
 msgstr "Sostituisci"
 
-#: global.c:182
+#: global.c:228
 msgid "Read File"
 msgstr "Leggi file"
 
-#: global.c:186
+#: global.c:232
 msgid "Where Is"
 msgstr "Dov'è"
 
-#: global.c:190 global.c:318
+#: global.c:236 global.c:364
 msgid "Prev Page"
 msgstr "Pag Prec"
 
-#: global.c:194 global.c:322
+#: global.c:240 global.c:368
 msgid "Next Page"
 msgstr "Pag Seg"
 
-#: global.c:198
+#: global.c:244
 msgid "Cut Text"
 msgstr "Taglia"
 
-#: global.c:201
+#: global.c:247
 msgid "UnCut Txt"
 msgstr "UnCut Txt"
 
-#: global.c:205
+#: global.c:251
 msgid "Cur Pos"
 msgstr "Posizione"
 
-#: global.c:209
+#: global.c:255
 msgid "To Spell"
 msgstr "Ortografia"
 
-#: global.c:213
+#: global.c:259
 msgid "Up"
 msgstr "Alza"
 
-#: global.c:216
+#: global.c:262
 msgid "Down"
 msgstr "Abbassa"
 
-#: global.c:219
+#: global.c:265
 msgid "Forward"
 msgstr "Avanti"
 
-#: global.c:222
+#: global.c:268
 msgid "Back"
 msgstr "Indietro"
 
-#: global.c:225
+#: global.c:271
 msgid "Home"
 msgstr "Inizio"
 
-#: global.c:228
+#: global.c:274
 msgid "End"
 msgstr "Fine"
 
-#: global.c:231
+#: global.c:277
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: global.c:234
+#: global.c:280
 msgid "Mark Text"
 msgstr "Marca testo"
 
-#: global.c:237
+#: global.c:283
 msgid "Delete"
 msgstr "Elimina"
 
-#: global.c:241
+#: global.c:287
 msgid "Backspace"
 msgstr "Backspace"
 
-#: global.c:245
+#: global.c:291
 msgid "Tab"
 msgstr "Tab"
 
-#: global.c:256
+#: global.c:302
 msgid "Enter"
 msgstr "Invio"
 
-#: global.c:269 global.c:289 global.c:308
+#: global.c:315 global.c:335 global.c:354
 msgid "First Line"
 msgstr "Prima linea"
 
-#: global.c:272 global.c:292 global.c:311
+#: global.c:318 global.c:338 global.c:357
 msgid "Last Line"
 msgstr "Ultima linea"
 
-#: global.c:275 global.c:295
+#: global.c:321 global.c:341
 msgid "Case Sens"
 msgstr "Case sens"
 
-#: global.c:285 global.c:304 global.c:314 global.c:330 global.c:334
-#: global.c:340 winio.c:984
+#: global.c:331 global.c:350 global.c:360 global.c:376 global.c:380
+#: global.c:386 winio.c:999
 msgid "Cancel"
 msgstr "Cancella"
 
-#: global.c:298
+#: global.c:344
 msgid "No Replace"
 msgstr ""
 
-#: nano.c:116
+#: nano.c:115
 msgid ""
 "\n"
 "Buffer written to 'nano.save'\n"
@@ -360,11 +399,11 @@ msgstr ""
 "\n"
 "Buffer scritto su 'nano.save'\n"
 
-#: nano.c:123
+#: nano.c:122
 msgid "Key illegal in VIEW mode"
 msgstr "Chiave illegale nella modalità VISTA"
 
-#: nano.c:163
+#: nano.c:158
 msgid ""
 " nano help text\n"
 "\n"
@@ -377,21 +416,23 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol.  Alt-key sequences are notated with an at (@) "
-"symbol.  The following keystrokes are available in the main editor window. "
-"Optional keys are shown in parentheses:\n"
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
+"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
+"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"following keystrokes are available in the main editor window. Optional keys "
+"are shown in parentheses:\n"
 "\n"
 msgstr ""
 
-#: nano.c:264
+#: nano.c:261
 msgid "free_node(): free'd a node, YAY!\n"
 msgstr "free_node(): liberado un nodo, YEAH!\n"
 
-#: nano.c:269
+#: nano.c:266
 msgid "free_node(): free'd last node.\n"
 msgstr "free_node(): liberado el último nodo.\n"
 
-#: nano.c:321
+#: nano.c:318
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
@@ -399,85 +440,85 @@ msgstr ""
 "Utilizzo: nano [GNU opzioni lunghe] [opzioni] +LINEA <file>\n"
 "\n"
 
-#: nano.c:322
+#: nano.c:319
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Opzioni\t\tLunghe opzioni\t\tSignificato\n"
 
-#: nano.c:324
+#: nano.c:321
 msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n"
 msgstr ""
 
-#: nano.c:327
+#: nano.c:324
 msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
 msgstr ""
 
-#: nano.c:331
+#: nano.c:328
 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:333
+#: nano.c:330
 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:335
+#: nano.c:332
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr " -h \t\t--help\t\t\tMostra questo messaggio\n"
 
-#: nano.c:338
+#: nano.c:335
 msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
 msgstr ""
 
-#: nano.c:341
+#: nano.c:338
 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:343
+#: nano.c:340
 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n"
 msgstr ""
 
-#: nano.c:346
+#: nano.c:343
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr " -m \t\t--mouse\t\t\tAttiva mouse\n"
 
-#: nano.c:351
+#: nano.c:348
 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:353
+#: nano.c:350
 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:355
+#: nano.c:352
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr " -s [prog] \t--speller=[prog]\tAttiva correttore alternativo\n"
 
-#: nano.c:357
+#: nano.c:354
 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:359
+#: nano.c:356
 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:361
+#: nano.c:358
 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:363
+#: nano.c:360
 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:365
+#: nano.c:362
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr " -z \t\t--suspend\t\tAbilita sospensione\n"
 
-#: nano.c:367
+#: nano.c:364
 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:369
+#: nano.c:366
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
@@ -485,263 +526,263 @@ msgstr ""
 "Uso: nano [opzioni] +LINEA <file>\n"
 "\n"
 
-#: nano.c:370
+#: nano.c:367
 msgid "Option\t\tMeaning\n"
 msgstr "Opzioni\t\tSignificato\n"
 
-#: nano.c:371
+#: nano.c:368
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr ""
 
-#: nano.c:372
+#: nano.c:369
 msgid " -R\t\tUse regular expressions for search\n"
 msgstr ""
 
-#: nano.c:373
+#: nano.c:370
 msgid " -V \t\tPrint version information and exit\n"
 msgstr " -V \t\tStampa informazioni sulla versione ed esci\n"
 
-#: nano.c:374
+#: nano.c:371
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr " -c \t\tMostra sempre la posizione del cursore\n"
 
-#: nano.c:375
+#: nano.c:372
 msgid " -h \t\tShow this message\n"
 msgstr " -h \t\tMostra questo messaggio\n"
 
-#: nano.c:377
+#: nano.c:374
 msgid " -k \t\tLet ^K cut from cursor to end of line\n"
 msgstr ""
 
-#: nano.c:379
+#: nano.c:376
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr " -v \t\tIndentazione automatica nuove linee\n"
 
-#: nano.c:381
+#: nano.c:378
 msgid " -l \t\tDon't follow symbolic links, overwrite.\n"
 msgstr " -l \t\tNon seguire i link simbolici, sovrascrivi.\n"
 
-#: nano.c:384
+#: nano.c:381
 msgid " -m \t\tEnable mouse\n"
 msgstr " -m \t\tAttiva mouse\n"
 
-#: nano.c:388
+#: nano.c:385
 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
 msgstr " -r [#cols] \tRiempimento colonne (interrompi linee a) #cols\n"
 
-#: nano.c:389
+#: nano.c:386
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr " -s [prog] \tAttiva correttore alternativo\n"
 
-#: nano.c:390
+#: nano.c:387
 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:391
+#: nano.c:388
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr " -t \t\tSalvataggio automatico in uscita senza avviso\n"
 
-#: nano.c:392
+#: nano.c:389
 msgid " -v \t\tView (read only) mode\n"
 msgstr " -v \t\tVisualizza (sola lettura)\n"
 
-#: nano.c:393
+#: nano.c:390
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr " -w \t\tNon interrompere linee lunghe\n"
 
-#: nano.c:394
+#: nano.c:391
 msgid " -x \t\tDon't show help window\n"
 msgstr " -x \t\tNon mostrare la finestra Aiuti\n"
 
-#: nano.c:395
+#: nano.c:392
 msgid " -z \t\tEnable suspend\n"
 msgstr " -z \t\tAttiva sospensione\n"
 
-#: nano.c:396
+#: nano.c:393
 msgid " +LINE\t\tStart at line number LINE\n"
 msgstr " +LINEA\t\tInizia alla LINEA numero\n"
 
-#: nano.c:403
+#: nano.c:400
 #, 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:405
+#: nano.c:402
 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:440
+#: nano.c:437
 msgid "Mark Set"
 msgstr ""
 
-#: nano.c:445
+#: nano.c:442
 msgid "Mark UNset"
 msgstr ""
 
-#: nano.c:882
+#: nano.c:867
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr "check_wrap chiamata con inptr->data=\"%s\"\n"
 
-#: nano.c:933
+#: nano.c:918
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data ora = \"%d\"\n"
 
-#: nano.c:986
+#: nano.c:971
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Dopo, data = \"%s\"\n"
 
-#: nano.c:1056
+#: nano.c:1041
 msgid "Error deleting tempfile, ack!"
 msgstr ""
 
-#: nano.c:1074
+#: nano.c:1059
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Impossibile creare un nome file temporaneo: %s"
 
-#: nano.c:1097
+#: nano.c:1082
 #, c-format
 msgid "Could not invoke spell program \"%s\""
 msgstr "Impossibile invocare correttore ortografico \"%s\""
 
 #. Why 32512? I dont know!
-#: nano.c:1103
+#: nano.c:1088
 msgid "Could not invoke \"ispell\""
 msgstr "Impossibile invocare \"ispell\""
 
-#: nano.c:1116
+#: nano.c:1101
 msgid "Finished checking spelling"
 msgstr "Controllo ortografico terminato"
 
-#: nano.c:1134
+#: nano.c:1119
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Salva il buffer modificato (RISPONDENDO \"No\" ANNULLERETE I CAMBIAMENTI "
 "AVVENUTI) ?"
 
-#: nano.c:1257
+#: nano.c:1283
 msgid "Cannot resize top win"
 msgstr "Impossibile ridimensionare la finestra superiore"
 
-#: nano.c:1259
+#: nano.c:1285
 msgid "Cannot move top win"
 msgstr "Impossibile spostare la finestra superiore"
 
-#: nano.c:1261
+#: nano.c:1287
 msgid "Cannot resize edit win"
 msgstr "Impossibile ridimensionare la finestra di modifica"
 
-#: nano.c:1263
+#: nano.c:1289
 msgid "Cannot move edit win"
 msgstr "Impossibile spostare finestra di modifica"
 
-#: nano.c:1265
+#: nano.c:1291
 msgid "Cannot resize bottom win"
 msgstr "Impossibile ridimensionare la finestra inferiore"
 
-#: nano.c:1267
+#: nano.c:1293
 msgid "Cannot move bottom win"
 msgstr "Impossibile spostare la finestra inferiore"
 
-#: nano.c:1733
+#: nano.c:1850
 msgid "Main: set up windows\n"
 msgstr "Main: configura finestre\n"
 
-#: nano.c:1755
+#: nano.c:1865
 msgid "Main: bottom win\n"
 msgstr "Main: finestra inferiore\n"
 
-#: nano.c:1761
+#: nano.c:1871
 msgid "Main: open file\n"
 msgstr "Main: apri file\n"
 
-#: nano.c:1829
+#: nano.c:1939
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "Premuto Alt-[-%c! (%d)\n"
 
-#: nano.c:1845
+#: nano.c:1965
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Premuto Alt-%c! (%d)\n"
 
-#: search.c:72
+#: search.c:75
 #, fuzzy, c-format
 msgid "Case Sensitive Regexp Search%s%s"
 msgstr "Ricerca case sensitive%s%s"
 
-#: search.c:74
+#: search.c:77
 #, fuzzy, c-format
 msgid "Regexp Search%s%s"
 msgstr "Ricerca%s%s"
 
-#: search.c:77
+#: search.c:80
 #, fuzzy, c-format
 msgid "Case Sensitive Search%s%s"
 msgstr "Ricerca case sensitive%s%s"
 
-#: search.c:79
+#: search.c:82
 #, fuzzy, c-format
 msgid "Search%s%s"
 msgstr "Ricerca%s%s"
 
-#: search.c:82
+#: search.c:85
 #, fuzzy
 msgid " (to replace)"
 msgstr " (sostituisci)"
 
-#: search.c:90
+#: search.c:93
 msgid "Search Cancelled"
 msgstr "Ricerca annullata"
 
-#: search.c:187
+#: search.c:191
 msgid "Search Wrapped"
 msgstr "Ricerca interrotta"
 
-#: search.c:241
+#: search.c:242
 #, c-format
 msgid "Replaced %d occurences"
 msgstr "Sostituite %d occorrenze"
 
-#: search.c:243
+#: search.c:244
 msgid "Replaced 1 occurence"
 msgstr "Sostituita 1 occorrenza"
 
-#: search.c:378 search.c:399 search.c:422
+#: search.c:379 search.c:400 search.c:423
 msgid "Replace Cancelled"
 msgstr "Sostituzione annullata"
 
-#: search.c:395
+#: search.c:396
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Sostituisci con [%s]"
 
 #. last_search is empty
-#: search.c:420
+#: search.c:421
 msgid "Replace with"
 msgstr "Sostituisci con"
 
-#: search.c:461
+#: search.c:462
 msgid "Replace this instance?"
 msgstr "Sostituisci questa istanza?"
 
 #. Ask for it
-#: search.c:512
+#: search.c:513
 msgid "Enter line number"
 msgstr "Inserire numero linea"
 
-#: search.c:514
+#: search.c:515
 msgid "Aborted"
 msgstr "Operazione fallita"
 
-#: search.c:534
+#: search.c:535
 msgid "Come on, be reasonable"
 msgstr "Avanti, sii ragionevole"
 
-#: search.c:539
+#: search.c:540
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Solo %d linee disponibili, vai all'ultima"
@@ -768,51 +809,51 @@ msgstr "File: ..."
 msgid "Modified"
 msgstr "Modificato"
 
-#: winio.c:900
+#: winio.c:915
 #, c-format
 msgid "Moved to (%d, %d) in edit buffer\n"
 msgstr "Mosso in (%d, %d) nel buffer di modifica\n"
 
-#: winio.c:911
+#: winio.c:926
 #, c-format
 msgid "current->data = \"%s\"\n"
 msgstr "current->data = \"%s\"\n"
 
-#: winio.c:954
+#: winio.c:969
 #, c-format
 msgid "I got \"%s\"\n"
 msgstr "Premuto \"%s\"\n"
 
-#: winio.c:979
+#: winio.c:994
 msgid "Yes"
 msgstr " Sì"
 
-#: winio.c:981
+#: winio.c:996
 msgid "All"
 msgstr " Tutti"
 
-#: winio.c:983
+#: winio.c:998
 msgid "No"
 msgstr " No"
 
-#: winio.c:1119
+#: winio.c:1134
 #, c-format
 msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
-#: winio.c:1123
+#: winio.c:1138
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "linea %d di %d (%.0f%%), carattere %d di %d (%.0f%%)"
 
-#: winio.c:1247
+#: winio.c:1262
 msgid "Dumping file buffer to stderr...\n"
 msgstr "Copia file buffer sullo stderr...\n"
 
-#: winio.c:1249
+#: winio.c:1264
 msgid "Dumping cutbuffer to stderr...\n"
 msgstr "Copia cutbuffer sullo stderr...\n"
 
-#: winio.c:1251
+#: winio.c:1266
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Copia un buffer sullo stderr...\n"
 
@@ -843,10 +884,6 @@ msgstr "Copia un buffer sullo stderr...\n"
 #~ msgid "Justify Complete"
 #~ msgstr "Giustifica"
 
-#, fuzzy
-#~ msgid "suspend"
-#~ msgstr "Sospendi"
-
 #, fuzzy
 #~ msgid "I got %c (%d)!\n"
 #~ msgstr "Premuto Alt-%c! (%d)\n"

po/nano.pot

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-07 11:03-0400\n"
+"POT-Creation-Date: 2000-09-04 12:19-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"
@@ -32,7 +32,7 @@ msgstr ""
 msgid "Read %d lines"
 msgstr ""
 
-#: files.c:217 search.c:173 search.c:191
+#: files.c:217 search.c:177
 #, c-format
 msgid "\"%s\" not found"
 msgstr ""
@@ -55,7 +55,7 @@ msgstr ""
 msgid "File to insert [from ./] "
 msgstr ""
 
-#: files.c:273 files.c:297 files.c:487 nano.c:1147
+#: files.c:273 files.c:297 files.c:487 nano.c:1132
 msgid "Cancelled"
 msgstr ""
 
@@ -107,262 +107,298 @@ msgstr ""
 msgid "File exists, OVERWRITE ?"
 msgstr ""
 
+#: global.c:118
+msgid "Constant cursor position"
+msgstr ""
+
 #: global.c:119
-msgid "Invoke the help menu"
+msgid "Auto indent"
 msgstr ""
 
 #: global.c:120
-msgid "Write the current file to disk"
+msgid "Suspend"
 msgstr ""
 
 #: global.c:121
-msgid "Exit from nano"
+msgid "Help mode"
 msgstr ""
 
 #: global.c:122
-msgid "Goto a specific line number"
+msgid "Pico messages"
 msgstr ""
 
 #: global.c:123
-msgid "Justify the current paragraph"
+msgid "Mouse support"
 msgstr ""
 
 #: global.c:124
-msgid "Replace text within the editor"
+msgid "Cut to end"
 msgstr ""
 
 #: global.c:125
-msgid "Insert another file into the current one"
+msgid "Regular expressions"
 msgstr ""
 
 #: global.c:126
+msgid "Auto wrap"
+msgstr ""
+
+#: global.c:166
+msgid "Invoke the help menu"
+msgstr ""
+
+#: global.c:167
+msgid "Write the current file to disk"
+msgstr ""
+
+#: global.c:168
+msgid "Exit from nano"
+msgstr ""
+
+#: global.c:169
+msgid "Goto a specific line number"
+msgstr ""
+
+#: global.c:170
+msgid "Justify the current paragraph"
+msgstr ""
+
+#: global.c:171
+msgid "Replace text within the editor"
+msgstr ""
+
+#: global.c:172
+msgid "Insert another file into the current one"
+msgstr ""
+
+#: global.c:173
 msgid "Search for text within the editor"
 msgstr ""
 
-#: global.c:127
+#: global.c:174
 msgid "Move to the previous screen"
 msgstr ""
 
-#: global.c:128
+#: global.c:175
 msgid "Move to the next screen"
 msgstr ""
 
-#: global.c:129
+#: global.c:176
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr ""
 
-#: global.c:130
+#: global.c:177
 msgid "Uncut from the cutbuffer into the current line"
 msgstr ""
 
-#: global.c:131
+#: global.c:178
 msgid "Show the posititon of the cursor"
 msgstr ""
 
-#: global.c:132
+#: global.c:179
 msgid "Invoke the spell checker (if available)"
 msgstr ""
 
-#: global.c:133
+#: global.c:180
 msgid "Move up one line"
 msgstr ""
 
-#: global.c:134
+#: global.c:181
 msgid "Move down one line"
 msgstr ""
 
-#: global.c:135
+#: global.c:182
 msgid "Move forward one character"
 msgstr ""
 
-#: global.c:136
+#: global.c:183
 msgid "Move back one character"
 msgstr ""
 
-#: global.c:137
+#: global.c:184
 msgid "Move to the beginning of the current line"
 msgstr ""
 
-#: global.c:138
+#: global.c:185
 msgid "Move to the end of the current line"
 msgstr ""
 
-#: global.c:139
+#: global.c:186
 msgid "Go to the first line of the file"
 msgstr ""
 
-#: global.c:140
+#: global.c:187
 msgid "Go to the last line of the file"
 msgstr ""
 
-#: global.c:141
+#: global.c:188
 msgid "Refresh (redraw) the current screen"
 msgstr ""
 
-#: global.c:142
+#: global.c:189
 msgid "Mark text at the current cursor location"
 msgstr ""
 
-#: global.c:143
+#: global.c:190
 msgid "Delete the character under the cursor"
 msgstr ""
 
-#: global.c:145
+#: global.c:192
 msgid "Delete the character to the left of the cursor"
 msgstr ""
 
-#: global.c:146
+#: global.c:193
 msgid "Insert a tab character"
 msgstr ""
 
-#: global.c:147
+#: global.c:194
 msgid "Insert a carriage return at the cursor position"
 msgstr ""
 
-#: global.c:149
+#: global.c:196
 msgid "Make the current search or replace case (in)sensitive"
 msgstr ""
 
-#: global.c:150
+#: global.c:197
 msgid "Cancel the current function"
 msgstr ""
 
-#: global.c:155 global.c:265 global.c:337
+#: global.c:201 global.c:311 global.c:383
 msgid "Get Help"
 msgstr ""
 
-#: global.c:158 global.c:166
+#: global.c:204 global.c:212
 msgid "WriteOut"
 msgstr ""
 
-#: global.c:162 global.c:326
+#: global.c:208 global.c:372
 msgid "Exit"
 msgstr ""
 
-#: global.c:170 global.c:261 global.c:282 global.c:301
+#: global.c:216 global.c:307 global.c:328 global.c:347
 msgid "Goto Line"
 msgstr ""
 
-#: global.c:175 global.c:253
+#: global.c:221 global.c:299
 msgid "Justify"
 msgstr ""
 
-#: global.c:178 global.c:249 global.c:279
+#: global.c:224 global.c:295 global.c:325
 msgid "Replace"
 msgstr ""
 
-#: global.c:182
+#: global.c:228
 msgid "Read File"
 msgstr ""
 
-#: global.c:186
+#: global.c:232
 msgid "Where Is"
 msgstr ""
 
-#: global.c:190 global.c:318
+#: global.c:236 global.c:364
 msgid "Prev Page"
 msgstr ""
 
-#: global.c:194 global.c:322
+#: global.c:240 global.c:368
 msgid "Next Page"
 msgstr ""
 
-#: global.c:198
+#: global.c:244
 msgid "Cut Text"
 msgstr ""
 
-#: global.c:201
+#: global.c:247
 msgid "UnCut Txt"
 msgstr ""
 
-#: global.c:205
+#: global.c:251
 msgid "Cur Pos"
 msgstr ""
 
-#: global.c:209
+#: global.c:255
 msgid "To Spell"
 msgstr ""
 
-#: global.c:213
+#: global.c:259
 msgid "Up"
 msgstr ""
 
-#: global.c:216
+#: global.c:262
 msgid "Down"
 msgstr ""
 
-#: global.c:219
+#: global.c:265
 msgid "Forward"
 msgstr ""
 
-#: global.c:222
+#: global.c:268
 msgid "Back"
 msgstr ""
 
-#: global.c:225
+#: global.c:271
 msgid "Home"
 msgstr ""
 
-#: global.c:228
+#: global.c:274
 msgid "End"
 msgstr ""
 
-#: global.c:231
+#: global.c:277
 msgid "Refresh"
 msgstr ""
 
-#: global.c:234
+#: global.c:280
 msgid "Mark Text"
 msgstr ""
 
-#: global.c:237
+#: global.c:283
 msgid "Delete"
 msgstr ""
 
-#: global.c:241
+#: global.c:287
 msgid "Backspace"
 msgstr ""
 
-#: global.c:245
+#: global.c:291
 msgid "Tab"
 msgstr ""
 
-#: global.c:256
+#: global.c:302
 msgid "Enter"
 msgstr ""
 
-#: global.c:269 global.c:289 global.c:308
+#: global.c:315 global.c:335 global.c:354
 msgid "First Line"
 msgstr ""
 
-#: global.c:272 global.c:292 global.c:311
+#: global.c:318 global.c:338 global.c:357
 msgid "Last Line"
 msgstr ""
 
-#: global.c:275 global.c:295
+#: global.c:321 global.c:341
 msgid "Case Sens"
 msgstr ""
 
-#: global.c:285 global.c:304 global.c:314 global.c:330 global.c:334
-#: global.c:340 winio.c:984
+#: global.c:331 global.c:350 global.c:360 global.c:376 global.c:380
+#: global.c:386 winio.c:999
 msgid "Cancel"
 msgstr ""
 
-#: global.c:298
+#: global.c:344
 msgid "No Replace"
 msgstr ""
 
-#: nano.c:116
+#: nano.c:115
 msgid ""
 "\n"
 "Buffer written to 'nano.save'\n"
 msgstr ""
 
-#: nano.c:123
+#: nano.c:122
 msgid "Key illegal in VIEW mode"
 msgstr ""
 
-#: nano.c:163
+#: nano.c:158
 msgid ""
 " nano help text\n"
 "\n"
@@ -375,363 +411,365 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol.  Alt-key sequences are notated with an at (@) "
-"symbol.  The following keystrokes are available in the main editor window. "
-"Optional keys are shown in parentheses:\n"
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
+"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
+"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"following keystrokes are available in the main editor window. Optional keys "
+"are shown in parentheses:\n"
 "\n"
 msgstr ""
 
-#: nano.c:264
+#: nano.c:261
 msgid "free_node(): free'd a node, YAY!\n"
 msgstr ""
 
-#: nano.c:269
+#: nano.c:266
 msgid "free_node(): free'd last node.\n"
 msgstr ""
 
-#: nano.c:321
+#: nano.c:318
 msgid ""
 "Usage: nano [GNU long option] [option] +LINE <file>\n"
 "\n"
 msgstr ""
 
-#: nano.c:322
+#: nano.c:319
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr ""
 
-#: nano.c:324
+#: nano.c:321
 msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n"
 msgstr ""
 
-#: nano.c:327
+#: nano.c:324
 msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
 msgstr ""
 
-#: nano.c:331
+#: nano.c:328
 msgid " -V \t\t--version\t\tPrint version information and exit\n"
 msgstr ""
 
-#: nano.c:333
+#: nano.c:330
 msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
 msgstr ""
 
-#: nano.c:335
+#: nano.c:332
 msgid " -h \t\t--help\t\t\tShow this message\n"
 msgstr ""
 
-#: nano.c:338
+#: nano.c:335
 msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
 msgstr ""
 
-#: nano.c:341
+#: nano.c:338
 msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
 msgstr ""
 
-#: nano.c:343
+#: nano.c:340
 msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite.\n"
 msgstr ""
 
-#: nano.c:346
+#: nano.c:343
 msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
 msgstr ""
 
-#: nano.c:351
+#: nano.c:348
 msgid ""
 " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
 msgstr ""
 
-#: nano.c:353
+#: nano.c:350
 msgid " -p\t \t--pico\t\t\tMake bottom 2 lines more Pico-like\n"
 msgstr ""
 
-#: nano.c:355
+#: nano.c:352
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
 msgstr ""
 
-#: nano.c:357
+#: nano.c:354
 msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
 msgstr ""
 
-#: nano.c:359
+#: nano.c:356
 msgid " -v \t\t--view\t\t\tView (read only) mode\n"
 msgstr ""
 
-#: nano.c:361
+#: nano.c:358
 msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
 msgstr ""
 
-#: nano.c:363
+#: nano.c:360
 msgid " -x \t\t--nohelp\t\tDon't show help window\n"
 msgstr ""
 
-#: nano.c:365
+#: nano.c:362
 msgid " -z \t\t--suspend\t\tEnable suspend\n"
 msgstr ""
 
-#: nano.c:367
+#: nano.c:364
 msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
 msgstr ""
 
-#: nano.c:369
+#: nano.c:366
 msgid ""
 "Usage: nano [option] +LINE <file>\n"
 "\n"
 msgstr ""
 
-#: nano.c:370
+#: nano.c:367
 msgid "Option\t\tMeaning\n"
 msgstr ""
 
-#: nano.c:371
+#: nano.c:368
 msgid " -T [num]\tSet width of a tab to num\n"
 msgstr ""
 
-#: nano.c:372
+#: nano.c:369
 msgid " -R\t\tUse regular expressions for search\n"
 msgstr ""
 
-#: nano.c:373
+#: nano.c:370
 msgid " -V \t\tPrint version information and exit\n"
 msgstr ""
 
-#: nano.c:374
+#: nano.c:371
 msgid " -c \t\tConstantly show cursor position\n"
 msgstr ""
 
-#: nano.c:375
+#: nano.c:372
 msgid " -h \t\tShow this message\n"
 msgstr ""
 
-#: nano.c:377
+#: nano.c:374
 msgid " -k \t\tLet ^K cut from cursor to end of line\n"
 msgstr ""
 
-#: nano.c:379
+#: nano.c:376
 msgid " -i \t\tAutomatically indent new lines\n"
 msgstr ""
 
-#: nano.c:381
+#: nano.c:378
 msgid " -l \t\tDon't follow symbolic links, overwrite.\n"
 msgstr ""
 
-#: nano.c:384
+#: nano.c:381
 msgid " -m \t\tEnable mouse\n"
 msgstr ""
 
-#: nano.c:388
+#: nano.c:385
 msgid " -r [#cols] \tSet fill cols to (wrap lines at) #cols\n"
 msgstr ""
 
-#: nano.c:389
+#: nano.c:386
 msgid " -s [prog]  \tEnable alternate speller\n"
 msgstr ""
 
-#: nano.c:390
+#: nano.c:387
 msgid " -p \t\tMake bottom 2 lines more Pico-like\n"
 msgstr ""
 
-#: nano.c:391
+#: nano.c:388
 msgid " -t \t\tAuto save on exit, don't prompt\n"
 msgstr ""
 
-#: nano.c:392
+#: nano.c:389
 msgid " -v \t\tView (read only) mode\n"
 msgstr ""
 
-#: nano.c:393
+#: nano.c:390
 msgid " -w \t\tDon't wrap long lines\n"
 msgstr ""
 
-#: nano.c:394
+#: nano.c:391
 msgid " -x \t\tDon't show help window\n"
 msgstr ""
 
-#: nano.c:395
+#: nano.c:392
 msgid " -z \t\tEnable suspend\n"
 msgstr ""
 
-#: nano.c:396
+#: nano.c:393
 msgid " +LINE\t\tStart at line number LINE\n"
 msgstr ""
 
-#: nano.c:403
+#: nano.c:400
 #, c-format
 msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n"
 msgstr ""
 
-#: nano.c:405
+#: nano.c:402
 msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n"
 msgstr ""
 
-#: nano.c:440
+#: nano.c:437
 msgid "Mark Set"
 msgstr ""
 
-#: nano.c:445
+#: nano.c:442
 msgid "Mark UNset"
 msgstr ""
 
-#: nano.c:882
+#: nano.c:867
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr ""
 
-#: nano.c:933
+#: nano.c:918
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr ""
 
-#: nano.c:986
+#: nano.c:971
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr ""
 
-#: nano.c:1056
+#: nano.c:1041
 msgid "Error deleting tempfile, ack!"
 msgstr ""
 
-#: nano.c:1074
+#: nano.c:1059
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr ""
 
-#: nano.c:1097
+#: nano.c:1082
 #, c-format
 msgid "Could not invoke spell program \"%s\""
 msgstr ""
 
 #. Why 32512? I dont know!
-#: nano.c:1103
+#: nano.c:1088
 msgid "Could not invoke \"ispell\""
 msgstr ""
 
-#: nano.c:1116
+#: nano.c:1101
 msgid "Finished checking spelling"
 msgstr ""
 
-#: nano.c:1134
+#: nano.c:1119
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 
-#: nano.c:1257
+#: nano.c:1283
 msgid "Cannot resize top win"
 msgstr ""
 
-#: nano.c:1259
+#: nano.c:1285
 msgid "Cannot move top win"
 msgstr ""
 
-#: nano.c:1261
+#: nano.c:1287
 msgid "Cannot resize edit win"
 msgstr ""
 
-#: nano.c:1263
+#: nano.c:1289
 msgid "Cannot move edit win"
 msgstr ""
 
-#: nano.c:1265
+#: nano.c:1291
 msgid "Cannot resize bottom win"
 msgstr ""
 
-#: nano.c:1267
+#: nano.c:1293
 msgid "Cannot move bottom win"
 msgstr ""
 
-#: nano.c:1733
+#: nano.c:1850
 msgid "Main: set up windows\n"
 msgstr ""
 
-#: nano.c:1755
+#: nano.c:1865
 msgid "Main: bottom win\n"
 msgstr ""
 
-#: nano.c:1761
+#: nano.c:1871
 msgid "Main: open file\n"
 msgstr ""
 
-#: nano.c:1829
+#: nano.c:1939
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr ""
 
-#: nano.c:1845
+#: nano.c:1965
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr ""
 
-#: search.c:72
+#: search.c:75
 #, c-format
 msgid "Case Sensitive Regexp Search%s%s"
 msgstr ""
 
-#: search.c:74
+#: search.c:77
 #, c-format
 msgid "Regexp Search%s%s"
 msgstr ""
 
-#: search.c:77
+#: search.c:80
 #, c-format
 msgid "Case Sensitive Search%s%s"
 msgstr ""
 
-#: search.c:79
+#: search.c:82
 #, c-format
 msgid "Search%s%s"
 msgstr ""
 
-#: search.c:82
+#: search.c:85
 msgid " (to replace)"
 msgstr ""
 
-#: search.c:90
+#: search.c:93
 msgid "Search Cancelled"
 msgstr ""
 
-#: search.c:187
+#: search.c:191
 msgid "Search Wrapped"
 msgstr ""
 
-#: search.c:241
+#: search.c:242
 #, c-format
 msgid "Replaced %d occurences"
 msgstr ""
 
-#: search.c:243
+#: search.c:244
 msgid "Replaced 1 occurence"
 msgstr ""
 
-#: search.c:378 search.c:399 search.c:422
+#: search.c:379 search.c:400 search.c:423
 msgid "Replace Cancelled"
 msgstr ""
 
-#: search.c:395
+#: search.c:396
 #, c-format
 msgid "Replace with [%s]"
 msgstr ""
 
 #. last_search is empty
-#: search.c:420
+#: search.c:421
 msgid "Replace with"
 msgstr ""
 
-#: search.c:461
+#: search.c:462
 msgid "Replace this instance?"
 msgstr ""
 
 #. Ask for it
-#: search.c:512
+#: search.c:513
 msgid "Enter line number"
 msgstr ""
 
-#: search.c:514
+#: search.c:515
 msgid "Aborted"
 msgstr ""
 
-#: search.c:534
+#: search.c:535
 msgid "Come on, be reasonable"
 msgstr ""
 
-#: search.c:539
+#: search.c:540
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr ""
@@ -758,50 +796,50 @@ msgstr ""
 msgid "Modified"
 msgstr ""
 
-#: winio.c:900
+#: winio.c:915
 #, c-format
 msgid "Moved to (%d, %d) in edit buffer\n"
 msgstr ""
 
-#: winio.c:911
+#: winio.c:926
 #, c-format
 msgid "current->data = \"%s\"\n"
 msgstr ""
 
-#: winio.c:954
+#: winio.c:969
 #, c-format
 msgid "I got \"%s\"\n"
 msgstr ""
 
-#: winio.c:979
+#: winio.c:994
 msgid "Yes"
 msgstr ""
 
-#: winio.c:981
+#: winio.c:996
 msgid "All"
 msgstr ""
 
-#: winio.c:983
+#: winio.c:998
 msgid "No"
 msgstr ""
 
-#: winio.c:1119
+#: winio.c:1134
 #, c-format
 msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr ""
 
-#: winio.c:1123
+#: winio.c:1138
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr ""
 
-#: winio.c:1247
+#: winio.c:1262
 msgid "Dumping file buffer to stderr...\n"
 msgstr ""
 
-#: winio.c:1249
+#: winio.c:1264
 msgid "Dumping cutbuffer to stderr...\n"
 msgstr ""
 
-#: winio.c:1251
+#: winio.c:1266
 msgid "Dumping a buffer to stderr...\n"
 msgstr ""

proto.h

@@ -33,7 +33,8 @@ extern int totsize, temp_opt;
 extern int fill, flags,tabsize;
 
 extern WINDOW *edit, *topwin, *bottomwin;
-extern char *filename, *answer, *last_search, *last_replace;
+extern char filename[PATH_MAX];
+extern char answer[132];
 extern char *hblank, *help_text;
 extern struct stat fileinfo;
 extern filestruct *current, *fileage, *edittop, *editbot, *filebot; 
@@ -46,6 +47,7 @@ extern shortcut spell_list[SPELL_LIST_LEN];
 extern int use_regexp, regexp_compiled;
 extern regex_t search_regexp;
 extern regmatch_t regmatches[10];  
+extern toggle toggles[TOGGLE_LEN];
 
 /* Programs we want available */
 
@@ -80,7 +82,7 @@ void blank_bottombars(void);
 void check_wrap(filestruct * inptr, char ch);
 void dump_buffer(filestruct * inptr);
 void align(char **strp);
-void edit_refresh(void);
+void edit_refresh(void), edit_refresh_clearok(void);
 void edit_update(filestruct * fileptr, int topmidbot);
 void update_cursor(void);
 void delete_node(filestruct * fileptr);

search.c

@@ -34,6 +34,9 @@
 #define _(string) (string)
 #endif
 
+static char last_search[132];		/* Last string we searched for */
+static char last_replace[132];		/* Last replacement string */
+
 /* Regular expression helper functions */
 
 #ifdef _POSIX_VERSION
@@ -131,7 +134,7 @@ filestruct *findnextstr(int quiet, filestruct * begin, char *needle)
     char *searchstr, *found = NULL, *tmp;
     int past_editbot = 0;
 
-    fileptr = current;
+    fileptr = begin;
 
     searchstr = &current->data[current_x + 1];
     /* Look for searchstr until EOF */
@@ -159,22 +162,23 @@ filestruct *findnextstr(int quiet, filestruct * begin, char *needle)
 
 	if (past_editbot)
 	    edit_update(current, CENTER);
+	placewewant = xplustabs();
 	reset_cursor();
     } else {			/* We're at EOF, go back to the top, once */
 
 	fileptr = fileage;
 
-	while (fileptr != current && fileptr != begin &&
+	while (fileptr != begin->next &&
 	       (found = strstrwrapper(fileptr->data, needle)) == NULL)
 	    fileptr = fileptr->next;
 
-	if (fileptr == begin) {
+	if (fileptr == begin->next) {
 	    if (!quiet)
 		statusbar(_("\"%s\" not found"), needle);
 
 	    return NULL;
 	}
-	if (fileptr != current) {	/* We found something */
+	else {	/* We found something */
 	    current = fileptr;
 	    current_x = 0;
 	    for (tmp = fileptr->data; tmp != found; tmp++)
@@ -185,12 +189,7 @@ filestruct *findnextstr(int quiet, filestruct * begin, char *needle)
 
 	    if (!quiet)
 		statusbar(_("Search Wrapped"));
-	} else {		/* Nada */
-
-	    if (!quiet)
-		statusbar(_("\"%s\" not found"), needle);
-	    return NULL;
-	}
+	} 
     }
 
     return fileptr;
@@ -201,6 +200,8 @@ void search_abort(void)
     UNSET(KEEP_CUTBUFFER);
     display_main_list();
     wrefresh(bottomwin);
+    if (ISSET(MARK_ISSET)) 
+	edit_refresh_clearok();
 
 #ifdef _POSIX_VERSION
     if (ISSET(REGEXP_COMPILED))

winio.c

@@ -462,7 +462,7 @@ void onekey(char *keystroke, char *desc)
 {
     char description[80];
 
-    snprintf(description, 12, " %-11s", desc);
+    snprintf(description, 13, " %-11s", desc);
     wattron(bottomwin, A_REVERSE);
     waddstr(bottomwin, keystroke);
     wattroff(bottomwin, A_REVERSE);
@@ -780,6 +780,11 @@ void update_line(filestruct * fileptr, int index)
 		virt_cur_x--;
 	    if (i < mark_beginx)
 		virt_mark_beginx--;
+	} 
+	else if (realdata[i] >= 1 && realdata[i] <= 26) {
+	/* Treat control characters as ^letter */
+	    fileptr->data[pos++] = '^';
+	    fileptr->data[pos++] = realdata[i] + 64;
 	} else {
 	    fileptr->data[pos++] = realdata[i];
 	}
@@ -862,6 +867,16 @@ void edit_refresh(void)
 	editbot = temp;
 }
 
+/*
+ * Same as above, but touch the window first so everything is redrawn.
+ */
+void edit_refresh_clearok(void)
+{
+    clearok(edit, TRUE);
+    edit_refresh();
+    clearok(edit, FALSE);
+}
+
 /*
  * Nice generic routine to update the edit buffer given a pointer to the
  * file struct =) 
@@ -1074,7 +1089,7 @@ int total_refresh(void)
     clearok(edit, FALSE);
     clearok(topwin, FALSE);
     clearok(bottomwin, FALSE);
-
+    edit_refresh();
     return 1;
 }