diff --git a/ChangeLog b/ChangeLog
index 0d067b3f..b5b522b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -159,10 +159,11 @@ Changes
 	- Move up check for --disable-nls as it's independent of 
 	  --enable-tiny now (DLR).
   do_int_speller()
-	- Make internal spell program use sort -f and uniq to create a less
-	  redundant word list.  [The only reason this is going in during 
-	  feature freeze is because the int speller is useless as is and should
-	  either be improved or removed.  I chose improved].
+	- Make internal spell program use sort -f and uniq to create a
+	  less redundant word list.  [The only reason this is going in
+	  during feature freeze is because the int speller is useless as
+	  is and should either be improved or removed.  I chose
+	  improved].
 	- Change all child error checks to use one goto (gasp!) called 
 	  close_pipes_and_exit, so we don't leak FDs.
 	- Fix FD leaks which occur outside of errors (David Benbennick).
@@ -226,6 +227,8 @@ Changes
   nanogetstr()
 	- Tweak to make the cursor stay in the same place if we hit a
 	  prompt-changing toggle while it's in the middle of the string.
+	  Reset it to -1 (so next time we come here, it'll be set to the
+	  end of the string) if we leave the prompt via Enter or Cancel.
 	  Also fix minor problem with search history where the current
 	  search item could be at the bottom of the history twice in a
 	  row under certain conditions. (DLR)
diff --git a/files.c b/files.c
index b58ee45b..9b3d09ec 100644
--- a/files.c
+++ b/files.c
@@ -2954,4 +2954,4 @@ come_from:
     }
 }
 #endif /* ENABLE_NANORC */
-#endif /* NANO_SMALL */
+#endif /* !NANO_SMALL */
diff --git a/po/eu.po b/po/eu.po
index 52bf4836..e6dbf5f7 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.1.2pre2\n"
-"POT-Creation-Date: 2002-12-22 18:18+0100\n"
+"POT-Creation-Date: 2002-10-24 22:05-0400\n"
 "PO-Revision-Date: 2002-12-22 18:19+0100\n"
 "Last-Translator: Peio Ziarsolo <peio@sindominio.net>\n"
 "Language-Team: Basque <itzulpena@euskalgnu.org>\n"
@@ -14,713 +14,740 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cut.c:43
+#: cut.c:42
 #, fuzzy, c-format
-msgid "add_to_cutbuffer() called with inptr->data = %s\n"
+msgid "add_to_cutbuffer called with inptr->data = %s\n"
 msgstr "add_to_cutbuffer Honekin deitua: inptr->data = %s\n"
 
-#: cut.c:194
+#: cut.c:192
 msgid "Blew away cutbuffer =)\n"
 msgstr "Cutbuffera apurtu da =)\n"
 
-#: files.c:335 search.c:55
+#: files.c:147
+msgid "read_line: not on first line and prev is NULL"
+msgstr "read_line: Ez gaude aurreneko lerroan eta aurrekoa NULL da"
+
+#: files.c:304
+#, fuzzy, c-format
+msgid "Read %d line (Converted from Mac format)"
+msgid_plural "Read %d lines (Converted from Mac format)"
+msgstr[0] " -D \t\tIdatzi archivoa DOS formatoan\n"
+msgstr[1] " -D \t\tIdatzi archivoa DOS formatoan\n"
+
+#: files.c:308
+#, fuzzy, c-format
+msgid "Read %d line (Converted from DOS format)"
+msgid_plural "Read %d lines (Converted from DOS format)"
+msgstr[0] " -D \t\tIdatzi archivoa DOS formatoan\n"
+msgstr[1] " -D \t\tIdatzi archivoa DOS formatoan\n"
+
+#: files.c:313
+#, fuzzy, c-format
+msgid "Read %d line"
+msgid_plural "Read %d lines"
+msgstr[0] "%d lerro irakurriak"
+msgstr[1] "%d lerro irakurriak"
+
+#: files.c:333 search.c:52
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" ezin aurkitu"
 
-#. We have a new file
-#: files.c:339
+#: files.c:337
 msgid "New File"
 msgstr "Artxibo berria"
 
-#: files.c:352
+#: files.c:350
 #, fuzzy, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" artxiboa direktorio bat da"
 
-#. Don't open character or block files.  Sorry, /dev/sndstat!
-#: files.c:355
+#: files.c:353
 #, c-format
 msgid "File \"%s\" is a device file"
 msgstr "\"%s\" artxiboa dispositibo bat da"
 
-#: files.c:362
+#: files.c:360
 msgid "Reading File"
 msgstr "Artxiboa irakurtzen"
 
-#: files.c:429
+#: files.c:425
 #, fuzzy, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Artxiboa insertatzeko [./tik]"
 
-#: files.c:433
+#: files.c:429
 #, fuzzy, c-format
 msgid "File to insert [from %s] "
 msgstr "Artxiboa insertatzeko [./tik]"
 
-#: files.c:440
+#: files.c:436
 #, fuzzy
 msgid "File to insert into new buffer [from ./] "
 msgstr "Artxiboa insertatzeko [./tik]"
 
-#: files.c:443
+#: files.c:439
 msgid "File to insert [from ./] "
 msgstr "Artxiboa insertatzeko [./tik]"
 
-#: files.c:448 files.c:702 files.c:760 files.c:854 files.c:866 files.c:917
-#: files.c:928 files.c:1785
+#: files.c:444 files.c:698 files.c:756 files.c:850 files.c:862 files.c:913
+#: files.c:924 files.c:1780
 #, fuzzy, c-format
 msgid "filename is %s\n"
 msgstr "%s da artxiboaren izena"
 
-#: files.c:477
+#: files.c:473
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Ezin da artxiboa txertatu %s-tik kanpo"
 
-#: files.c:495
+#: files.c:491
 msgid "Command to execute "
 msgstr ""
 
-#: files.c:497 files.c:578 files.c:1313 files.c:1746 nano.c:2726
+#: files.c:493 files.c:574 files.c:1308 files.c:1741 nano.c:2630
 msgid "Cancelled"
 msgstr "Deuzeztua"
 
-#: files.c:598
+#: files.c:594
 #, fuzzy
 msgid "Key illegal in non-multibuffer mode"
 msgstr "Tekla ilegala ikuskatze moduan"
 
-#: files.c:670
+#: files.c:666
 #, fuzzy
 msgid "delete_opennode(): free'd a node, YAY!\n"
 msgstr "delete_node():nodo bat liberatua, IEPA!\n"
 
-#: files.c:675
+#: files.c:671
 #, fuzzy
 msgid "delete_opennode(): free'd last node.\n"
 msgstr "delete_node(): Azkenengo nodoa liberatua.\n"
 
-#: files.c:846 files.c:909
+#: files.c:842 files.c:905
 msgid "No more open files"
 msgstr "Ez dago artxibo gehiago irekirik"
 
-#: files.c:873 files.c:936
+#: files.c:869 files.c:932
 #, c-format
 msgid "Switched to %s"
 msgstr ""
 
-#: files.c:1329
+#: files.c:1324
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Ezin da %staz kanpo idatzi"
 
-#: files.c:1360
+#: files.c:1355
 #, fuzzy, c-format
 msgid "Could not read %s for backup: %s"
 msgstr "Ezin izan zen %s ireki %s idazteko"
 
-#: files.c:1371
+#: files.c:1366
 #, fuzzy, c-format
 msgid "Couldn't write backup: %s"
 msgstr "Ezin da %staz kanpo idatzi"
 
-#: files.c:1377
+#: files.c:1372
 #, c-format
 msgid "Backing up %s to %s\n"
 msgstr ""
 
-#: files.c:1389
+#: files.c:1384
 #, fuzzy, c-format
 msgid "Could not set permissions %o on backup %s: %s"
 msgstr "Ezin izan ziren %o baimenak %sri ezarri: %s "
 
-#: files.c:1395
+#: files.c:1390
 #, fuzzy, c-format
 msgid "Could not set owner %d/group %d on backup %s: %s"
 msgstr "Ezin izan ziren %o baimenak %sri ezarri: %s "
 
-#: files.c:1400
+#: files.c:1395
 #, fuzzy, c-format
 msgid "Could not set access/modification time on backup %s: %s"
 msgstr "Ezin izan ziren %o baimenak %sri ezarri: %s "
 
-#: files.c:1435 files.c:1451 files.c:1463 files.c:1485 files.c:1518
-#: files.c:1525 files.c:1537
+#: files.c:1430 files.c:1446 files.c:1458 files.c:1480 files.c:1513
+#: files.c:1520 files.c:1532
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "Ezin da idazteko artxibo hau zabaldu:%s"
 
-#: files.c:1492
+#: files.c:1487
 #, c-format
 msgid "Wrote >%s\n"
 msgstr "Idatzi zen >%s\n"
 
-#: files.c:1548
+#: files.c:1543
 #, c-format
 msgid "Could not close %s: %s"
 msgstr "Ezin izan zen %s: %s itxi"
 
-#: files.c:1560 files.c:1565 files.c:1593
+#: files.c:1555 files.c:1560 files.c:1588
 #, fuzzy, c-format
 msgid "Could not reopen %s: %s"
 msgstr "Ezin izan zen %s: %s itxi"
 
-#: files.c:1570 files.c:1576 files.c:1585
+#: files.c:1565 files.c:1571 files.c:1580
 #, fuzzy, c-format
 msgid "Could not open %s for prepend: %s"
 msgstr "Ezin izan zen %s ireki %s idazteko"
 
-#. Try a rename??
-#: files.c:1622 files.c:1631 files.c:1636
+#: files.c:1617 files.c:1626 files.c:1631
 #, c-format
 msgid "Could not open %s for writing: %s"
 msgstr "Ezin izan zen %s ireki %s idazteko"
 
-#: files.c:1643
+#: files.c:1638
 #, c-format
 msgid "Could not set permissions %o on %s: %s"
 msgstr "Ezin izan ziren %o baimenak %sri ezarri: %s "
 
-#: files.c:1700
+#: files.c:1649
+#, fuzzy, c-format
+msgid "Wrote %d line"
+msgid_plural "Wrote %d lines"
+msgstr[0] "%d lerro idatziak"
+msgstr[1] "%d lerro idatziak"
+
+#: files.c:1695
 msgid " [Mac Format]"
 msgstr ""
 
-#: files.c:1702
+#: files.c:1697
 msgid " [DOS Format]"
 msgstr ""
 
-#: files.c:1707
+#: files.c:1702
 #, fuzzy
 msgid " [Backup]"
 msgstr "[Atzeruntza]"
 
-#: files.c:1715
+#: files.c:1710
 #, fuzzy
 msgid "Prepend Selection to File"
 msgstr "Ahutespena artxibora gehitu"
 
-#: files.c:1718
+#: files.c:1713
 msgid "Append Selection to File"
 msgstr "Ahutespena artxibora gehitu"
 
-#: files.c:1721
+#: files.c:1716
 msgid "Write Selection to File"
 msgstr "Ahuatespena artxiboan idatzi"
 
-#: files.c:1725 files.c:1736
+#: files.c:1720 files.c:1731
 #, fuzzy
 msgid "File Name to Prepend to"
 msgstr "Gehitu nahi duzun artxiboaren izena"
 
-#: files.c:1728 files.c:1739
+#: files.c:1723 files.c:1734
 #, fuzzy
 msgid "File Name to Append to"
 msgstr "Gehitu nahi duzun artxiboaren izena"
 
-#: files.c:1731 files.c:1742
+#: files.c:1726 files.c:1737
 msgid "File Name to Write"
 msgstr "Idatzi nahi duzun artxiboaren izena"
 
-#: files.c:1800
+#: files.c:1795
 msgid "File exists, OVERWRITE ?"
 msgstr "Artxiboa existitzen da, GAINIDATZI"
 
-#: files.c:2293
+#: files.c:2288
 msgid "(more)"
 msgstr "(gehiago)"
 
-#: files.c:2585
+#: files.c:2588
 msgid "Can't move up a directory"
 msgstr "Ezin da direktorioan gora egin"
 
-#: files.c:2597
+#: files.c:2600
 msgid "Can't visit parent in restricted mode"
 msgstr "Ezin da maila nagusia era murriztuan bisitatu"
 
-#. We can't open this dir for some reason.  Complain
-#: files.c:2623 files.c:2681
+#: files.c:2626 files.c:2684
 #, c-format
 msgid "Can't open \"%s\": %s"
 msgstr "Ezin da \"%s\" ireki: %s"
 
-#: files.c:2653
+#: files.c:2656
 msgid "Goto Directory"
 msgstr "Direktoriora joan"
 
-#: files.c:2660
+#: files.c:2663
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Ezin da %stik kanpora joan era murriztuan"
 
-#: files.c:2667
+#: files.c:2670
 msgid "Goto Cancelled"
 msgstr "Euzestura joan"
 
-#: global.c:235
+#: global.c:230
 msgid "Constant cursor position"
 msgstr "Kurtzorearen posizio konstantea"
 
-#: global.c:236
+#: global.c:231
 msgid "Auto indent"
 msgstr "Auto indentatu"
 
-#: global.c:237
+#: global.c:232
 msgid "Suspend"
 msgstr "Eseki"
 
-#: global.c:238
+#: global.c:233
 msgid "Help mode"
 msgstr "Laguntza era"
 
-#: global.c:239
+#: global.c:234
 msgid "Pico mode"
 msgstr "Pico era"
 
-#: global.c:241
+#: global.c:235
 msgid "Mouse support"
 msgstr "Sagua erabiltzeko euskarria"
 
-#: global.c:243
+#: global.c:236
 msgid "Cut to end"
 msgstr "Lerroaren bukaeraraino ebaki"
 
-#: global.c:244
+#: global.c:237
 msgid "No conversion from DOS/Mac format"
 msgstr ""
 
-#: global.c:245
+#: global.c:238
 msgid "Writing file in DOS format"
 msgstr "Dos formatoan artxiboa idazten"
 
-#: global.c:246
+#: global.c:239
 msgid "Writing file in Mac format"
 msgstr "Mac formatoan artxiboa idazten"
 
-#: global.c:247
+#: global.c:240
 #, fuzzy
 msgid "Backing up file"
 msgstr "Main: artxiboa ireki\n"
 
-#: global.c:248 nano.c:639
+#: global.c:241 nano.c:641
 msgid "Smooth scrolling"
 msgstr "Korrimendu leuna"
 
-#: global.c:250
+#: global.c:243
 msgid "Color syntax highlighting"
 msgstr ""
 
-#: global.c:253
+#: global.c:246
 msgid "Auto wrap"
 msgstr "Auto egokitu"
 
-#: global.c:256
+#: global.c:249
 msgid "Multiple file buffers"
 msgstr "Buffer anitzeko artxiboa"
 
-#: global.c:340
+#: global.c:331
 msgid "Invoke the help menu"
 msgstr "Laguntza menua ireki"
 
-#: global.c:341
+#: global.c:332
 msgid "Write the current file to disk"
 msgstr "Uneko artxiboa diskoan idatzi"
 
-#: global.c:343
+#: global.c:334
 msgid "Close currently loaded file/Exit from nano"
 msgstr "Unean kargatutako artxiboa itxi/Nanotik irten"
 
-#: global.c:345
+#: global.c:336
 msgid "Exit from nano"
 msgstr "Nanotik irten"
 
-#: global.c:347
+#: global.c:338
 #, fuzzy
 msgid "Go to a specific line number"
 msgstr "Aukeratutako lerro batera joan"
 
-#: global.c:348
+#: global.c:339
 msgid "Justify the current paragraph"
 msgstr "Uneko parrafoe justifikatu"
 
-#: global.c:349
+#: global.c:340
 msgid "Unjustify after a justify"
 msgstr "Justifikazioa deuseztu ostean justifikatu"
 
-#: global.c:350
+#: global.c:341
 msgid "Replace text within the editor"
 msgstr "Editorea erabiliz textua ordezkatu"
 
-#: global.c:351
+#: global.c:342
 msgid "Insert another file into the current one"
 msgstr "Uneko lerroan beste lerro bat txertatu"
 
-#: global.c:352
+#: global.c:343
 msgid "Search for text within the editor"
 msgstr "Editorea erabiliz textu bat bilatu"
 
-#: global.c:353
+#: global.c:344
 msgid "Move to the previous screen"
 msgstr "Aurreko pantailara mugitu"
 
-#: global.c:354
+#: global.c:345
 msgid "Move to the next screen"
 msgstr "Hurrengo pantailara mugitu"
 
-#: global.c:355
+#: global.c:346
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Uneko lerroa moztu eta cutbufferean gorde"
 
-#: global.c:356
+#: global.c:347
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Cutbufferekoa uneko lerroan txertatu"
 
-#: global.c:357
+#: global.c:348
 msgid "Show the position of the cursor"
 msgstr "kurtsorearen posisioa erakutsi"
 
-#: global.c:358
+#: global.c:349
 #, fuzzy
 msgid "Invoke the spell checker, if available"
 msgstr "Zuzentzaile ortografikoa erabili (posible ahal bada)"
 
-#: global.c:359
+#: global.c:350
 msgid "Move up one line"
 msgstr "Lerro bat goruntz mugitu"
 
-#: global.c:360
+#: global.c:351
 msgid "Move down one line"
 msgstr "Lerro bat beherantz mugitu"
 
-#: global.c:361
+#: global.c:352
 msgid "Move forward one character"
 msgstr "Karaktere bat aurreruntz mugitu"
 
-#: global.c:362
+#: global.c:353
 msgid "Move back one character"
 msgstr "Karaktere bat atzeruntz mugitu"
 
-#: global.c:363
+#: global.c:354
 msgid "Move to the beginning of the current line"
 msgstr "Uneko lerroaren hasierara mugitu"
 
-#: global.c:364
+#: global.c:355
 msgid "Move to the end of the current line"
 msgstr "Uneko lerroaren bukaerara mugitu"
 
-#: global.c:365
+#: global.c:356
 msgid "Go to the first line of the file"
 msgstr "Artxiboaren lehen lerrora mugitu"
 
-#: global.c:366
+#: global.c:357
 msgid "Go to the last line of the file"
 msgstr "Artxiboaren azken lerrora mugitu"
 
-#: global.c:367
+#: global.c:358
 msgid "Refresh (redraw) the current screen"
 msgstr "Freskatu uneko pantaila"
 
-#: global.c:368
+#: global.c:359
 msgid "Mark text at the current cursor location"
 msgstr "Kurtzorearen uneko posisioan textua markatu"
 
-#: global.c:369
+#: global.c:360
 msgid "Delete the character under the cursor"
 msgstr "Kurtzorearen azpiko karaterea deuzeztatu"
 
-#: global.c:371
+#: global.c:362
 msgid "Delete the character to the left of the cursor"
 msgstr "Kurtzorearen ezkerraldeko karaterea deuzeztatu"
 
-#: global.c:372
+#: global.c:363
 msgid "Insert a tab character"
 msgstr "Tab karaktere bat txertatu"
 
-#: global.c:373
+#: global.c:364
 msgid "Insert a carriage return at the cursor position"
 msgstr "Orga-itzulera bat kurtsorearen posisioan txertatu"
 
-#: global.c:375
+#: global.c:366
 msgid "Make the current search or replace case (in)sensitive"
 msgstr "Bilaketa mayuskuletara sensiblea egin dadin ahaldu"
 
-#: global.c:376
+#: global.c:367
 msgid "Go to file browser"
 msgstr "Artxibo nabigatzailera joan"
 
-#: global.c:377
+#: global.c:368
 msgid "Execute external command"
 msgstr ""
 
-#: global.c:378
+#: global.c:369
 #, fuzzy
 msgid "Go to directory"
 msgstr "Direktoriora joan"
 
-#: global.c:379
+#: global.c:370
 msgid "Cancel the current function"
 msgstr "Uneko funtzioa bertan behera utzi"
 
-#: global.c:380
+#: global.c:371
 msgid "Append to the current file"
 msgstr "Uneko artxibora erantsi"
 
-#: global.c:381
+#: global.c:372
 #, fuzzy
 msgid "Prepend to the current file"
 msgstr "Uneko artxibora erantsi"
 
-#: global.c:382
+#: global.c:373
 msgid "Search backwards"
 msgstr "Atzerantza bilatu"
 
-#: global.c:383
+#: global.c:374
 #, fuzzy
 msgid "Write file out in DOS format"
 msgstr "Dos formatoan artxiboa idazten"
 
-#: global.c:384
+#: global.c:375
 #, fuzzy
 msgid "Write file out in Mac format"
 msgstr "Mac formatoan artxiboa idazten"
 
-#: global.c:385
+#: global.c:376
 msgid "Back up original file when saving"
 msgstr ""
 
-#: global.c:387
+#: global.c:378
 #, fuzzy
 msgid "Use regular expressions"
 msgstr "Expresio erregularrak erabili"
 
-#: global.c:388
+#: global.c:379
 msgid "Find other bracket"
 msgstr "Beste giltz bat bilatu"
 
-#: global.c:391
+#: global.c:382
 msgid "Open previously loaded file"
 msgstr "Ireki aldez aurre kargatutako artxiboa"
 
-#: global.c:392
+#: global.c:383
 msgid "Open next loaded file"
 msgstr "Ireki kargatutako hurrengo artxiboa"
 
-#: global.c:393
+#: global.c:384
 msgid "Toggle insert into new buffer"
 msgstr ""
 
-#: global.c:408 global.c:579 global.c:613 global.c:646 global.c:660
-#: global.c:688 global.c:720 global.c:741 global.c:750 global.c:760
-#: global.c:780
+#: global.c:399 global.c:570 global.c:604 global.c:637 global.c:651
+#: global.c:679 global.c:711 global.c:732 global.c:741 global.c:751
+#: global.c:771
 msgid "Get Help"
 msgstr "Laguntza begiratu"
 
-#: global.c:414
+#: global.c:405
 msgid "Close"
 msgstr "Itxi"
 
-#: global.c:420 global.c:682
+#: global.c:411 global.c:673
 msgid "Exit"
 msgstr "Irten"
 
-#: global.c:424
+#: global.c:415
 msgid "WriteOut"
 msgstr "Gorde"
 
-#: global.c:429 global.c:542
+#: global.c:420 global.c:533
 msgid "Justify"
 msgstr "Justificatu"
 
-#. this is so we can view multiple files
-#: global.c:436 global.c:440 global.c:448 global.c:452
+#: global.c:427 global.c:431 global.c:439 global.c:443
 msgid "Read File"
 msgstr "Artxiboa irakurri"
 
-#: global.c:457 global.c:538 global.c:592
+#: global.c:448 global.c:529 global.c:583
 msgid "Replace"
 msgstr "Ordezkatu"
 
-#: global.c:461
+#: global.c:452
 msgid "Where Is"
 msgstr "Bilatu"
 
-#: global.c:465 global.c:674 global.c:766
+#: global.c:456 global.c:665 global.c:757
 msgid "Prev Page"
 msgstr "Aurreko orrialdea"
 
-#: global.c:469 global.c:678 global.c:770
+#: global.c:460 global.c:669 global.c:761
 msgid "Next Page"
 msgstr "Hurrengo orrialdea"
 
-#: global.c:473
+#: global.c:464
 msgid "Cut Text"
 msgstr "Textua moztu"
 
-#: global.c:478
+#: global.c:469
 msgid "UnJustify"
 msgstr "Justifikazioa deuzeztu"
 
-#: global.c:482
+#: global.c:473
 msgid "UnCut Txt"
 msgstr "Textua txertatu"
 
-#: global.c:486
+#: global.c:477
 msgid "Cur Pos"
 msgstr "Uneko posizioa"
 
-#: global.c:490
+#: global.c:481
 msgid "To Spell"
 msgstr "Ortografia"
 
-#: global.c:494
+#: global.c:485
 msgid "Up"
 msgstr "Goian"
 
-#: global.c:498
+#: global.c:489
 msgid "Down"
 msgstr "Behean"
 
-#: global.c:502
+#: global.c:493
 msgid "Forward"
 msgstr "Aurrean"
 
-#: global.c:506
+#: global.c:497
 msgid "Back"
 msgstr "Atzean"
 
-#: global.c:510
+#: global.c:501
 msgid "Home"
 msgstr "Hasierako orria"
 
-#: global.c:514
+#: global.c:505
 msgid "End"
 msgstr "Bukaera"
 
-#: global.c:518
+#: global.c:509
 msgid "Refresh"
 msgstr "Freskatze"
 
-#: global.c:522
+#: global.c:513
 msgid "Mark Text"
 msgstr "Textua markatu"
 
-#: global.c:526
+#: global.c:517
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: global.c:530
+#: global.c:521
 msgid "Backspace"
 msgstr ""
 
-#: global.c:534
+#: global.c:525
 msgid "Tab"
 msgstr "Tab"
 
-#: global.c:546
+#: global.c:537
 msgid "Enter"
 msgstr "Enter"
 
-#: global.c:550 global.c:595 global.c:628
+#: global.c:541 global.c:586 global.c:619
 #, fuzzy
 msgid "Go To Line"
 msgstr "Lerrora joan"
 
-#: global.c:555
+#: global.c:546
 msgid "Next Word"
 msgstr ""
 
-#: global.c:556
+#: global.c:547
 #, fuzzy
 msgid "Move forward one word"
 msgstr "Karaktere bat aurreruntz mugitu"
 
-#: global.c:559
+#: global.c:550
 msgid "Prev Word"
 msgstr ""
 
-#: global.c:560
+#: global.c:551
 #, fuzzy
 msgid "Move backward one word"
 msgstr "Karaktere bat atzeruntz mugitu"
 
-#: global.c:564
+#: global.c:555
 msgid "Find Other Bracket"
 msgstr "Beste giltz bat bilatu"
 
-#: global.c:569
+#: global.c:560
 msgid "Previous File"
 msgstr ""
 
-#: global.c:572
+#: global.c:563
 #, fuzzy
 msgid "Next File"
 msgstr "Artxibo berria"
 
-#: global.c:582 global.c:616 global.c:649 global.c:663 global.c:715
-#: global.c:723 global.c:744 global.c:753 global.c:763 global.c:783
-#: winio.c:1170
+#: global.c:573 global.c:607 global.c:640 global.c:654 global.c:706
+#: global.c:714 global.c:735 global.c:744 global.c:754 global.c:774
+#: winio.c:1185
 msgid "Cancel"
 msgstr "Bertan behera utzi"
 
-#: global.c:585 global.c:619 global.c:652 global.c:666
+#: global.c:576 global.c:610 global.c:643 global.c:657
 msgid "First Line"
 msgstr "Lehen lerroa"
 
-#: global.c:589 global.c:622 global.c:655 global.c:669
+#: global.c:580 global.c:613 global.c:646 global.c:660
 msgid "Last Line"
 msgstr "Azken lerroa"
 
-#: global.c:599 global.c:632
+#: global.c:590 global.c:623
 msgid "Case Sens"
 msgstr "May/Min"
 
-#: global.c:602 global.c:635
+#: global.c:593 global.c:626
 msgid "Direction"
 msgstr "Direkzioa"
 
-#: global.c:606 global.c:639
+#: global.c:597 global.c:630
 msgid "Regexp"
 msgstr "Regexp"
 
-#: global.c:625
+#: global.c:616
 msgid "No Replace"
 msgstr "Ez ordezkatu"
 
-#: global.c:692 global.c:727
+#: global.c:683 global.c:718
 msgid "To Files"
 msgstr "Artxiboetara"
 
-#: global.c:697
+#: global.c:688
 msgid "DOS Format"
 msgstr ""
 
-#: global.c:700
+#: global.c:691
 msgid "Mac Format"
 msgstr ""
 
-#: global.c:704
+#: global.c:695
 msgid "Append"
 msgstr "Gehitu"
 
-#: global.c:707
+#: global.c:698
 #, fuzzy
 msgid "Prepend"
 msgstr "Gehitu"
 
-#: global.c:711
+#: global.c:702
 #, fuzzy
 msgid "Backup File"
 msgstr "msgid \"Backspace\"\n"
 
-#: global.c:731
+#: global.c:722
 msgid "Execute Command"
 msgstr ""
 
-#: global.c:734 winio.c:444
+#: global.c:725 winio.c:446
 msgid "New Buffer"
 msgstr "Bufer berria"
 
-#: global.c:774
+#: global.c:765
 #, fuzzy
 msgid "Go To Dir"
 msgstr "Direktoriora joan"
@@ -752,7 +779,7 @@ msgstr "Terminalaren tamainua txikiegia da nano-rentzat"
 msgid "Key illegal in VIEW mode"
 msgstr "Tekla ilegala ikuskatze moduan"
 
-#: nano.c:267
+#: nano.c:269
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -770,7 +797,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: nano.c:281
+#: nano.c:283
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -782,7 +809,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: nano.c:288
+#: nano.c:290
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -801,7 +828,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: nano.c:302
+#: nano.c:304
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -817,7 +844,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: nano.c:313
+#: nano.c:315
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -831,7 +858,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: nano.c:324
+#: nano.c:326
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -844,7 +871,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: nano.c:332
+#: nano.c:334
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -857,7 +884,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: nano.c:342
+#: nano.c:344
 msgid ""
 "External Command Help Text\n"
 "\n"
@@ -868,8 +895,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#. Default to the main help list
-#: nano.c:349
+#: nano.c:351
 #, fuzzy
 msgid ""
 " nano help text\n"
@@ -907,25 +933,25 @@ msgstr ""
 "konfigurazioak dituguerabilgai lehio printzipalean. Lasterbide opzionalak "
 "parentesien arteanaurkezetn direnak dira.\n"
 
-#: nano.c:402 nano.c:405
+#: nano.c:404 nano.c:407
 #, fuzzy
 msgid "Space"
 msgstr "Ordezkatu"
 
-#: nano.c:444
+#: nano.c:446
 #, fuzzy, c-format
 msgid "%.*s enable/disable\n"
 msgstr "%s gaitu/ez gaitu"
 
-#: nano.c:551
+#: nano.c:553
 msgid "delete_node(): free'd a node, YAY!\n"
 msgstr "delete_node():nodo bat liberatua, IEPA!\n"
 
-#: nano.c:556
+#: nano.c:558
 msgid "delete_node(): free'd last node.\n"
 msgstr "delete_node(): Azkenengo nodoa liberatua.\n"
 
-#: nano.c:608
+#: nano.c:610
 #, fuzzy
 msgid ""
 "Usage: nano [+LINE] [GNU long option] [option] [file]\n"
@@ -934,11 +960,11 @@ msgstr ""
 "Erabilera: nano [GNU aukera luzea] [aukera] +LERROA <artxiboa>\n"
 "\n"
 
-#: nano.c:609
+#: nano.c:611
 msgid "Option\t\tLong option\t\tMeaning\n"
 msgstr "Aukera\t\tAukera luzea\t\tEsanahia\n"
 
-#: nano.c:611
+#: nano.c:613
 #, fuzzy
 msgid ""
 "Usage: nano [+LINE] [option] [file]\n"
@@ -947,214 +973,213 @@ msgstr ""
 "Erabilera nano [aukera] +LERROA <artxiboa>\n"
 "\n"
 
-#: nano.c:612
+#: nano.c:614
 msgid "Option\t\tMeaning\n"
 msgstr "Aukera\t\tEsanahia\n"
 
-#: nano.c:615
+#: nano.c:617
 #, fuzzy
 msgid "Show this message"
 msgstr " -h \t\tMezu hau erakutsi\n"
 
-#: nano.c:616
+#: nano.c:618
 msgid "+LINE"
 msgstr ""
 
-#: nano.c:616
+#: nano.c:618
 #, fuzzy
 msgid "Start at line number LINE"
 msgstr " +LERROA\t\tLerro zenbaki honetan hasi: LERROA\n"
 
-#: nano.c:618
+#: nano.c:620
 msgid "Backup existing files on save"
 msgstr ""
 
-#: nano.c:619
+#: nano.c:621
 #, fuzzy
 msgid "Write file in DOS format"
 msgstr "Dos formatoan artxiboa idazten"
 
-#: nano.c:622
+#: nano.c:624
 #, fuzzy
 msgid "Enable multiple file buffers"
 msgstr " -F \t\tArtxibo buffer anitzen funtzioa gaitu\n"
 
-#: nano.c:625
+#: nano.c:627
 msgid "Don't look at nanorc files"
 msgstr ""
 
-#: nano.c:627
+#: nano.c:629
 msgid "Use alternate keypad routines"
 msgstr ""
 
-#: nano.c:629
+#: nano.c:631
 #, fuzzy
 msgid "Write file in Mac format"
 msgstr "Mac formatoan artxiboa idazten"
 
-#: nano.c:630
+#: nano.c:632
 #, fuzzy
 msgid "Don't convert files from DOS/Mac format"
 msgstr " -D \t\tIdatzi archivoa DOS formatoan\n"
 
-#: nano.c:633
+#: nano.c:635
 msgid "-Q [str]"
 msgstr ""
 
-#: nano.c:633
+#: nano.c:635
 msgid "--quotestr=[str]"
 msgstr ""
 
-#: nano.c:633
+#: nano.c:635
 msgid "Quoting string, default \"> \""
 msgstr ""
 
-#: nano.c:636
+#: nano.c:638
 #, fuzzy
 msgid "Do regular expression searches"
 msgstr " -R\t\tExpresio erreguklarak erabili bilaketarako\n"
 
-#: nano.c:641
+#: nano.c:643
 msgid "-T [num]"
 msgstr ""
 
-#: nano.c:641
+#: nano.c:643
 msgid "--tabsize=[num]"
 msgstr ""
 
-#: nano.c:641
+#: nano.c:643
 #, fuzzy
 msgid "Set width of a tab to num"
 msgstr " -T [num]\tTab-etik num-erako zabalera ezarri\n"
 
-#: nano.c:642
+#: nano.c:644
 #, fuzzy
 msgid "Print version information and exit"
 msgstr " -V \t\tBertsioaren informazioa inprimatu eta irten\n"
 
-#: nano.c:644
+#: nano.c:646
 msgid "-Y [str]"
 msgstr ""
 
-#: nano.c:644
+#: nano.c:646
 msgid "--syntax [str]"
 msgstr ""
 
-#: nano.c:644
+#: nano.c:646
 msgid "Syntax definition to use"
 msgstr ""
 
-#: nano.c:646
+#: nano.c:648
 #, fuzzy
 msgid "Constantly show cursor position"
 msgstr " -c \t\tKurtsorearen posizioa beti erakutsi\n"
 
-#: nano.c:648
+#: nano.c:650
 #, fuzzy
 msgid "Automatically indent new lines"
 msgstr " -i \t\tAutomatikoki lerro berriak koskatu\n"
 
-#: nano.c:649
+#: nano.c:651
 #, fuzzy
 msgid "Let ^K cut from cursor to end of line"
 msgstr " -k \t\t^K k kurtsoretik lerro bukaerara moztu dezala utzi\n"
 
-#: nano.c:651
+#: nano.c:653
 #, fuzzy
 msgid "Don't follow symbolic links, overwrite"
 msgstr " -l \t\tLotura sinbolikorik ez jarraitu, gainidatzi\n"
 
-#: nano.c:653
+#: nano.c:656
 #, fuzzy
 msgid "Enable mouse"
 msgstr " -m \t\tArratoia gaitu\n"
 
-#: nano.c:656
+#: nano.c:660
 msgid "-o [dir]"
 msgstr ""
 
-#: nano.c:656
+#: nano.c:660
 msgid "--operatingdir=[dir]"
 msgstr ""
 
-#: nano.c:656
+#: nano.c:660
 #, fuzzy
 msgid "Set operating directory"
 msgstr " -o [dir] \tOperazioetarako direktorioa ezarri\n"
 
-#: nano.c:658
+#: nano.c:662
 #, fuzzy
 msgid "Emulate Pico as closely as possible"
 msgstr " -p \t\tPico ahain bezain hobeen emulatu\n"
 
-#: nano.c:660
+#: nano.c:664
 msgid "-r [#cols]"
 msgstr ""
 
-#: nano.c:660
+#: nano.c:664
 msgid "--fill=[#cols]"
 msgstr ""
 
-#: nano.c:660
+#: nano.c:664
 #, fuzzy
 msgid "Set fill cols to (wrap lines at) #cols"
 msgstr ""
 " -r [#cols] \tZutabeak bete #cols etan (#cols etan zutabeak ez egokituak) \n"
 
-#: nano.c:663
+#: nano.c:667
 msgid "-s [prog]"
 msgstr ""
 
-#: nano.c:663
+#: nano.c:667
 msgid "--speller=[prog]"
 msgstr ""
 
-#: nano.c:663
+#: nano.c:667
 #, fuzzy
 msgid "Enable alternate speller"
 msgstr " -s [prog] \tBeste zuzentzaile bat gaitu\n"
 
-#: nano.c:665
+#: nano.c:669
 #, fuzzy
 msgid "Auto save on exit, don't prompt"
 msgstr " -t \t\tIrteterakoan automatikoki gorde, ez galdetu\n"
 
-#: nano.c:666
+#: nano.c:670
 #, fuzzy
 msgid "View (read only) mode"
 msgstr " -v \t\tView (irakurri bakarrik) era\n"
 
-#: nano.c:668
+#: nano.c:672
 #, fuzzy
 msgid "Don't wrap long lines"
 msgstr " -w \t\tEz wrapeatu lerro luzeak\n"
 
-#: nano.c:670
+#: nano.c:674
 #, fuzzy
 msgid "Don't show help window"
 msgstr " -x \t\tEz erakutsi laguntza lehioa\n"
 
-#: nano.c:671
+#: nano.c:675
 #, fuzzy
 msgid "Enable suspend"
 msgstr " -z \t\tSuspenditzeko ahalmena gaitu\n"
 
-#. this is a special case
-#: nano.c:674
+#: nano.c:678
 msgid "(ignored, for Pico compatibility)"
 msgstr ""
 
-#: nano.c:681
+#: nano.c:685
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr "GNU nano %s vertsioa (compilatua %s, %s)\n"
 
-#: nano.c:684
+#: nano.c:688
 #, fuzzy
-msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
+msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 msgstr "E-posta: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 
-#: nano.c:685
+#: nano.c:689
 msgid ""
 "\n"
 " Compiled options:"
@@ -1162,204 +1187,177 @@ msgstr ""
 "\n"
 "Konpilazio ahukerak:"
 
-#: nano.c:757
+#: nano.c:761
 msgid "Sorry, support for this function has been disabled"
 msgstr ""
 
-#: nano.c:792
+#: nano.c:794
 #, fuzzy
 msgid "Could not pipe"
 msgstr "Ezin izan zen %s: %s itxi"
 
-#: nano.c:814 nano.c:1813 nano.c:1937
+#: nano.c:816
 #, fuzzy
 msgid "Could not fork"
 msgstr "Ezin izan zen %s: %s itxi"
 
-#: nano.c:1030
+#: nano.c:1034
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr "current->data orain =\"%s\"\n"
 
-#: nano.c:1090
+#: nano.c:1094
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr "Gero, data = \"%s\"\n"
 
-#: nano.c:1365
+#: nano.c:1364
 msgid "Mark Set"
 msgstr "Marka aukeratua"
 
-#: nano.c:1370
+#: nano.c:1369
 msgid "Mark UNset"
 msgstr "Marka deuseztua"
 
-#. allow replace word to be corrected
-#: nano.c:1636
+#: nano.c:1633
 msgid "Edit a replacement"
 msgstr "Ordezkoa editatu"
 
-#: nano.c:1691
-#, fuzzy
-msgid "Could not create pipe"
-msgstr "Ezin artxibo temporala sortu: %s"
-
-#: nano.c:1697
-msgid "Creating misspelled word list, please wait..."
-msgstr ""
-
-#: nano.c:1820
-msgid "Could not get size of pipe buffer"
-msgstr ""
-
-#: nano.c:1874
-msgid "Error invoking \"spell\""
-msgstr ""
-
-#: nano.c:1877
-msgid "Error invoking \"sort -f\""
-msgstr ""
-
-#: nano.c:1880
-msgid "Error invoking \"uniq\""
-msgstr ""
-
-#: nano.c:1944
-#, fuzzy, c-format
-msgid "Could not invoke \"%s\""
-msgstr "Ezin izan zen %s: %s itxi"
-
-#: nano.c:1984
-msgid "Generic error"
-msgstr ""
-
-#: nano.c:1987
+#: nano.c:1894
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr "Ezin artxibo temporala sortu: %s"
 
-#: nano.c:1993
+#: nano.c:1900
 msgid "Spell checking failed: unable to write temp file!"
 msgstr "Zuzenketa ortografikoan arazoa: ezin artxibo temporala idatzi!"
 
-#: nano.c:2011
+#: nano.c:1919
 msgid "Finished checking spelling"
 msgstr "Zuzenketa ortografikoa bukatua"
 
-#: nano.c:2014
-#, fuzzy, c-format
-msgid "Spell checking failed: %s"
+#: nano.c:1921
+#, fuzzy
+msgid "Spell checking failed"
 msgstr "Zuzenketa ortografikoan arazoak"
 
-#: nano.c:2347
+#: nano.c:1982
+msgid "'\")}]>"
+msgstr ""
+
+#: nano.c:1983
+msgid ".?!"
+msgstr ""
+
+#: nano.c:2253
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr ""
 
-#: nano.c:2600
+#: nano.c:2502
 msgid "Can now UnJustify!"
 msgstr "Orain justifikatu dezakezu!"
 
-#: nano.c:2696
+#: nano.c:2600
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Buffer aldatua gorde? (\"Ez\" ERANTZUTEKOTAN ALDAKETAK DEUZESTUEGINGO DIRA) ?"
 
-#: nano.c:2794
+#: nano.c:2698
 #, fuzzy
 msgid "Received SIGHUP or SIGTERM"
 msgstr "SIGHUP jasoa"
 
-#: nano.c:2873
+#: nano.c:2777
 msgid "Cannot resize top win"
 msgstr "Ezin goiko lehioaren tamainua aldatu"
 
-#: nano.c:2875
+#: nano.c:2779
 msgid "Cannot move top win"
 msgstr "Ezin goiko lehioa mugitu"
 
-#: nano.c:2877
+#: nano.c:2781
 msgid "Cannot resize edit win"
 msgstr "Ezin edizio lehioa tamainuz aldatu"
 
-#: nano.c:2879
+#: nano.c:2783
 msgid "Cannot move edit win"
 msgstr "Ezin edizio lehioa mugitu"
 
-#: nano.c:2881
+#: nano.c:2785
 msgid "Cannot resize bottom win"
 msgstr "Ezin Beheko lehioa tamainuz aldatu"
 
-#: nano.c:2883
+#: nano.c:2787
 msgid "Cannot move bottom win"
 msgstr "Ezin beheko lehioa mugitu"
 
-#: nano.c:2916
+#: nano.c:2820
 msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 msgstr ""
 "NumLock apurtua detektatu da. NumLock-a aktibatuta dagoeneanTecl. numerikoak "
 "funtzionatuko du"
 
-#: nano.c:2970
+#: nano.c:2870
 msgid "enabled"
 msgstr "gaitua"
 
-#: nano.c:2970
+#: nano.c:2870
 msgid "disabled"
 msgstr "Ez gaitua"
 
-#: nano.c:3186
+#: nano.c:3085
 #, fuzzy
 msgid "Tab size is too small for nano...\n"
 msgstr "Terminalaren tamainua txikiegia da nano-rentzat"
 
-#: nano.c:3324
+#: nano.c:3224
 msgid "Main: set up windows\n"
 msgstr "Main: Lehioak konfiguratu\n"
 
-#: nano.c:3342
+#: nano.c:3240
 msgid "Main: bottom win\n"
 msgstr "Main: Beheko lehioa\n"
 
-#: nano.c:3348
+#: nano.c:3246
 msgid "Main: open file\n"
 msgstr "Main: artxiboa ireki\n"
 
-#: nano.c:3389
+#: nano.c:3287
 #, fuzzy, c-format
 msgid "AHA!  %c (%d)\n"
 msgstr "Aha! '%c' (%d)\n"
 
-#: nano.c:3405
+#: nano.c:3303
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr "Alt-O-%c! Lortu dut! (%d)\n"
 
-#: nano.c:3431
+#: nano.c:3329
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr "Alt-[-1-%c Lortu dut! (%d)\n"
 
-#: nano.c:3460
+#: nano.c:3358
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr "Alt-[-2-%c lortu dut! (%d)\n"
 
-#: nano.c:3528
+#: nano.c:3426
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr "lt-[-%c lortu dut! (%d)\n"
 
-#: nano.c:3571
+#: nano.c:3469
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Alt-%c lortu dut! (%d)\n"
 
-#: nano.c:3617
+#: nano.c:3515
 msgid "XOFF ignored, mumble mumble."
 msgstr ""
 
-#: nano.c:3675
+#: nano.c:3579
 #, fuzzy, c-format
 msgid "I got %c (%d)!\n"
 msgstr "Alt-%c lortu dut! (%d)\n"
@@ -1431,7 +1429,9 @@ msgid "string val=%s\n"
 msgstr ""
 
 #: rcfile.c:406
-msgid "\"start=\" requires a corresponding \"end=\""
+msgid ""
+"\n"
+"\t\"start=\" requires a corresponding \"end=\""
 msgstr ""
 
 #: rcfile.c:423
@@ -1486,111 +1486,103 @@ msgstr "Arazo bat/batzuk aurkituak .nanorc artxiboan"
 msgid "I can't find my home directory!  Wah!"
 msgstr ""
 
-#: rcfile.c:625
+#: rcfile.c:619
 #, c-format
 msgid "Unable to open ~/.nanorc file, %s"
 msgstr "Ezin ~/.nanorc artxiboa ireki, %s"
 
-#: search.c:60
+#: search.c:57
 #, c-format
 msgid "\"%s...\" not found"
 msgstr "\"%s...\" ez aurkitua"
 
-#: search.c:145
+#: search.c:140
 msgid "Search"
 msgstr "Bilatu"
 
-#. This string is just a modifier for the search prompt,
-#. no grammar is implied
-#: search.c:149
+#: search.c:144
 msgid " [Case Sensitive]"
 msgstr "[May/Min]"
 
-#. This string is just a modifier for the search prompt,
-#. no grammar is implied
-#: search.c:153
+#: search.c:148
 msgid " [Regexp]"
 msgstr "[Regexp]"
 
-#. This string is just a modifier for the search prompt,
-#. no grammar is implied
-#: search.c:157
+#: search.c:152
 msgid " [Backwards]"
 msgstr "[Atzeruntza]"
 
-#: search.c:159
+#: search.c:154
 msgid " (to replace)"
 msgstr "(aldatzeko)"
 
-#: search.c:167 search.c:405
+#: search.c:162 search.c:403
 msgid "Search Cancelled"
 msgstr "Bilaketa deuseztua"
 
-#: search.c:284 search.c:338
+#: search.c:282 search.c:336
 msgid "Search Wrapped"
 msgstr "Bilaketa berriz hasia"
 
-#: search.c:422
+#: search.c:421
 msgid "This is the only occurrence"
 msgstr ""
 
-#: search.c:555
+#: search.c:554
 #, c-format
 msgid "Replaced %d occurrences"
 msgstr "%d gertaketa aldatuak"
 
-#: search.c:557
+#: search.c:556
 msgid "Replaced 1 occurrence"
 msgstr "Gertaketa 1 aldatua"
 
-#: search.c:573 search.c:686 search.c:702
+#: search.c:572 search.c:685 search.c:701
 msgid "Replace Cancelled"
 msgstr "Aldaketa deuseztua"
 
-#: search.c:609
+#: search.c:608
 msgid "Replace this instance?"
 msgstr "Instantsia hau aldatu?"
 
-#: search.c:621
+#: search.c:620
 msgid "Replace failed: unknown subexpression!"
 msgstr "Aldaketan arazoak: subexpresio ezezaguna!"
 
-#: search.c:721 search.c:725
+#: search.c:720 search.c:724
 #, c-format
 msgid "Replace with [%s]"
 msgstr "[%s]-rekin aldatu"
 
-#: search.c:728
+#: search.c:727
 msgid "Replace with"
 msgstr "Aldatu honekin"
 
-#. Ask for it
-#: search.c:756
+#: search.c:755
 msgid "Enter line number"
 msgstr "Lerroaren zenbakia txertatu"
 
-#: search.c:757
+#: search.c:756
 msgid "Aborted"
 msgstr "Deuseztua"
 
-#: search.c:766
+#: search.c:765
 msgid "Come on, be reasonable"
 msgstr "Bai zera, izan zentsudun!"
 
-#: search.c:825
+#: search.c:824
 msgid "Not a bracket"
 msgstr "Ez da hori giltza"
 
-#. didn't find either left or right bracket
-#: search.c:870
+#: search.c:869
 msgid "No matching bracket"
 msgstr "Ez dago giltz egokirik"
 
-#: utils.c:207 utils.c:219
+#: utils.c:209 utils.c:221
 msgid "nano: malloc: out of memory!"
 msgstr "nano: malloc: memoria falta!"
 
-#: utils.c:229
+#: utils.c:231
 msgid "nano: realloc: out of memory!"
 msgstr "nano:realloc: memoria falta!"
 
@@ -1599,151 +1591,147 @@ msgstr "nano:realloc: memoria falta!"
 msgid "actual_x for xplus=%d returns %d\n"
 msgstr "actual_x_from_start xplus=%d-entzat %d bueltatzen du\n"
 
-#: winio.c:228 winio.c:378
+#: winio.c:228 winio.c:380
 #, c-format
 msgid "Aha! '%c' (%d)\n"
 msgstr "Aha! '%c' (%d)\n"
 
-#: winio.c:401
+#: winio.c:403
 #, c-format
 msgid "input '%c' (%d)\n"
 msgstr "sarrera '%c' (%d)\n"
 
-#: winio.c:448
+#: winio.c:450
 msgid "  File: ..."
 msgstr " Artxiboa:..."
 
-#: winio.c:450
+#: winio.c:452
 msgid "   DIR: ..."
 msgstr "DIR: ..."
 
-#: winio.c:455
+#: winio.c:457
 #, fuzzy
 msgid "File: "
 msgstr " Artxiboa:..."
 
-#: winio.c:458
+#: winio.c:460
 #, fuzzy
 msgid " DIR: "
 msgstr "DIR: ..."
 
-#: winio.c:463
+#: winio.c:465
 #, fuzzy
 msgid " Modified "
 msgstr "Aldatua"
 
-#: winio.c:465
+#: winio.c:467
 msgid " View "
 msgstr ""
 
-#: winio.c:651
+#: winio.c:653
 msgid "Refusing 0 length regex match"
 msgstr ""
 
-#: winio.c:970
+#: winio.c:975
 #, c-format
 msgid "Moved to (%d, %d) in edit buffer\n"
 msgstr "(%d, %d)ra mugitu bufer editatuan\n"
 
-#: winio.c:981
+#: winio.c:986
 #, c-format
 msgid "current->data = \"%s\"\n"
 msgstr "current->data = \"%s\"\n"
 
-#: winio.c:1111
+#: winio.c:1124
 #, c-format
 msgid "I got \"%s\"\n"
 msgstr "\"%s\"Lortu dut!\n"
 
-#. Yes, no and all are strings of any length.  Each string consists of
-#. all characters accepted as a valid character for that value.
-#. The first value will be the one displayed in the shortcuts.
-#: winio.c:1145
+#: winio.c:1160
 msgid "Yy"
 msgstr "Bb"
 
-#: winio.c:1146
+#: winio.c:1161
 msgid "Nn"
 msgstr "Ee"
 
-#: winio.c:1147
+#: winio.c:1162
 msgid "Aa"
 msgstr "Dd"
 
-#: winio.c:1159
+#: winio.c:1174
 msgid "Yes"
 msgstr "Bai"
 
-#: winio.c:1163
+#: winio.c:1178
 msgid "All"
 msgstr "Denak"
 
-#: winio.c:1168
+#: winio.c:1183
 msgid "No"
 msgstr "Ez"
 
-#: winio.c:1355
+#: winio.c:1372
 #, c-format
 msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
-#: winio.c:1364
+#: winio.c:1381
 #, fuzzy, c-format
 msgid "line %d/%d (%.0f%%), col %ld/%ld (%.0f%%), char %ld/%ld (%.0f%%)"
 msgstr "%1$d (%3$.0f%%)-tik %2$d lerroa, %4$d (%6$.0f%%)-tik %5$d karakterea"
 
-#: winio.c:1618
+#: winio.c:1637
 msgid "Dumping file buffer to stderr...\n"
 msgstr "Artxibo buferra stderrera pasatzen...\n"
 
-#: winio.c:1620
+#: winio.c:1639
 msgid "Dumping cutbuffer to stderr...\n"
 msgstr "Cutbuferra stderrera pasatzen...\n"
 
-#: winio.c:1622
+#: winio.c:1641
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Buferra stderrera pasatzen...\n"
 
-#: winio.c:1703
+#: winio.c:1721
 msgid "The nano text editor"
 msgstr "Nano textu editorea"
 
-#: winio.c:1704
+#: winio.c:1722
 msgid "version "
 msgstr "bertsioa"
 
-#: winio.c:1705
+#: winio.c:1723
 msgid "Brought to you by:"
 msgstr "Zuretzako hauek egina:"
 
-#: winio.c:1706
+#: winio.c:1724
 msgid "Special thanks to:"
 msgstr "Esker bereziak:"
 
-#: winio.c:1707
+#: winio.c:1725
 msgid "The Free Software Foundation"
 msgstr "Free software fundation"
 
-#: winio.c:1708
+#: winio.c:1726
 msgid "For ncurses:"
 msgstr ""
 
-#: winio.c:1709
+#: winio.c:1727
 msgid "and anyone else we forgot..."
 msgstr "and anyone else we forgot..."
 
-#: winio.c:1710
+#: winio.c:1728
 msgid "Thank you for using nano!\n"
 msgstr "Eskerrikasko nano erabiltzeagatik\n"
 
-#~ msgid "read_line: not on first line and prev is NULL"
-#~ msgstr "read_line: Ez gaude aurreneko lerroan eta aurrekoa NULL da"
+#, fuzzy
+#~ msgid "Could not create pipe"
+#~ msgstr "Ezin artxibo temporala sortu: %s"
 
-#~ msgid "Read %d lines"
-#~ msgstr "%d lerro irakurriak"
-
-#~ msgid "Wrote %d lines"
-#~ msgstr "%d lerro idatziak"
+#, fuzzy
+#~ msgid "Could not invoke \"%s\""
+#~ msgstr "Ezin izan zen %s: %s itxi"
 
 #~ msgid "Backwards search"
 #~ msgstr "Atzeruntzdako bilaketa"
diff --git a/winio.c b/winio.c
index 2dfb994c..4c95ae1d 100644
--- a/winio.c
+++ b/winio.c
@@ -255,6 +255,11 @@ int nanogetstr(int allowtabs, const char *buf, const char *def,
 		    break;
 		}
 #endif
+
+		/* We canceled putting in an answer; reset x */
+		if (kbinput == NANO_CANCEL_KEY)
+		    x = -1;
+
 		return t->val;
 	    }
 	}
@@ -458,12 +463,12 @@ int nanogetstr(int allowtabs, const char *buf, const char *def,
 		    fprintf(stderr, _("Aha! \'%c\' (%d)\n"), kbinput,
 			    kbinput);
 #endif
-		    if (kbinput == t->val || kbinput == t->val - 32) {
-			/* We hit an Alt key.   Do like above.  We don't
-			   just ungetch the letter and let it get caught
-			   above cause that screws the keypad... */
+		    if (kbinput == t->val || kbinput == t->val - 32)
+			/* We hit an Alt key.  Do like above.  We don't
+			   just ungetch() the letter and let it get
+			   caught above cause that screws the
+			   keypad... */
 			return t->val;
-		    }
 		}
 	    }
 	    break;
@@ -488,6 +493,9 @@ int nanogetstr(int allowtabs, const char *buf, const char *def,
 	wrefresh(bottomwin);
     } /* while (kbinput ...) */
 
+    /* We finished putting in an answer; reset x */
+    x = -1;
+
     /* Just check for a blank answer here */
     if (answer[0] == '\0')
 	return -2;